Merge branch 'master' of https://github.com/magefree/mage

Mage.Client/src/main/java/mage/client/MageFrame.java

@@ -50,6 +50,7 @@ import mage.client.chat.ChatPanelBasic;
 import mage.client.components.*;
 import mage.client.components.ext.dlg.DialogManager;
 import mage.client.components.tray.MageTray;
+import mage.client.constants.Constants;
 import mage.client.constants.Constants.DeckEditorMode;
 import mage.client.deckeditor.DeckEditorPane;
 import mage.client.deckeditor.collection.viewer.CollectionViewerPane;
@@ -92,8 +93,6 @@ import org.mage.plugins.card.images.DownloadPictures;
 import org.mage.plugins.card.info.CardInfoPaneImpl;
 import org.mage.plugins.card.utils.impl.ImageManagerImpl;
 
-import static org.mage.plugins.card.utils.CardImageUtils.getImagesDir;
-
 /**
  * @author BetaSteward_at_googlemail.com
  */
@@ -239,10 +238,10 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
         SessionHandler.startSession(this);
         callbackClient = new CallbackClientImpl(this);
         connectDialog = new ConnectDialog();
-        desktopPane.add(connectDialog, JLayeredPane.POPUP_LAYER);
+        desktopPane.add(connectDialog, JLayeredPane.MODAL_LAYER);
         errorDialog = new ErrorDialog();
         errorDialog.setLocation(100, 100);
-        desktopPane.add(errorDialog, JLayeredPane.POPUP_LAYER);
+        desktopPane.add(errorDialog, JLayeredPane.MODAL_LAYER);
         UI.addComponent(MageComponents.DESKTOP_PANE, desktopPane);
 
         PING_TASK_EXECUTOR.scheduleAtFixedRate(() -> SessionHandler.ping(), 60, 60, TimeUnit.SECONDS);
@@ -285,6 +284,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
         balloonTip.setPositioner(new LeftAbovePositioner(0, 0));
         balloonTip.setVisible(false);
 
+        // tooltips delay in ms
+        ToolTipManager.sharedInstance().setDismissDelay(Constants.TOOLTIPS_DELAY_MS);
+
         mageToolbar.add(createSwitchPanelsButton(), 0);
         mageToolbar.add(new javax.swing.JToolBar.Separator(), 1);
 
@@ -429,16 +431,21 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
         }
     }
 
-    private boolean isChrismasTime(){
+    public static boolean isChrismasTime(Date currentTime){
         // from december 15 to january 15
-        Calendar cal = Calendar.getInstance();
+        Calendar cal = new GregorianCalendar();
+        cal.setTime(currentTime);
+
         int currentYear =  cal.get(Calendar.YEAR);
-        Date currentTime = cal.getTime();
+        if (cal.get(Calendar.MONTH) == Calendar.JANUARY){
+            currentYear = currentYear - 1;
+        }
 
         Date chrisFrom = new GregorianCalendar(currentYear, Calendar.DECEMBER, 15).getTime();
-        Date chrisTo = new GregorianCalendar(currentYear + 1, Calendar.JANUARY, 15 + 1).getTime();
+        Date chrisTo = new GregorianCalendar(currentYear + 1, Calendar.JANUARY, 15 + 1).getTime(); // end of the 15 day
 
-        return currentTime.after(chrisFrom) && currentTime.before(chrisTo);
+        return ((currentTime.equals(chrisFrom) || currentTime.after(chrisFrom))
+                && currentTime.before(chrisTo));
     }
 
     private void addMageLabel() {
@@ -448,7 +455,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 
         String filename;
         float ratio;
-        if (isChrismasTime()){
+        if (isChrismasTime(Calendar.getInstance().getTime())){
             // chrismass logo
             LOGGER.info("Yo Ho Ho, Merry Christmas and a Happy New Year");
             filename = "/label-xmage-christmas.png";
@@ -945,7 +952,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
     }//GEN-LAST:event_btnConnectActionPerformed
 
     public void btnAboutActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnAboutActionPerformed
-        JInternalFrame[] windows = desktopPane.getAllFramesInLayer(JLayeredPane.POPUP_LAYER);
+        JInternalFrame[] windows = desktopPane.getAllFramesInLayer(JLayeredPane.MODAL_LAYER);
         for (JInternalFrame window : windows) {
             if (window instanceof AboutDialog) {
                 // don't open the window twice.
@@ -953,7 +960,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
             }
         }
         AboutDialog aboutDialog = new AboutDialog();
-        desktopPane.add(aboutDialog, JLayeredPane.POPUP_LAYER);
+        desktopPane.add(aboutDialog, JLayeredPane.MODAL_LAYER);
         aboutDialog.showDialog(VERSION);
     }//GEN-LAST:event_btnAboutActionPerformed
 
@@ -1096,7 +1103,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
     public void showUserRequestDialog(final UserRequestMessage userRequestMessage) {
         final UserRequestDialog userRequestDialog = new UserRequestDialog();
         userRequestDialog.setLocation(100, 100);
-        desktopPane.add(userRequestDialog, JLayeredPane.POPUP_LAYER);
+        desktopPane.add(userRequestDialog, JLayeredPane.MODAL_LAYER);
         if (SwingUtilities.isEventDispatchThread()) {
             userRequestDialog.showDialog(userRequestMessage);
         } else {

Mage.Client/src/main/java/mage/client/constants/Constants.java

@@ -69,6 +69,9 @@ public final class Constants {
     public static final int POWBOX_TEXT_MAX_LEFT = 212;
     public static final int DAMAGE_MAX_LEFT = 180;
 
+    // tooltip hints delay in ms (need more time to display long hints withour hiding)
+    public static final int TOOLTIPS_DELAY_MS = 60 * 1000;
+
     public static final Border EMPTY_BORDER = BorderFactory.createEmptyBorder(2, 2, 2, 2);
 
     public static final double SCALE_FACTOR = 0.5;

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

@@ -114,7 +114,14 @@ public class AddLandDialog extends MageDialog {
         }
         cbLandSet.setModel(new DefaultComboBoxModel(landSetNames.toArray()));
 
-        MageFrame.getDesktop().add(this, JLayeredPane.PALETTE_LAYER);
+
+        // windows settings
+        if (this.isModal()){
+            MageFrame.getDesktop().add(this, JLayeredPane.MODAL_LAYER);
+        }else{
+            MageFrame.getDesktop().add(this, JLayeredPane.PALETTE_LAYER);
+        }
+
         this.setVisible(true);
     }
 

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

@@ -102,10 +102,10 @@ public class ConnectDialog extends MageDialog {
         this.txtPassword.addActionListener(connectAction);
 
         registerUserDialog = new RegisterUserDialog(this);
-        MageFrame.getDesktop().add(registerUserDialog, JLayeredPane.POPUP_LAYER);
+        MageFrame.getDesktop().add(registerUserDialog, JLayeredPane.MODAL_LAYER);
 
         resetPasswordDialog = new ResetPasswordDialog(this);
-        MageFrame.getDesktop().add(resetPasswordDialog, JLayeredPane.POPUP_LAYER);
+        MageFrame.getDesktop().add(resetPasswordDialog, JLayeredPane.MODAL_LAYER);
     }
 
     public void showDialog() {

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

@@ -45,8 +45,8 @@ import java.awt.event.MouseEvent;
 import java.beans.PropertyVetoException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.logging.Level;
-import javax.swing.JComponent;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
+
 import mage.client.MageFrame;
 import org.apache.log4j.Logger;
 
@@ -74,11 +74,34 @@ public class MageDialog extends javax.swing.JInternalFrame {
     @Override
     public void show() {
         super.show();
-        this.toFront();
+
+        // frames desktop ordering
+        // more info https://docs.oracle.com/javase/7/docs/api/javax/swing/JLayeredPane.html
+        // WARNING, use
+        // - JLayeredPane.DEFAULT_LAYER: tables and games (tabs)
+        // - JLayeredPane.PALETTE_LAYER: toolbars and info windows like cards list, not modal dialogs (not required user actions)
+        // - JLayeredPane.MODAL_LAYER: all modal dialogs (user required actions - select cards in game, new game window, error windows)
+        // - JLayeredPane.POPUP_LAYER: hints and other top level graphics
+        // - JLayeredPane.DRAG_LAYER: top most layer for critical actions and user controls
+        /*
+        JInternalFrame[] frames  = MageFrame.getDesktop().getAllFrames();
+        System.out.println("---");
+        for(JInternalFrame frame: frames){
+            int zorder = -1;
+            if (frame.getParent() != null){
+                frame.getParent().getComponentZOrder(frame);
+            }
+            System.out.println(frame.getClass() + " (" + frame.getTitle() + ") : layer = " + frame.getLayer() + ", zorder = " + zorder);
+        }
+        */
+
         if (modal) {
             this.setClosable(false);
         }
-        if (this.modal) {
+
+        this.toFront();
+
+        if (modal){
             startModal();
         }
     }
@@ -108,7 +131,6 @@ public class MageDialog extends javax.swing.JInternalFrame {
     }
 
     private synchronized void startModal() {
-
         try {
             if (SwingUtilities.isEventDispatchThread()) {
                 EventQueue theQueue = getToolkit().getSystemEventQueue();

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

@@ -47,6 +47,7 @@ import mage.cards.repository.ExpansionRepository;
 import mage.client.MageFrame;
 import mage.client.SessionHandler;
 import mage.client.table.TournamentPlayerPanel;
+import mage.client.util.gui.FastSearchUtil;
 import mage.constants.MatchTimeLimit;
 import mage.constants.MultiplayerAttackOption;
 import mage.constants.RangeOfInfluence;
@@ -76,7 +77,7 @@ public class NewTournamentDialog extends MageDialog {
     private RandomPacksSelectorDialog randomPackSelector;
     private JTextArea txtRandomPacks;
     private final List<TournamentPlayerPanel> players = new ArrayList<>();
-    private final List<JComboBox> packs = new ArrayList<>();
+    private final List<JPanel> packPanels = new ArrayList<>();
     private static final int CONSTRUCTION_TIME_MIN = 6;
     private static final int CONSTRUCTION_TIME_MAX = 30;
     private boolean isRandom = false;
@@ -586,8 +587,13 @@ public class NewTournamentDialog extends MageDialog {
                     tOptions.getLimitedOptions().getSetCodes().addAll(selected);
                 }
             } else {
-                for (JComboBox pack : packs) {
-                    tOptions.getLimitedOptions().getSetCodes().add(((ExpansionInfo) pack.getSelectedItem()).getCode());
+                for (JPanel panel : packPanels) {
+                    JComboBox combo = findComboInComponent(panel);
+                    if(combo != null) {
+                        tOptions.getLimitedOptions().getSetCodes().add(((ExpansionInfo) combo.getSelectedItem()).getCode());
+                    }else{
+                        logger.error("Can't find combo component in " + panel.toString());
+                    }
                 }
             }
             tOptions.getMatchOptions().setDeckType("Limited");
@@ -884,35 +890,89 @@ public class NewTournamentDialog extends MageDialog {
     }
 
     private void createPacks(int numPacks) {
-        while (packs.size() > numPacks) {
-            pnlPacks.remove(packs.get(packs.size() - 1));
-            packs.remove(packs.size() - 1);
+        while (packPanels.size() > numPacks) {
+            pnlPacks.remove(packPanels.get(packPanels.size() - 1));
+            packPanels.remove(packPanels.size() - 1);
         }
-        while (packs.size() < numPacks) {
+        while (packPanels.size() < numPacks) {
+            // SELECT PACK
+            // panel
+            JPanel setPanel = new JPanel();
+            setPanel.setLayout(new javax.swing.BoxLayout(setPanel, javax.swing.BoxLayout.LINE_AXIS));
+            setPanel.setOpaque(false);
+            //setPanel.setPreferredSize(new Dimension(200, 25));
+            //setPanel.setMaximumSize(new Dimension(200, 25));
+            pnlPacks.add(setPanel);
+            packPanels.add(setPanel); // for later access
+            // combo set
             JComboBox pack = new JComboBox();
+            pack = new JComboBox();
             pack.setModel(new DefaultComboBoxModel(ExpansionRepository.instance.getWithBoostersSortedByReleaseDate()));
-            pnlPacks.add(pack);
-            packs.add(pack);
             pack.addActionListener(evt -> packActionPerformed(evt));
+            pack.setAlignmentX(0.0F);
+            pack.setMinimumSize(new Dimension(50, 25));
+            pack.setPreferredSize(new Dimension(50, 25));
+            pack.setMaximumSize(new Dimension(Integer.MAX_VALUE, 25));
+            setPanel.add(pack);
+            // search button
+            JButton searchButton = new JButton();
+            searchButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/search_24.png")));
+            searchButton.setToolTipText("Search and select from list");
+            searchButton.setAlignmentX(1.0F);
+            searchButton.setMinimumSize(new java.awt.Dimension(24, 24));
+            searchButton.setPreferredSize(new java.awt.Dimension(32, 32));
+            searchButton.setMaximumSize(new java.awt.Dimension(32, 32));
+            searchButton.addActionListener(new java.awt.event.ActionListener() {
+                public void actionPerformed(java.awt.event.ActionEvent evt) {
+
+                    // search combo box near button (must be only one combo in panel)
+                    JButton button =  (JButton)evt.getSource();
+                    JComboBox combo = findComboInComponent(button.getParent());
+
+                    if (combo != null) {
+                        FastSearchUtil.showFastSearchForStringComboBox(combo, "Select value");
+                    }
+                }
+            });
+            setPanel.add(searchButton);
         }
         this.pack();
         this.revalidate();
         this.repaint();
     }
 
-    private void packActionPerformed(java.awt.event.ActionEvent evt) {
-        boolean start = false;
-        int selectedIndex = 0;
-        for (JComboBox pack : packs) {
-            if (!start) {
-                if (evt.getSource().equals(pack)) {
-                    start = true;
-                    selectedIndex = pack.getSelectedIndex();
-                }
-            } else {
-                pack.setSelectedIndex(selectedIndex);
+    private JComboBox findComboInComponent(Container panel){
+        // search combo box near button (must be only one combo in panel)
+        JComboBox combo = null;
+        for(Component comp: panel.getComponents()){
+            if (comp instanceof JComboBox){
+                combo = (JComboBox)comp;
+                break;
             }
         }
+        return combo;
+    }
+
+    private void packActionPerformed(java.awt.event.ActionEvent evt) {
+        // fill all bottom combobox with same value
+        JComboBox curentCombo = (JComboBox)evt.getSource();
+        int newValue = curentCombo.getSelectedIndex();
+
+        // search start index
+        int startIndex = 0;
+        for(int i = 0; i < packPanels.size(); i++){
+            JComboBox pack = findComboInComponent(packPanels.get(i));
+            if (pack.equals(curentCombo)){
+                startIndex = i + 1;
+                break;
+            }
+        }
+
+        // change all from start index
+        for(int i = startIndex; i < packPanels.size(); i++){
+            JComboBox pack = findComboInComponent(packPanels.get(i));
+            pack.setSelectedIndex(newValue);
+        }
     }
 
     private void createPlayers(int numPlayers) {
@@ -1054,16 +1114,22 @@ public class NewTournamentDialog extends MageDialog {
             int packNumber = 0;
             for (String pack : packsArray) {
                 packNumber++;
-                if (this.packs.size() >= packNumber - 1) {
-                    JComboBox comboBox = this.packs.get(packNumber - 1);
-                    ComboBoxModel model = comboBox.getModel();
-                    int size = model.getSize();
-                    for (int i = 0; i < size; i++) {
-                        ExpansionInfo element = (ExpansionInfo) model.getElementAt(i);
-                        if (element.getCode().equals(pack.trim())) {
-                            comboBox.setSelectedIndex(i);
-                            break;
+                if (this.packPanels.size() >= packNumber - 1) {
+                    JPanel panel = packPanels.get(packNumber - 1);
+                    JComboBox comboBox = findComboInComponent(panel);
+
+                    if (comboBox != null) {
+                        ComboBoxModel model = comboBox.getModel();
+                        int size = model.getSize();
+                        for (int i = 0; i < size; i++) {
+                            ExpansionInfo element = (ExpansionInfo) model.getElementAt(i);
+                            if (element.getCode().equals(pack.trim())) {
+                                comboBox.setSelectedIndex(i);
+                                break;
+                            }
                         }
+                    }else{
+                        logger.error("Can't find combo component in " + panel.toString());
                     }
                 }
 

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

@@ -165,7 +165,11 @@ public class PickChoiceDialog extends MageDialog {
         }
         
         // window settings
-        MageFrame.getDesktop().add(this, JLayeredPane.PALETTE_LAYER);
+        if (this.isModal()){
+            MageFrame.getDesktop().add(this, JLayeredPane.MODAL_LAYER);
+        }else{
+            MageFrame.getDesktop().add(this, JLayeredPane.PALETTE_LAYER);
+        }
         if (mageDialogState != null) {
             mageDialogState.setStateToDialog(this);
             
@@ -174,7 +178,7 @@ public class PickChoiceDialog extends MageDialog {
             this.setLocation(centered.x, centered.y);
             GuiDisplayUtil.keepComponentInsideScreen(centered.x, centered.y, this);
         }
-        
+
         // final load
         loadData();
 

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

@@ -35,7 +35,9 @@
 package mage.client.dialog;
 
 import java.awt.Point;
-import javax.swing.SpinnerNumberModel;
+import javax.swing.*;
+
+import mage.client.MageFrame;
 import mage.client.util.SettingsManager;
 import mage.client.util.gui.GuiDisplayUtil;
 
@@ -60,6 +62,13 @@ public class PickNumberDialog extends MageDialog {
         this.btnCancel.setVisible(false);
         this.pack();
 
+        // window settings
+        if (this.isModal()){
+            MageFrame.getDesktop().add(this, JLayeredPane.MODAL_LAYER);
+        }else{
+            MageFrame.getDesktop().add(this, JLayeredPane.PALETTE_LAYER);
+        }
+
         Point centered = SettingsManager.instance.getComponentPosition(getWidth(), getHeight());
         this.setLocation(centered.x, centered.y);
         GuiDisplayUtil.keepComponentInsideScreen(centered.x, centered.y, this);

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

@@ -114,6 +114,14 @@ public class PickPileDialog extends MageDialog {
         this.revalidate();
         this.repaint();
         this.setModal(true);
+
+        // window settings
+        if (this.isModal()){
+            MageFrame.getDesktop().add(this, JLayeredPane.MODAL_LAYER);
+        }else{
+            MageFrame.getDesktop().add(this, JLayeredPane.PALETTE_LAYER);
+        }
+
         this.setVisible(true);
     }
 

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

@@ -120,15 +120,19 @@ public class ShowCardsDialog extends MageDialog {
             this.cardArea.addCardEventListener(eventListener);
         }
 
-        if (getParent() != MageFrame.getDesktop() /*|| this.isClosed*/) {
-            MageFrame.getDesktop().add(this, JLayeredPane.DEFAULT_LAYER);
-        }
         pack();
 
         this.revalidate();
         this.repaint();
         this.setModal(modal);
 
+        // window settings
+        if (this.isModal()){
+            MageFrame.getDesktop().add(this, JLayeredPane.MODAL_LAYER);
+        }else{
+            MageFrame.getDesktop().add(this, JLayeredPane.PALETTE_LAYER);
+        }
+
         SwingUtilities.invokeLater(() -> {
             if (!positioned) {
                 int width = ShowCardsDialog.this.getWidth();

Mage.Client/src/main/java/mage/client/game/GamePanel.java

@@ -1115,7 +1115,7 @@ public final class GamePanel extends javax.swing.JPanel {
         }
         this.feedbackPanel.getFeedback(required ? FeedbackMode.INFORM : FeedbackMode.CANCEL, message, gameView.getSpecial(), options0, messageId);
         if (dialog != null) {
-            this.pickTarget.add(dialog);
+            this.pickTarget.add(dialog); // TODO: 01.01.2018, JayDi85: why feedbackPanel saved to pickTarget list? Need to research
         }
     }
 

Mage.Client/src/main/java/mage/client/game/HelperPanel.java

@@ -51,7 +51,9 @@ import javax.swing.UIManager;
 
 import mage.client.SessionHandler;
 import mage.client.components.MageTextArea;
+import mage.client.constants.Constants;
 import mage.client.game.FeedbackPanel.FeedbackMode;
+
 import static mage.client.game.FeedbackPanel.FeedbackMode.QUESTION;
 import mage.client.util.GUISizeHelper;
 import static mage.constants.PlayerAction.REQUEST_AUTO_ANSWER_ID_NO;
@@ -82,7 +84,6 @@ public class HelperPanel extends JPanel {
     private javax.swing.JButton linkSpecial;
     private javax.swing.JButton linkUndo;
 
-    private final int defaultDismissTimeout = ToolTipManager.sharedInstance().getDismissDelay();
     private final Object tooltipBackground = UIManager.get("info");
 
     private static final String CMD_AUTO_ANSWER_ID_YES = "cmdAutoAnswerIdYes";
@@ -232,13 +233,13 @@ public class HelperPanel extends JPanel {
 
             @Override
             public void mouseEntered(MouseEvent me) {
-                ToolTipManager.sharedInstance().setDismissDelay(100000);
+                ToolTipManager.sharedInstance().setDismissDelay(100 * 1000);
                 UIManager.put("info", Color.DARK_GRAY);
             }
 
             @Override
             public void mouseExited(MouseEvent me) {
-                ToolTipManager.sharedInstance().setDismissDelay(defaultDismissTimeout);
+                ToolTipManager.sharedInstance().setDismissDelay(Constants.TOOLTIPS_DELAY_MS);
                 UIManager.put("info", tooltipBackground);
             }
         });

Mage.Client/src/main/java/mage/client/util/stats/MemoryStats.java

@@ -0,0 +1,52 @@
+package mage.client.util.stats;
+
+/**
+ *
+ * @author JayDi85
+ */
+public class MemoryStats {
+
+    private float Available = 0;
+    private float MaxAvailable = 0;
+    private float Used = 0;
+    private float Free = 0;
+
+    public MemoryStats(float MaxAvailable, float Available, float Used, float Free){
+        this.setMaxAvailable(MaxAvailable);
+        this.setAvailable(Available);
+        this.setUsed(Used);
+        this.setFree(Free);
+    }
+
+    public float getAvailable() {
+        return Available;
+    }
+
+    public void setAvailable(float available) {
+        Available = available;
+    }
+
+    public float getUsed() {
+        return Used;
+    }
+
+    public void setUsed(float used) {
+        Used = used;
+    }
+
+    public float getFree() {
+        return Free;
+    }
+
+    public void setFree(float free) {
+        Free = free;
+    }
+
+    public float getMaxAvailable() {
+        return MaxAvailable;
+    }
+
+    public void setMaxAvailable(float maxAvailable) {
+        MaxAvailable = maxAvailable;
+    }
+}

Mage.Client/src/main/java/mage/client/util/stats/MemoryUsageStatUtil.java

@@ -1,25 +0,0 @@
-package mage.client.util.stats;
-
-/**
- * @author noxx
- */
-public final class MemoryUsageStatUtil {
-
-    private MemoryUsageStatUtil() {}
-
-    /**
-     * Returns percentage of available memory used at runtime.
-     * If not possible to determine, returns -1.
-     *
-     * @return
-     */
-    public static float getMemoryFreeStatPercentage() {
-        Runtime runtime = Runtime.getRuntime();
-        if (runtime.maxMemory() != 0) {
-            long usedMem = runtime.totalMemory() - runtime.freeMemory();
-            return (1 - (1.0f*usedMem)/runtime.maxMemory())*100;
-        } else {
-            return -1;
-        }
-    }
-}

Mage.Client/src/main/java/mage/client/util/stats/UpdateMemUsageTask.java

@@ -1,5 +1,6 @@
 package mage.client.util.stats;
 
+import java.awt.*;
 import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
@@ -11,11 +12,13 @@ import org.apache.log4j.Logger;
  * This updates the mem usage info in the Mage client every
  * MEM_USAGE_UPDATE_TIME ms.
  *
- * @author noxx
+ * @author noxx, JayDi85
  */
-public class UpdateMemUsageTask extends SwingWorker<Void, Float> {
+
+public class UpdateMemUsageTask extends SwingWorker<Void, MemoryStats> {
 
     private static final int MEM_USAGE_UPDATE_TIME = 2000;
+    private static final int MEM_USAGE_WARNING_PERCENT = 80; // red color for mem used more than xx%
 
     private final JLabel jLabelToDisplayInfo;
 
@@ -23,24 +26,60 @@ public class UpdateMemUsageTask extends SwingWorker<Void, Float> {
 
     public UpdateMemUsageTask(JLabel jLabelToDisplayInfo) {
         this.jLabelToDisplayInfo = jLabelToDisplayInfo;
+        this.jLabelToDisplayInfo.setToolTipText("<html>Memory usage statistics");
     }
 
     @Override
     protected Void doInBackground() throws Exception {
         while (!isCancelled()) {
-            float memUsage = MemoryUsageStatUtil.getMemoryFreeStatPercentage();
-            this.publish(memUsage >= 0 ? memUsage : null);
+            MemoryStats memoryStats = new MemoryStats(0, 0, 0, 0);
+
+            Runtime runtime = Runtime.getRuntime();
+            if (runtime.maxMemory() != 0) {
+                memoryStats.setMaxAvailable(runtime.maxMemory());
+                memoryStats.setAvailable(runtime.totalMemory());
+                memoryStats.setFree(runtime.freeMemory());
+                memoryStats.setUsed(runtime.totalMemory() - runtime.freeMemory());
+            }
+
+            this.publish(memoryStats);
             TimeUnit.MILLISECONDS.sleep(MEM_USAGE_UPDATE_TIME);
         }
         return null;
     }
 
     @Override
-    protected void process(List<Float> chunks) {
+    protected void process(List<MemoryStats> chunks) {
         if (chunks != null && !chunks.isEmpty()) {
-            Float memUsage = chunks.get(chunks.size() - 1);
-            if (memUsage != null) {
-                jLabelToDisplayInfo.setText(Math.round(memUsage) + "% Mem free");
+            MemoryStats memoryStats = chunks.get(chunks.size() - 1);
+            if (memoryStats != null) {
+                int max = Math.round(memoryStats.getMaxAvailable() / (1000 * 1000));
+                int used = Math.round(memoryStats.getUsed() / (1000 * 1000));
+                int total = Math.round(memoryStats.getAvailable() / (1000 * 1000));
+                int percent = 0;
+                if(max != 0){
+                    percent = Math.round((used * 100) / max);
+                }
+
+                jLabelToDisplayInfo.setText("Memory used: " + percent + "% (" + used + " of " + max + " MB)");
+                String warning = "";
+                String optimizeHint = "<br><br>If you see low memory warning and have free system memory then try to increase max limit in launcher settings:<br>"
+                        + " - Go to <i>launcher -> settings -> java tab</i>;<br>"
+                        + " - Find <i>client java options</i> (it's may contain many commands);<br>"
+                        + " - Find max available memory setting: <i>-Xmx256m</i> (it's must start with <b>-Xmx</b>);<br>"
+                        + " - Increase number in that value from 256 to 512, or 512 to 1024;<br>"
+                        + " - Save new settings and restart application.";
+                if(percent >= MEM_USAGE_WARNING_PERCENT){
+                    jLabelToDisplayInfo.setForeground(Color.red);
+                    warning = "<br><br><b>WARNING</b><br>"
+                            + "Application memory limit almost reached. Errors and freezes are very possible.";
+
+                }else{
+                    jLabelToDisplayInfo.setForeground(Color.black);
+                }
+
+                this.jLabelToDisplayInfo.setToolTipText("<html>Memory usage statistics" + warning + optimizeHint);
+
                 return;
             }
         }

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

@@ -35,28 +35,30 @@ public final class ManaSymbolsCellRenderer extends DefaultTableCellRenderer {
         String manaCost = (String)value;
         manaPanel.removeAll();
         manaPanel.setLayout(new BoxLayout(manaPanel, BoxLayout.X_AXIS));
-        StringTokenizer tok = new StringTokenizer(manaCost, " ");
-        while (tok.hasMoreTokens()) {
-            String symbol = tok.nextToken();
+        if(manaCost != null){
+            StringTokenizer tok = new StringTokenizer(manaCost, " ");
+            while (tok.hasMoreTokens()) {
+                String symbol = tok.nextToken();
 
-            JLabel symbolLabel = new JLabel();
-            //symbolLabel.setBorder(new LineBorder(new Color(150, 150, 150))); // debug
-            symbolLabel.setBorder(new EmptyBorder(0, symbolHorizontalMargin,0, 0));
+                JLabel symbolLabel = new JLabel();
+                //symbolLabel.setBorder(new LineBorder(new Color(150, 150, 150))); // debug
+                symbolLabel.setBorder(new EmptyBorder(0, symbolHorizontalMargin,0, 0));
 
-            BufferedImage image = ManaSymbols.getSizedManaSymbol(symbol, symbolWidth);
-            if (image != null){
-                // icon
-                symbolLabel.setIcon(new ImageIcon(image));
-            }else
-            {
-                // text
-                symbolLabel.setText("{" + symbol + "}");
-                symbolLabel.setOpaque(baseLabel.isOpaque());
-                symbolLabel.setForeground(baseLabel.getForeground());
-                symbolLabel.setBackground(baseLabel.getBackground());
+                BufferedImage image = ManaSymbols.getSizedManaSymbol(symbol, symbolWidth);
+                if (image != null){
+                    // icon
+                    symbolLabel.setIcon(new ImageIcon(image));
+                }else
+                {
+                    // text
+                    symbolLabel.setText("{" + symbol + "}");
+                    symbolLabel.setOpaque(baseLabel.isOpaque());
+                    symbolLabel.setForeground(baseLabel.getForeground());
+                    symbolLabel.setBackground(baseLabel.getBackground());
+                }
+
+                manaPanel.add(symbolLabel);
             }
-
-            manaPanel.add(symbolLabel);
         }
 
         return manaPanel;

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

@@ -300,6 +300,7 @@ public enum MythicspoilerComSource implements CardImageSource {
 
         HashMap<String, String> linksRix = new HashMap<>();
         linksRix.put("vaultofcatlacan", "vaultofcatlacan");
+        linksRix.put("atzalcaveofeternity", "atzalcaveofeternity");
         manualLinks.put("RIX", linksRix);
 
         cardNameAliasesStart = new HashMap<>();

Mage.Client/src/test/java/mage/client/util/ChrismasTest.java

@@ -0,0 +1,42 @@
+package mage.client.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+import static mage.client.MageFrame.isChrismasTime;
+
+public class ChrismasTest {
+
+    private Date getDate(int Year, int Month, int Day){
+        Calendar cal = new GregorianCalendar(Year, Month - 1, Day);
+        return cal.getTime();
+    }
+
+    @Test
+    public void ignoreDefaultResponse() throws Exception {
+        // chrismas from 15 december to 15 january
+        Assert.assertEquals(false, isChrismasTime(getDate(2017, 11, 1)));
+        Assert.assertEquals(false, isChrismasTime(getDate(2017, 11, 15)));
+        Assert.assertEquals(false, isChrismasTime(getDate(2017, 11, 30)));
+        Assert.assertEquals(false, isChrismasTime(getDate(2017, 12, 1)));
+        Assert.assertEquals(false, isChrismasTime(getDate(2017, 12, 14)));
+        Assert.assertEquals(true, isChrismasTime(getDate(2017, 12, 15)));
+        Assert.assertEquals(true, isChrismasTime(getDate(2017, 12, 16)));
+        Assert.assertEquals(true, isChrismasTime(getDate(2017, 12, 31)));
+        Assert.assertEquals(true, isChrismasTime(getDate(2018, 1, 1)));
+        Assert.assertEquals(true, isChrismasTime(getDate(2018, 1, 14)));
+        Assert.assertEquals(true, isChrismasTime(getDate(2018, 1, 15)));
+        Assert.assertEquals(false, isChrismasTime(getDate(2018, 1, 16)));
+        Assert.assertEquals(false, isChrismasTime(getDate(2018, 1, 31)));
+        Assert.assertEquals(false, isChrismasTime(getDate(2018, 2, 1)));
+        Assert.assertEquals(false, isChrismasTime(getDate(2018, 12, 1)));
+        Assert.assertEquals(true, isChrismasTime(getDate(2018, 12, 20)));
+        Assert.assertEquals(true, isChrismasTime(getDate(2019, 1, 10)));
+        Assert.assertEquals(false, isChrismasTime(getDate(2019, 1, 25)));
+    }
+
+}

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

@@ -27,6 +27,7 @@
  */
 package mage.cards.a;
 
+import java.util.*;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
@@ -48,8 +49,6 @@ import mage.game.permanent.Permanent;
 import mage.target.common.TargetNonlandPermanent;
 import mage.watchers.Watcher;
 
-import java.util.*;
-
 /**
  *
  * @author TheElk801

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

@@ -40,7 +40,7 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -49,10 +49,8 @@ import mage.target.common.TargetCardInYourGraveyard;
  */
 public class AdunOakenshield extends CardImpl {
 
-    private static final FilterCreatureCard filter = new FilterCreatureCard("creature card from your graveyard");
-
     public AdunOakenshield(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{R}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}{R}{G}");
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.KNIGHT);
@@ -61,8 +59,8 @@ public class AdunOakenshield extends CardImpl {
         this.toughness = new MageInt(2);
 
         //{B}{R}{G}, {T}: Return target creature card from your graveyard to your hand.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(),new ManaCostsImpl("{B}{R}{G}"));
-        ability.addTarget(new TargetCardInYourGraveyard(filter));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{B}{R}{G}"));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }

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

@@ -0,0 +1,79 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.a;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.SacrificeSourceCost;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DestroyAllEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Zone;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.other.ExpansionSetPredicate;
+import mage.filter.predicate.permanent.TokenPredicate;
+
+/**
+ *
+ * @author L_J
+ */
+public class ApocalypseChime extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterPermanent("nontoken permanents with a name originally printed in the Homelands expansion");
+
+    static {
+        filter.add(Predicates.and(
+                Predicates.not(new TokenPredicate()),
+                new ExpansionSetPredicate("HML")
+        ));
+    }
+
+    public ApocalypseChime(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}");
+
+        // {2}, {T}, Sacrifice Apocalypse Chime: Destroy all nontoken permanents with a name originally printed in the Homelands expansion. They can't be regenerated.
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter, true), new ManaCostsImpl("{2}"));
+        ability.addCost(new TapSourceCost());
+        ability.addCost(new SacrificeSourceCost());
+        this.addAbility(ability);
+    }
+
+    public ApocalypseChime(final ApocalypseChime card) {
+        super(card);
+    }
+
+    @Override
+    public ApocalypseChime copy() {
+        return new ApocalypseChime(this);
+    }
+}

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

@@ -45,7 +45,7 @@ import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -70,7 +70,7 @@ public class ApprenticeNecromancer extends CardImpl {
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ApprenticeNecromancerEffect(), new ColoredManaCost(ColoredManaSymbol.B));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
     }
 

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

@@ -25,7 +25,6 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.cards.a;
 
 import java.util.UUID;
@@ -46,14 +45,17 @@ import mage.constants.*;
 public class ArdentRecruit extends CardImpl {
 
     public ArdentRecruit(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}");
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.SOLDIER);
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
+
+        // Metalcraft — Ardent Recruit gets +2/+2 as long as you control three or more artifacts.
         ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield);
-        ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.instance, "Ardent Recruit gets +2/+2 as long as you control three or more artifacts");
+        ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.instance,
+                "{this} gets +2/+2 as long as you control three or more artifacts");
         Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect);
         ability.setAbilityWord(AbilityWord.METALCRAFT);
         this.addAbility(ability);

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

@@ -25,7 +25,6 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.cards.a;
 
 import java.util.UUID;
@@ -38,7 +37,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -47,20 +46,20 @@ import mage.target.common.TargetCardInYourGraveyard;
  */
 public class ArtisanOfKozilek extends CardImpl {
 
-    public ArtisanOfKozilek (UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{9}");
+    public ArtisanOfKozilek(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{9}");
         this.subtype.add(SubType.ELDRAZI);
         this.power = new MageInt(10);
         this.toughness = new MageInt(9);
         // When you cast Artisan of Kozilek, you may return target creature card from your graveyard to the battlefield.
         Ability ability = new CastSourceTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), true);
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
         // Annihilator 2
         this.addAbility(new AnnihilatorAbility(2));
     }
 
-    public ArtisanOfKozilek (final ArtisanOfKozilek card) {
+    public ArtisanOfKozilek(final ArtisanOfKozilek card) {
         super(card);
     }
 

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

@@ -0,0 +1,83 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.a;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.InfoEffect;
+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 class AtzalCaveOfEternity extends CardImpl {
+
+    public AtzalCaveOfEternity(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
+
+        this.addSuperType(SuperType.LEGENDARY);
+
+        this.nightCard = true;
+
+        // <i>(Transforms from Journey to Eternity.)</i>
+        Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect("<i>(Transforms from Journey to Eternity.)</i>"));
+        ability.setRuleAtTheTop(true);
+        this.addAbility(ability);
+
+        // {t}: Add one mana of any color to your mana pool.
+        this.addAbility(new AnyColorManaAbility());
+
+        // {3}{B}{G}, {T}: Return target creature card from your graveyard to the battlefield.
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{3}{B}{G}"));
+        ability.addCost(new TapSourceCost());
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
+        this.addAbility(ability);
+    }
+
+    public AtzalCaveOfEternity(final AtzalCaveOfEternity card) {
+        super(card);
+    }
+
+    @Override
+    public AtzalCaveOfEternity copy() {
+        return new AtzalCaveOfEternity(this);
+    }
+}

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

@@ -0,0 +1,110 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.a;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.AsThoughEffectImpl;
+import mage.abilities.keyword.ShroudAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.*;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.TargetPlayer;
+
+/**
+ *
+ * @author L_J
+ */
+public class AutumnWillow extends CardImpl {
+
+    public AutumnWillow(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{G}");
+        addSuperType(SuperType.LEGENDARY);
+        this.subtype.add(SubType.AVATAR);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // Shroud
+        this.addAbility(ShroudAbility.getInstance());
+
+        // {G}: Until end of turn, Autumn Willow can be the target of spells and abilities controlled by target player as though it didn't have shroud.
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AutumnWillowEffect(), new ManaCostsImpl("{G}"));
+        ability.addTarget(new TargetPlayer());
+        this.addAbility(ability);
+    }
+
+    public AutumnWillow(final AutumnWillow card) {
+        super(card);
+    }
+
+    @Override
+    public AutumnWillow copy() {
+        return new AutumnWillow(this);
+    }
+}
+
+class AutumnWillowEffect extends AsThoughEffectImpl {
+
+    public AutumnWillowEffect() {
+        super(AsThoughEffectType.SHROUD, Duration.EndOfTurn, Outcome.Benefit);
+        staticText = "Until end of turn, Autumn Willow can be the target of spells and abilities controlled by target player as though it didn't have shroud";
+    }
+
+    public AutumnWillowEffect(final AutumnWillowEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return true;
+    }
+
+    @Override
+    public AutumnWillowEffect copy() {
+        return new AutumnWillowEffect(this);
+    }
+
+    @Override
+    public boolean applies(UUID sourceId, Ability source, UUID affectedControllerId, Game game) {
+        if (affectedControllerId.equals(source.getFirstTarget())) {
+            Permanent creature = game.getPermanent(sourceId);
+            if (creature != null) {
+                if (sourceId.equals(source.getSourceId())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/cards/b/BackFromTheBrink.java

@@ -40,7 +40,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.Target;
@@ -76,7 +76,7 @@ public class BackFromTheBrink extends CardImpl {
 class BackFromTheBrinkCost extends CostImpl {
 
     public BackFromTheBrinkCost() {
-        Target target = new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"));
+        Target target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD);
         target.setNotTarget(true);
         this.addTarget(target);
         this.text = "Exile a creature card from your graveyard and pay its mana cost";

Mage.Sets/src/mage/cards/b/BetrayalOfFlesh.java

@@ -36,8 +36,8 @@ import mage.abilities.keyword.EntwineAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.filter.StaticFilters;
 import mage.filter.common.FilterControlledLandPermanent;
-import mage.filter.common.FilterCreatureCard;
 import mage.target.common.TargetCardInYourGraveyard;
 import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetCreaturePermanent;
@@ -45,12 +45,12 @@ import mage.target.common.TargetCreaturePermanent;
 /**
  *
  * @author LoneFox
-
+ *
  */
 public class BetrayalOfFlesh extends CardImpl {
 
     public BetrayalOfFlesh(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{5}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{5}{B}");
 
         // Choose one -
         this.getSpellAbility().getModes().setMinModes(1);
@@ -61,7 +61,7 @@ public class BetrayalOfFlesh extends CardImpl {
         // or return target creature card from your graveyard to the battlefield.
         Mode mode = new Mode();
         mode.getEffects().add(new ReturnFromGraveyardToBattlefieldTargetEffect());
-        mode.getTargets().add(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        mode.getTargets().add(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.getSpellAbility().getModes().addMode(mode);
         // Entwine-Sacrifice three lands.
         this.addAbility(new EntwineAbility(new SacrificeTargetCost(new TargetControlledPermanent(3, 3, new FilterControlledLandPermanent("three lands"), true))));

Mage.Sets/src/mage/cards/b/BodySnatcher.java

@@ -41,6 +41,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
+import mage.filter.StaticFilters;
 import mage.filter.common.FilterCreatureCard;
 import mage.target.common.TargetCardInHand;
 import mage.target.common.TargetCardInYourGraveyard;
@@ -52,20 +53,20 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class BodySnatcher extends CardImpl {
 
     public BodySnatcher(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{B}");
         this.subtype.add(SubType.MINION);
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
         // When Body Snatcher enters the battlefield, exile it unless you discard a creature card.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new ExileSourceUnlessPaysEffect(new DiscardTargetCost(new TargetCardInHand(new FilterCreatureCard("a creature card"))))));
-        
+
         // When Body Snatcher dies, exile Body Snatcher and return target creature card from your graveyard to the battlefield.
         Effect effect = new ReturnFromGraveyardToBattlefieldTargetEffect();
         effect.setText("and return target creature card from your graveyard to the battlefield");
         Ability ability = new DiesTriggeredAbility(new ExileSourceEffect(), false);
         ability.addEffect(effect);
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/cards/b/BreathOfLife.java

@@ -32,7 +32,7 @@ import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffec
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -42,12 +42,11 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class BreathOfLife extends CardImpl {
 
     public BreathOfLife(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{W}");
-
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{W}");
 
         // Return target creature card from your graveyard to the battlefield.
         this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
     }
 
     public BreathOfLife(final BreathOfLife card) {

Mage.Sets/src/mage/cards/b/BrokenVisage.java

@@ -0,0 +1,117 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.b;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.DelayedTriggeredAbility;
+import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.SacrificeTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.filter.predicate.permanent.AttackingPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.game.permanent.token.BrokenVisageSpiritToken;
+import mage.target.common.TargetCreaturePermanent;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author L_J
+ */
+public class BrokenVisage extends CardImpl {
+    
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonartifact attacking creature");
+    static {
+        filter.add(Predicates.not(new CardTypePredicate(CardType.ARTIFACT)));
+        filter.add(new AttackingPredicate());
+    }
+
+    public BrokenVisage(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{4}{B}");
+
+        // Destroy target nonartifact attacking creature. It can't be regenerated. Create a black Spirit creature token. Its power is equal to that creature's power and its toughness is equal to that creature's toughness. Sacrifice the token at the beginning of the next end step.
+        this.getSpellAbility().addEffect(new BrokenVisageEffect());
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+    }
+
+    public BrokenVisage(final BrokenVisage card) {
+        super(card);
+    }
+
+    @Override
+    public BrokenVisage copy() {
+        return new BrokenVisage(this);
+    }
+}
+
+class BrokenVisageEffect extends OneShotEffect {
+
+    public BrokenVisageEffect() {
+        super(Outcome.DestroyPermanent);
+        this.staticText = "Destroy target nonartifact attacking creature. It can't be regenerated. Create a black Spirit creature token. Its power is equal to that creature's power and its toughness is equal to that creature's toughness. Sacrifice the token at the beginning of the next end step";
+    }
+
+    public BrokenVisageEffect(final BrokenVisageEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public BrokenVisageEffect copy() {
+        return new BrokenVisageEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent permanent = game.getPermanentOrLKIBattlefield(this.getTargetPointer().getFirst(game, source));
+        if (permanent != null) { 
+            permanent.destroy(source.getSourceId(), game, true);
+            CreateTokenEffect effect = new CreateTokenEffect(new BrokenVisageSpiritToken(permanent.getPower().getValue(), permanent.getToughness().getValue()));
+            effect.apply(game, source);
+            for (UUID tokenId : effect.getLastAddedTokenIds()) {
+                Permanent tokenPermanent = game.getPermanent(tokenId);
+                if (tokenPermanent != null) {
+                    SacrificeTargetEffect sacrificeEffect = new SacrificeTargetEffect("Sacrifice the token at the beginning of the next end step", source.getControllerId());
+                    sacrificeEffect.setTargetPointer(new FixedTarget(tokenPermanent, game));
+                    DelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(sacrificeEffect);
+                    game.addDelayedTriggeredAbility(delayedAbility, source);
+                }
+            }
+        }
+        return true;
+    }
+
+}

Mage.Sets/src/mage/cards/c/CabalSurgeon.java

@@ -41,7 +41,7 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -50,21 +50,19 @@ import mage.target.common.TargetCardInYourGraveyard;
  */
 public class CabalSurgeon extends CardImpl {
 
-    private static final FilterCreatureCard filter = new FilterCreatureCard("creature card from your graveyard");
-    
     public CabalSurgeon(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{B}");
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.MINION);
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
 
         // {2}{B}{B}, {tap}, Exile two cards from your graveyard: Return target creature card from your graveyard to your hand.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(),new ManaCostsImpl("{2}{B}{B}"));
-        ability.addTarget(new TargetCardInYourGraveyard(filter));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{2}{B}{B}"));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         ability.addCost(new TapSourceCost());
         ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2, new FilterCard("cards from your graveyard"))));
-        this.addAbility(ability);    
+        this.addAbility(ability);
     }
 
     public CabalSurgeon(final CabalSurgeon card) {

Mage.Sets/src/mage/cards/c/CadaverImp.java

@@ -37,7 +37,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -47,15 +47,18 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class CadaverImp extends CardImpl {
 
     public CadaverImp(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{B}");
         this.subtype.add(SubType.IMP);
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
+        // Flying
         this.addAbility(FlyingAbility.getInstance());
+
+        // When Cadaver Imp enters the battlefield, you may return target creature card from your graveyard to your hand.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true);
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
 
     }

Mage.Sets/src/mage/cards/c/CauldronDance.java

@@ -42,6 +42,7 @@ import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
+import mage.filter.StaticFilters;
 import mage.filter.common.FilterCreatureCard;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -56,14 +57,14 @@ import mage.target.targetpointer.FixedTarget;
 public class CauldronDance extends CardImpl {
 
     public CauldronDance(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{4}{B}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{4}{B}{R}");
 
         // Cast Cauldron Dance only during combat.
         this.addAbility(new CastOnlyDuringPhaseStepSourceAbility(TurnPhase.COMBAT));
 
         // Return target creature card from your graveyard to the battlefield. That creature gains haste. Return it to your hand at the beginning of the next end step.
         this.getSpellAbility().addEffect(new CauldronDanceReturnFromGraveyardToBattlefieldTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
 
         // You may put a creature card from your hand onto the battlefield. That creature gains haste. Its controller sacrifices it at the beginning of the next end step.
         this.getSpellAbility().addEffect(new CauldronDancePutCreatureFromHandOntoBattlefieldEffect());

Mage.Sets/src/mage/cards/c/CemeteryRecruitment.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.c;
 
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.Card;
@@ -36,13 +37,11 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.common.TargetCardInYourGraveyard;
 
-import java.util.UUID;
-
 /**
  *
  * @author fireshoes
@@ -50,11 +49,11 @@ import java.util.UUID;
 public class CemeteryRecruitment extends CardImpl {
 
     public CemeteryRecruitment(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}");
 
         // Return target creature card from your graveyard to your hand. If it's a Zombie card, draw a card.
         this.getSpellAbility().addEffect(new CemeteryRecruitmentEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
     }
 
     public CemeteryRecruitment(final CemeteryRecruitment card) {

Mage.Sets/src/mage/cards/c/CorpseChurn.java

@@ -37,7 +37,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.common.TargetCardInYourGraveyard;
@@ -49,7 +49,7 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class CorpseChurn extends CardImpl {
 
     public CorpseChurn(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{B}");
 
         // Put the top three cards of your library into your graveyard, then you may return a creature card from your graveyard to your hand.
         getSpellAbility().addEffect(new PutTopCardOfLibraryIntoGraveControllerEffect(3));
@@ -88,7 +88,7 @@ class CorpseChurnEffect extends OneShotEffect {
         if (controller == null) {
             return false;
         }
-        TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"));
+        TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD);
         target.setNotTarget(true);
         if (target.canChoose(source.getSourceId(), source.getControllerId(), game)
                 && controller.chooseUse(outcome, "Return a creature card from your graveyard to hand?", source, game)

Mage.Sets/src/mage/cards/c/CorpseLunge.java

@@ -37,7 +37,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.target.common.TargetCardInYourGraveyard;
@@ -50,11 +50,10 @@ import mage.target.common.TargetCreaturePermanent;
 public class CorpseLunge extends CardImpl {
 
     public CorpseLunge(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{B}");
-
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{B}");
 
         // As an additional cost to cast Corpse Lunge, exile a creature card from your graveyard.
-        this.getSpellAbility().addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))));
+        this.getSpellAbility().addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)));
         // Corpse Lunge deals damage equal to the exiled card's power to target creature.
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         this.getSpellAbility().addEffect(new CorpseLungeEffect());

Mage.Sets/src/mage/cards/c/CruelUltimatum.java

@@ -42,7 +42,6 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.filter.StaticFilters;
-import mage.filter.common.FilterCreatureCard;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.common.TargetCardInYourGraveyard;
@@ -101,7 +100,7 @@ class CruelUltimatumEffect extends OneShotEffect {
         if (controller == null) {
             return false;
         }
-        TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"));
+        TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD);
         if (target.canChoose(source.getSourceId(), source.getControllerId(), game) && controller.choose(Outcome.ReturnToHand, target, source.getSourceId(), game)) {
             Card card = game.getCard(target.getFirstTarget());
             if (card == null) {

Mage.Sets/src/mage/cards/d/DaughterOfAutumn.java

@@ -72,6 +72,7 @@ public class DaughterOfAutumn extends CardImpl {
         // {W}: The next 1 damage that would be dealt to target white creature this turn is dealt to Daughter of Autumn instead.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DaughterOfAutumnPreventDamageTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl("{W}"));
         ability.addTarget(new TargetCreaturePermanent(filter));
+        this.addAbility(ability);
     }
 
     public DaughterOfAutumn(final DaughterOfAutumn card) {

Mage.Sets/src/mage/cards/d/DawnOfTheDead.java

@@ -42,7 +42,7 @@ import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -56,7 +56,7 @@ import mage.target.targetpointer.FixedTarget;
 public class DawnOfTheDead extends CardImpl {
 
     public DawnOfTheDead(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}{B}");
 
         // At the beginning of your upkeep, you lose 1 life.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new LoseLifeSourceControllerEffect(1), TargetController.YOU, false));
@@ -64,7 +64,7 @@ public class DawnOfTheDead extends CardImpl {
         // At the beginning of your upkeep, you may return target creature card from your graveyard to the battlefield.
         // That creature gains haste until end of turn. Exile it at the beginning of the next end step.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DawnOfTheDeadEffect(), TargetController.YOU, true);
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/cards/d/DefyDeath.java

@@ -37,7 +37,7 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.counters.CounterType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.target.common.TargetCardInYourGraveyard;
@@ -49,13 +49,12 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class DefyDeath extends CardImpl {
 
     public DefyDeath(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{W}{W}");
-
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{W}{W}");
 
         // Return target creature card from your graveyard to the battlefield. If it's an Angel, put two +1/+1 counters on it.
         this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect());
         this.getSpellAbility().addEffect(new DefyDeathEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
     }
 
     public DefyDeath(final DefyDeath card) {

Mage.Sets/src/mage/cards/d/DiabolicServitude.java

@@ -44,7 +44,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
@@ -59,12 +59,11 @@ import mage.target.targetpointer.FixedTarget;
 public class DiabolicServitude extends CardImpl {
 
     public DiabolicServitude(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}");
-
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}");
 
         // When Diabolic Servitude enters the battlefield, return target creature card from your graveyard to the battlefield.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DiabolicServitudeReturnCreatureEffect());
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
 
         // When the creature put onto the battlefield with Diabolic Servitude dies, exile it and return Diabolic Servitude to its owner's hand.
@@ -138,10 +137,10 @@ class DiabolicServitudeCreatureDiesTriggeredAbility extends TriggeredAbilityImpl
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (((ZoneChangeEvent)event).isDiesEvent()) {
+        if (((ZoneChangeEvent) event).isDiesEvent()) {
             ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
             Object object = game.getState().getValue(getSourceId().toString() + "returnedCreature");
-            if ((object instanceof MageObjectReference) && ((MageObjectReference)object).refersTo(zEvent.getTarget(), game)) {
+            if ((object instanceof MageObjectReference) && ((MageObjectReference) object).refersTo(zEvent.getTarget(), game)) {
                 return true;
             }
         }
@@ -175,7 +174,7 @@ class DiabolicServitudeExileCreatureEffect extends OneShotEffect {
         Object object = game.getState().getValue(source.getSourceId().toString() + "returnedCreature");
         if ((object instanceof MageObjectReference)) {
             Effect effect = new ExileTargetEffect();
-            effect.setTargetPointer(new FixedTarget(((MageObjectReference)object).getSourceId()));
+            effect.setTargetPointer(new FixedTarget(((MageObjectReference) object).getSourceId()));
             effect.apply(game, source);
             return new ReturnToHandSourceEffect(true).apply(game, source);
         }
@@ -204,7 +203,7 @@ class DiabolicServitudeSourceLeftBattlefieldEffect extends OneShotEffect {
         Object object = game.getState().getValue(source.getSourceId().toString() + "returnedCreature");
         if ((object instanceof MageObjectReference)) {
             Effect effect = new ExileTargetEffect(null, "", Zone.BATTLEFIELD);
-            effect.setTargetPointer(new FixedTarget(((MageObjectReference)object).getSourceId()));
+            effect.setTargetPointer(new FixedTarget(((MageObjectReference) object).getSourceId()));
             effect.apply(game, source);
         }
         return false;

Mage.Sets/src/mage/cards/d/Disentomb.java

@@ -1,16 +1,16 @@
 /*
  *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
- * 
+ *
  *  Redistribution and use in source and binary forms, with or without modification, are
  *  permitted provided that the following conditions are met:
- * 
+ *
  *     1. Redistributions of source code must retain the above copyright notice, this list of
  *        conditions and the following disclaimer.
- * 
+ *
  *     2. Redistributions in binary form must reproduce the above copyright notice, this list
  *        of conditions and the following disclaimer in the documentation and/or other materials
  *        provided with the distribution.
- * 
+ *
  *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
  *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
@@ -20,12 +20,11 @@
  *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  *  The views and conclusions contained in the software and documentation are those of the
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.cards.d;
 
 import java.util.UUID;
@@ -33,7 +32,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -42,12 +41,10 @@ import mage.target.common.TargetCardInYourGraveyard;
  */
 public class Disentomb extends CardImpl {
 
-    private static FilterCreatureCard filter = new FilterCreatureCard("creature card from your graveyard");
-
     public Disentomb(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{B}");
 
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
     }
 

Mage.Sets/src/mage/cards/d/DisturbedBurial.java

@@ -33,7 +33,7 @@ import mage.abilities.keyword.BuybackAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -41,16 +41,14 @@ import mage.target.common.TargetCardInYourGraveyard;
  * @author fireshoes
  */
 public class DisturbedBurial extends CardImpl {
-    
-    private static FilterCreatureCard filter = new FilterCreatureCard("creature card from your graveyard");
 
     public DisturbedBurial(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}");
 
         // Buyback {3}
-        this.addAbility(new BuybackAbility("{3}"));        
+        this.addAbility(new BuybackAbility("{3}"));
         // Return target creature card from your graveyard to your hand.
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
     }
 

Mage.Sets/src/mage/cards/d/DoomedNecromancer.java

@@ -38,10 +38,10 @@ import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffec
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.SubType;
 import mage.constants.ColoredManaSymbol;
+import mage.constants.SubType;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -51,7 +51,7 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class DoomedNecromancer extends CardImpl {
 
     public DoomedNecromancer(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.CLERIC);
         this.subtype.add(SubType.MERCENARY);
@@ -63,9 +63,9 @@ public class DoomedNecromancer extends CardImpl {
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ColoredManaCost(ColoredManaSymbol.B));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
-        
+
     }
 
     public DoomedNecromancer(final DoomedNecromancer card) {

Mage.Sets/src/mage/cards/d/DreadDefiler.java

@@ -40,10 +40,10 @@ import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.SubType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.common.TargetCardInYourGraveyard;
@@ -56,17 +56,17 @@ import mage.target.common.TargetOpponent;
 public class DreadDefiler extends CardImpl {
 
     public DreadDefiler(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{6}{B}");
         this.subtype.add(SubType.ELDRAZI);
         this.power = new MageInt(6);
         this.toughness = new MageInt(8);
 
         // Devoid
         this.addAbility(new DevoidAbility(this.color));
-        
+
         // {3}{C}, Exile a creature card from your graveyard: Target opponent loses life equal to the exiled card's power.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DreadDefilerEffect(), new ManaCostsImpl("{3}{C}"));
-        ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))));
+        ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)));
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/d/DreadReturn.java

@@ -35,8 +35,8 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.TimingRule;
+import mage.filter.StaticFilters;
 import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.common.FilterCreatureCard;
 import mage.target.common.TargetCardInYourGraveyard;
 import mage.target.common.TargetControlledCreaturePermanent;
 
@@ -47,14 +47,13 @@ import mage.target.common.TargetControlledCreaturePermanent;
 public class DreadReturn extends CardImpl {
 
     public DreadReturn(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}{B}");
-
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}{B}");
 
         // Return target creature card from your graveyard to the battlefield.
         this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         // Flashback-Sacrifice three creatures.
-        this.addAbility(new FlashbackAbility(new SacrificeTargetCost(new TargetControlledCreaturePermanent(3,3,new FilterControlledCreaturePermanent("three creatures"),true)), TimingRule.SORCERY));
+        this.addAbility(new FlashbackAbility(new SacrificeTargetCost(new TargetControlledCreaturePermanent(3, 3, new FilterControlledCreaturePermanent("three creatures"), true)), TimingRule.SORCERY));
     }
 
     public DreadReturn(final DreadReturn card) {

Mage.Sets/src/mage/cards/d/DuskCharger.java

@@ -0,0 +1,78 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.d;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.common.CitysBlessingCondition;
+import mage.abilities.decorator.ConditionalContinuousEffect;
+import mage.abilities.effects.ContinuousEffect;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.abilities.keyword.AscendAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.Zone;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class DuskCharger extends CardImpl {
+
+    public DuskCharger(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}");
+
+        this.subtype.add(SubType.HORSE);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
+
+        // Ascend
+        this.addAbility(new AscendAbility());
+
+        // Dusk Charger gets +2/+2 as long as you have the city's blessing.
+        ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield);
+        ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, CitysBlessingCondition.instance,
+                "{this} gets +2/+2 as long as you have the city's blessing");
+        Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect);
+        this.addAbility(ability);
+    }
+
+    public DuskCharger(final DuskCharger card) {
+        super(card);
+    }
+
+    @Override
+    public DuskCharger copy() {
+        return new DuskCharger(this);
+    }
+}

Mage.Sets/src/mage/cards/e/ElendaTheDuskRose.java

@@ -0,0 +1,78 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.e;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.DiesCreatureTriggeredAbility;
+import mage.abilities.common.DiesTriggeredAbility;
+import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.keyword.LifelinkAbility;
+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.permanent.token.IxalanVampireToken;
+
+/**
+ *
+ * @author L_J
+ */
+public class ElendaTheDuskRose extends CardImpl {
+
+    public ElendaTheDuskRose(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{B}");
+        addSuperType(SuperType.LEGENDARY);
+        this.subtype.add(SubType.VAMPIRE);
+        this.subtype.add(SubType.KNIGHT);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(1);
+
+        // Lifelink
+        this.addAbility(LifelinkAbility.getInstance());
+
+        // Whenever another creature dies, put a +1/+1 counter on Elenda, The Dusk Rose.
+        this.addAbility(new DiesCreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, true));
+
+        // When Elenda dies, create X 1/1 white Vampire creature tokens with lifelink, where X is Elenda's power. 
+        this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new IxalanVampireToken(), new SourcePermanentPowerCount())));
+    }
+
+    public ElendaTheDuskRose(final ElendaTheDuskRose card) {
+        super(card);
+    }
+
+    @Override
+    public ElendaTheDuskRose copy() {
+        return new ElendaTheDuskRose(this);
+    }
+}

Mage.Sets/src/mage/cards/e/EmeriaTheSkyRuin.java

@@ -37,7 +37,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.filter.common.FilterLandPermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
@@ -48,12 +48,12 @@ import mage.target.common.TargetCardInYourGraveyard;
 /**
  *
  * @author North
- * @author LevelX - changed to checkInterveningIfClause 
+ * @author LevelX - changed to checkInterveningIfClause
  */
 public class EmeriaTheSkyRuin extends CardImpl {
 
     public EmeriaTheSkyRuin(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
+        super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
 
         // Emeria, the Sky Ruin enters the battlefield tapped.
         this.addAbility(new EntersBattlefieldTappedAbility());
@@ -83,7 +83,7 @@ class EmeriaTheSkyRuinTriggeredAbility extends TriggeredAbilityImpl {
 
     public EmeriaTheSkyRuinTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), true);
-        this.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        this.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
     }
 
     public EmeriaTheSkyRuinTriggeredAbility(final EmeriaTheSkyRuinTriggeredAbility ability) {
@@ -107,7 +107,7 @@ class EmeriaTheSkyRuinTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkInterveningIfClause(Game game) {
-    return game.getBattlefield().countAll(filter, this.controllerId, game) >= 7;
+        return game.getBattlefield().countAll(filter, this.controllerId, game) >= 7;
     }
 
     @Override

Mage.Sets/src/mage/cards/e/EntomberExarch.java

@@ -38,11 +38,11 @@ import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.SubType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
@@ -58,7 +58,7 @@ import mage.target.common.TargetOpponent;
 public class EntomberExarch extends CardImpl {
 
     public EntomberExarch(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{B}");
         this.subtype.add(SubType.CLERIC);
 
         this.power = new MageInt(2);
@@ -66,7 +66,7 @@ public class EntomberExarch extends CardImpl {
 
         // When Entomber Exarch enters the battlefield, choose one - Return target creature card from your graveyard to your hand; or target opponent reveals his or her hand, you choose a noncreature card from it, then that player discards that card.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), false);
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         Mode mode = new Mode();
         mode.getEffects().add(new EntomberExarchEffect());
         mode.getTargets().add(new TargetOpponent());
@@ -85,6 +85,7 @@ public class EntomberExarch extends CardImpl {
 }
 
 class EntomberExarchEffect extends OneShotEffect {
+
     private static final FilterCard filter = new FilterCard("noncreature card");
 
     static {

Mage.Sets/src/mage/cards/e/EvolutionCharm.java

@@ -37,7 +37,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.filter.StaticFilters;
-import mage.filter.common.FilterCreatureCard;
 import mage.target.common.TargetCardInLibrary;
 import mage.target.common.TargetCardInYourGraveyard;
 import mage.target.common.TargetCreaturePermanent;
@@ -49,21 +48,19 @@ import java.util.UUID;
  * @author fireshoes
  */
 public class EvolutionCharm extends CardImpl {
-    
-    private static FilterCreatureCard filter = new FilterCreatureCard("creature card from your graveyard");
 
     public EvolutionCharm(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{G}");
 
         // Choose one - Search your library for a basic land card, reveal it, put it into your hand, then shuffle your library;
         this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_BASIC_LAND_CARD), true, true));
-        
-        // or return target creature card from your graveyard to your hand; 
+
+        // or return target creature card from your graveyard to your hand;
         Mode mode = new Mode();
         mode.getEffects().add(new ReturnToHandTargetEffect());
-        mode.getTargets().add(new TargetCardInYourGraveyard(filter));
+        mode.getTargets().add(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.getSpellAbility().addMode(mode);
-        
+
         // or target creature gains flying until end of turn.
         mode = new Mode();
         mode.getEffects().add(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn));

Mage.Sets/src/mage/cards/f/FalseDefeat.java

@@ -32,7 +32,7 @@ import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffec
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -42,11 +42,11 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class FalseDefeat extends CardImpl {
 
     public FalseDefeat(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{W}");
 
         // Return target creature card from your graveyard to the battlefield.
         this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
     }
 
     public FalseDefeat(final FalseDefeat card) {

Mage.Sets/src/mage/cards/f/FearsomeAwakening.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.f;
 
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
@@ -36,13 +37,11 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.counters.CounterType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.target.common.TargetCardInYourGraveyard;
 
-import java.util.UUID;
-
 /**
  *
  * @author fireshoes
@@ -50,12 +49,12 @@ import java.util.UUID;
 public class FearsomeAwakening extends CardImpl {
 
     public FearsomeAwakening(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{B}");
 
         // Return target creature card from your graveyard to the battlefield. If it's a Dragon, put two +1/+1 counters on it.
         this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect());
         this.getSpellAbility().addEffect(new FearsomeAwakeningEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
     }
 
     public FearsomeAwakening(final FearsomeAwakening card) {
@@ -93,4 +92,4 @@ class FearsomeAwakeningEffect extends OneShotEffect {
         }
         return false;
     }
-}
+}

Mage.Sets/src/mage/cards/f/FirstResponse.java

@@ -28,18 +28,15 @@
 package mage.cards.f;
 
 import java.util.UUID;
-import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
-import mage.abilities.effects.OneShotEffect;
+import mage.abilities.condition.common.LiveLostLastTurnCondition;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Outcome;
 import mage.constants.TargetController;
-import mage.game.Game;
 import mage.game.permanent.token.SoldierToken;
-import mage.watchers.common.PlayerLostLifeWatcher;
 
 /**
  *
@@ -51,8 +48,10 @@ public class FirstResponse extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}");
 
         // At the beginning of each upkeep, if you lost life last turn, create a 1/1 white Soldier creature token.
-        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new FirstResponseEffect(), TargetController.ANY, false), new PlayerLostLifeWatcher());
-
+        this.addAbility(new ConditionalTriggeredAbility(
+                new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SoldierToken()), TargetController.ANY, false),
+                LiveLostLastTurnCondition.instance,
+                "At the beginning of each upkeep, if you lost life last turn, create a 1/1 white Soldier creature token."));
     }
 
     public FirstResponse(final FirstResponse card) {
@@ -64,32 +63,3 @@ public class FirstResponse extends CardImpl {
         return new FirstResponse(this);
     }
 }
-
-class FirstResponseEffect extends OneShotEffect {
-
-    public FirstResponseEffect() {
-        super(Outcome.PutCreatureInPlay);
-        this.staticText = "if you lost life last turn, create a 1/1 white Soldier creature token";
-    }
-
-    public FirstResponseEffect(final FirstResponseEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public FirstResponseEffect copy() {
-        return new FirstResponseEffect(this);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        PlayerLostLifeWatcher watcher = (PlayerLostLifeWatcher) game.getState().getWatchers().get(PlayerLostLifeWatcher.class.getSimpleName());
-        if (watcher != null) {
-            if (watcher.getLiveLostLastTurn(source.getControllerId()) > 0) {
-                return new CreateTokenEffect(new SoldierToken()).apply(game, source);
-            }
-            return true;
-        }
-        return false;
-    }
-}

Mage.Sets/src/mage/cards/f/ForerunnerOfTheCoalition.java

@@ -0,0 +1,88 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.f;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.LoseLifeOpponentsEffect;
+import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.*;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterBySubtypeCard;
+import mage.filter.predicate.permanent.AnotherPredicate;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.target.common.TargetCardInLibrary;
+
+/**
+ *
+ * @author JayDi85
+ */
+public class ForerunnerOfTheCoalition extends CardImpl {
+
+    private static final FilterPermanent filterAnotherPirate = new FilterPermanent(SubType.PIRATE, "another " + SubType.PIRATE.toString());
+
+    static {
+        filterAnotherPirate.add(new AnotherPredicate());
+        filterAnotherPirate.add(new ControllerPredicate(TargetController.YOU));
+    }
+
+    public ForerunnerOfTheCoalition(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
+
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.PIRATE);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // When Forerunner of the Coalition enters the battlefield, you may search your library for a Pirate card, reveal it, then shuffle your library and put that card on top of it.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(
+                new SearchLibraryPutOnLibraryEffect(
+                        new TargetCardInLibrary(new FilterBySubtypeCard(SubType.PIRATE)),
+                        true, true), true));
+
+        // Whenever another Pirate enters the battlefield under your control, each opponent loses 1 life.
+        Ability ability = new EntersBattlefieldControlledTriggeredAbility(
+                Zone.BATTLEFIELD, new LoseLifeOpponentsEffect(1),
+                filterAnotherPirate, false);
+        this.addAbility(ability);
+    }
+
+    public ForerunnerOfTheCoalition(final ForerunnerOfTheCoalition card) {
+        super(card);
+    }
+
+    @Override
+    public ForerunnerOfTheCoalition copy() {
+        return new ForerunnerOfTheCoalition(this);
+    }
+}

Mage.Sets/src/mage/cards/f/ForerunnerOfTheEmpire.java

@@ -0,0 +1,95 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.f;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.CreatureEntersBattlefieldTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.DamageAllEffect;
+import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.*;
+import mage.filter.common.FilterBySubtypeCard;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.target.common.TargetCardInLibrary;
+
+/**
+ *
+ * @author JayDi85
+ */
+public class ForerunnerOfTheEmpire extends CardImpl {
+
+    private static final FilterCreaturePermanent filterAnyDinosaur = new FilterCreaturePermanent(SubType.DINOSAUR, SubType.DINOSAUR.toString());
+
+    static {
+        filterAnyDinosaur.add(new ControllerPredicate(TargetController.YOU));
+    }
+
+    public ForerunnerOfTheEmpire(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}");
+
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.SOLDIER);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(3);
+
+        // When Forerunner of the Empire enters the battlefield, you may search your library for a Dinosaur card, reveal it, then shuffle your library and put that card on top of it.
+        this.addAbility(
+                new EntersBattlefieldTriggeredAbility(
+                        new SearchLibraryPutOnLibraryEffect(
+                                new TargetCardInLibrary(new FilterBySubtypeCard(SubType.DINOSAUR)),
+                                true,
+                                true
+                        ),
+                        true
+                )
+        );
+
+        // Whenever a Dinosaur enters the battlefield under your control, you may have Forerunner of the Empire deal 1 damage to each creature.
+        Ability ability = new CreatureEntersBattlefieldTriggeredAbility(
+                Zone.BATTLEFIELD,
+                new DamageAllEffect(1, new FilterCreaturePermanent()).setText("have {this} deal 1 damage to each creature"),
+                filterAnyDinosaur,
+                true,
+                false);
+        this.addAbility(ability);
+    }
+
+    public ForerunnerOfTheEmpire(final ForerunnerOfTheEmpire card) {
+        super(card);
+    }
+
+    @Override
+    public ForerunnerOfTheEmpire copy() {
+        return new ForerunnerOfTheEmpire(this);
+    }
+}

Mage.Sets/src/mage/cards/f/ForerunnerOfTheHeralds.java

@@ -0,0 +1,95 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.f;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect;
+import mage.constants.SubType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.TargetController;
+import mage.counters.CounterType;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterBySubtypeCard;
+import mage.filter.predicate.permanent.AnotherPredicate;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.target.common.TargetCardInLibrary;
+
+/**
+ *
+ * @author JayDi85
+ */
+public class ForerunnerOfTheHeralds extends CardImpl {
+
+    private static final FilterPermanent filterAnotherMerfolk = new FilterPermanent(SubType.MERFOLK, SubType.MERFOLK.toString());
+    static {
+        filterAnotherMerfolk.add(new AnotherPredicate());
+        filterAnotherMerfolk.add(new ControllerPredicate(TargetController.YOU));
+    }
+
+    public ForerunnerOfTheHeralds(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}");
+
+        this.subtype.add(SubType.MERFOLK);
+        this.subtype.add(SubType.SCOUT);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(2);
+
+
+        // When Forerunner of the Heralds enters the battlefield, you may search your library for a Merfolk card, reveal it, then shuffle your library and put that card on top of it.
+        this.addAbility(
+                new EntersBattlefieldTriggeredAbility(
+                        new SearchLibraryPutOnLibraryEffect(
+                                new TargetCardInLibrary(new FilterBySubtypeCard(SubType.MERFOLK)),
+                                true,
+                                true
+                        ),
+                true
+                )
+        );
+
+        // Whenever another Merfolk enters the battlefield under your control, put a +1/+1 counter on Forerunner of the Heralds.
+        Ability ability = new EntersBattlefieldControlledTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filterAnotherMerfolk);
+        this.addAbility(ability);
+    }
+
+    public ForerunnerOfTheHeralds(final ForerunnerOfTheHeralds card) {
+        super(card);
+    }
+
+    @Override
+    public ForerunnerOfTheHeralds copy() {
+        return new ForerunnerOfTheHeralds(this);
+    }
+}

Mage.Sets/src/mage/cards/f/ForerunnerOfTheLegion.java

@@ -0,0 +1,93 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.f;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect;
+import mage.constants.*;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterBySubtypeCard;
+import mage.filter.predicate.permanent.AnotherPredicate;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.target.common.TargetCardInLibrary;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author JayDi85
+ */
+public class ForerunnerOfTheLegion extends CardImpl {
+
+    private static final FilterPermanent filterAnotherVampire = new FilterPermanent(SubType.VAMPIRE, "another " + SubType.VAMPIRE.toString());
+    static {
+        filterAnotherVampire.add(new AnotherPredicate());
+        filterAnotherVampire.add(new ControllerPredicate(TargetController.YOU));
+    }
+
+    public ForerunnerOfTheLegion(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}");
+
+        this.subtype.add(SubType.VAMPIRE);
+        this.subtype.add(SubType.KNIGHT);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // When Forerunner of the Legion enters the battlefield, you may search your library for a Vampire card, reveal it, then shuffle your library and put that card on top of it.
+        this.addAbility(
+                new EntersBattlefieldTriggeredAbility(
+                        new SearchLibraryPutOnLibraryEffect(
+                                new TargetCardInLibrary(new FilterBySubtypeCard(SubType.VAMPIRE)),
+                                true,
+                                true
+                        ),
+                        true
+                )
+        );
+
+        // Whenever another Vampire enters the battlefield under your control, target creature gets +1/+1 until end of turn.
+        Ability ability = new EntersBattlefieldControlledTriggeredAbility(new BoostTargetEffect(1,1, Duration.EndOfTurn), filterAnotherVampire);
+        ability.addTarget(new TargetCreaturePermanent());
+        this.addAbility(ability);
+    }
+
+    public ForerunnerOfTheLegion(final ForerunnerOfTheLegion card) {
+        super(card);
+    }
+
+    @Override
+    public ForerunnerOfTheLegion copy() {
+        return new ForerunnerOfTheLegion(this);
+    }
+}

Mage.Sets/src/mage/cards/f/FortuitousFind.java

@@ -33,8 +33,8 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.filter.StaticFilters;
 import mage.filter.common.FilterArtifactCard;
-import mage.filter.common.FilterCreatureCard;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -44,7 +44,7 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class FortuitousFind extends CardImpl {
 
     public FortuitousFind(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}");
 
         // Choose one or both —
         this.getSpellAbility().getModes().setMinModes(1);
@@ -57,7 +57,7 @@ public class FortuitousFind extends CardImpl {
         // or Return target creature card from your graveyard to your hand.
         Mode mode = new Mode();
         mode.getEffects().add(new ReturnToHandTargetEffect());
-        mode.getTargets().add(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        mode.getTargets().add(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.getSpellAbility().addMode(mode);
     }
 

Mage.Sets/src/mage/cards/f/FoulRenewal.java

@@ -39,7 +39,7 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.common.TargetCardInYourGraveyard;
@@ -53,11 +53,11 @@ import mage.target.targetpointer.FixedTarget;
 public class FoulRenewal extends CardImpl {
 
     public FoulRenewal(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{B}");
 
         // Return target creature card from your graveyard to your hand. Target creature gets -X/-X until end of turn, where X is the toughness of the card returned this way.
         this.getSpellAbility().addEffect(new FoulRenewalEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 

Mage.Sets/src/mage/cards/g/Genesis.java

@@ -40,7 +40,7 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.TargetController;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -50,7 +50,7 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class Genesis extends CardImpl {
 
     public Genesis(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}");
         this.subtype.add(SubType.INCARNATION);
 
         this.power = new MageInt(4);
@@ -58,8 +58,8 @@ public class Genesis extends CardImpl {
 
         // At the beginning of your upkeep, if Genesis is in your graveyard, you may pay {2}{G}. If you do, return target creature card from your graveyard to your hand.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(
-                Zone.GRAVEYARD, new DoIfCostPaid(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl("{2}{G}")),TargetController.YOU, false, false);
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+                Zone.GRAVEYARD, new DoIfCostPaid(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl("{2}{G}")), TargetController.YOU, false, false);
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/cards/g/GhoulcallersChant.java

@@ -35,7 +35,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.filter.FilterCard;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.target.common.TargetCardInYourGraveyard;
 
@@ -56,7 +56,7 @@ public class GhoulcallersChant extends CardImpl {
 
         // Choose one - Return target creature card from your graveyard to your hand
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         // or return two target Zombie cards from your graveyard to your hand.
         Mode mode = new Mode();
         mode.getEffects().add(new ReturnToHandTargetEffect());

Mage.Sets/src/mage/cards/g/GloriousDestiny.java

@@ -0,0 +1,92 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.g;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.AsEntersBattlefieldAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.common.CitysBlessingCondition;
+import mage.abilities.decorator.ConditionalContinuousEffect;
+import mage.abilities.effects.ContinuousEffect;
+import mage.abilities.effects.common.ChooseCreatureTypeEffect;
+import mage.abilities.effects.common.continuous.BoostAllOfChosenSubtypeEffect;
+import mage.abilities.effects.common.continuous.GainAbilityAllOfChosenSubtypeEffect;
+import mage.abilities.keyword.AscendAbility;
+import mage.abilities.keyword.VigilanceAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import static mage.filter.StaticFilters.FILTER_PERMANENT_CREATURES_CONTROLLED;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class GloriousDestiny extends CardImpl {
+
+    private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control of the chosen type");
+
+    static {
+        filter.add(new ControllerPredicate(TargetController.YOU));
+    }
+
+    public GloriousDestiny(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}");
+
+        // Ascend
+        this.addAbility(new AscendAbility());
+
+        // As Glorious Destiny enters the battlefield, choose a creature type.
+        this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.BoostCreature)));
+
+        // Creatures you control of the chosen type get +1/+1.  They have vigilance as long as you have the city's blessing.
+        Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllOfChosenSubtypeEffect(1, 1, Duration.WhileOnBattlefield, filter, true));
+        ContinuousEffect effect = new ConditionalContinuousEffect(
+                new GainAbilityAllOfChosenSubtypeEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, FILTER_PERMANENT_CREATURES_CONTROLLED),
+                CitysBlessingCondition.instance,
+                "They have vigilance as long as you have the city's blessing");
+        ability.addEffect(effect);
+        this.addAbility(ability);
+    }
+
+    public GloriousDestiny(final GloriousDestiny card) {
+        super(card);
+    }
+
+    @Override
+    public GloriousDestiny copy() {
+        return new GloriousDestiny(this);
+    }
+}

Mage.Sets/src/mage/cards/g/GodPharaohsGift.java

@@ -45,7 +45,7 @@ import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.constants.TargetController;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.token.EmptyToken;
@@ -80,7 +80,6 @@ public class GodPharaohsGift extends CardImpl {
 
 class GodPharaohsGiftEffect extends OneShotEffect {
 
-    private static final FilterCreatureCard filter = new FilterCreatureCard("creature card from your graveyard");
     private final UUID exileId = UUID.randomUUID();
 
     public GodPharaohsGiftEffect() {
@@ -102,9 +101,9 @@ class GodPharaohsGiftEffect extends OneShotEffect {
         Player controller = game.getPlayer(source.getControllerId());
         MageObject sourceObject = source.getSourceObject(game);
         if (controller != null && sourceObject != null) {
-            TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(filter);
+            TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD);
             target.setNotTarget(true);
-            if (!controller.getGraveyard().getCards(filter, game).isEmpty()
+            if (!controller.getGraveyard().getCards(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD, game).isEmpty()
                     && controller.choose(Outcome.PutCreatureInPlay, target, source.getId(), game)) {
                 Card cardChosen = game.getCard(target.getFirstTarget());
                 if (cardChosen != null

Mage.Sets/src/mage/cards/g/GolgariGuildmage.java

@@ -25,7 +25,6 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.cards.g;
 
 import java.util.UUID;
@@ -42,7 +41,7 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.counters.CounterType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 import mage.target.common.TargetControlledCreaturePermanent;
 import mage.target.common.TargetCreaturePermanent;
@@ -53,24 +52,23 @@ import mage.target.common.TargetCreaturePermanent;
  */
 public class GolgariGuildmage extends CardImpl {
 
-    public GolgariGuildmage (UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B/G}{B/G}");
+    public GolgariGuildmage(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B/G}{B/G}");
         this.subtype.add(SubType.ELF);
         this.subtype.add(SubType.SHAMAN);
 
-
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{4}{B}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent()));
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
         ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{4}{G}"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }
 
-    public GolgariGuildmage (final GolgariGuildmage card) {
+    public GolgariGuildmage(final GolgariGuildmage card) {
         super(card);
     }
 

Mage.Sets/src/mage/cards/g/GraveExchange.java

@@ -35,8 +35,8 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
+import mage.filter.StaticFilters;
 import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.common.FilterCreatureCard;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -51,15 +51,12 @@ import mage.target.common.TargetControlledPermanent;
  */
 public class GraveExchange extends CardImpl {
 
-    private static final FilterCreatureCard filter = new FilterCreatureCard("creature card from your graveyard");
-
     public GraveExchange(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{B}{B}");
-
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{B}{B}");
 
         // Return target creature card from your graveyard to your hand.
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         // Target player sacrifices a creature.
         this.getSpellAbility().addEffect(new GraveExchangeEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());

Mage.Sets/src/mage/cards/g/Gravedigger.java

@@ -1,16 +1,16 @@
 /*
  *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
- * 
+ *
  *  Redistribution and use in source and binary forms, with or without modification, are
  *  permitted provided that the following conditions are met:
- * 
+ *
  *     1. Redistributions of source code must retain the above copyright notice, this list of
  *        conditions and the following disclaimer.
- * 
+ *
  *     2. Redistributions in binary form must reproduce the above copyright notice, this list
  *        of conditions and the following disclaimer in the documentation and/or other materials
  *        provided with the distribution.
- * 
+ *
  *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
  *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
@@ -20,12 +20,11 @@
  *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  *  The views and conclusions contained in the software and documentation are those of the
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.cards.g;
 
 import java.util.UUID;
@@ -37,7 +36,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -47,14 +46,14 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class Gravedigger extends CardImpl {
 
     public Gravedigger(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}");
         this.subtype.add(SubType.ZOMBIE);
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
         Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true);
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/cards/g/GrimDiscovery.java

@@ -1,4 +1,4 @@
-    /*
+/*
  *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without modification, are
@@ -27,15 +27,15 @@
  */
 package mage.cards.g;
 
-    import java.util.UUID;
-    import mage.abilities.Mode;
-    import mage.abilities.effects.common.ReturnToHandTargetEffect;
-    import mage.cards.CardImpl;
-    import mage.cards.CardSetInfo;
-    import mage.constants.CardType;
-    import mage.filter.common.FilterCreatureCard;
-    import mage.filter.common.FilterLandCard;
-    import mage.target.common.TargetCardInYourGraveyard;
+import java.util.UUID;
+import mage.abilities.Mode;
+import mage.abilities.effects.common.ReturnToHandTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.filter.StaticFilters;
+import mage.filter.common.FilterLandCard;
+import mage.target.common.TargetCardInYourGraveyard;
 
 /**
  *
@@ -43,19 +43,17 @@ package mage.cards.g;
  */
 public class GrimDiscovery extends CardImpl {
 
-    private static final FilterCreatureCard filterCreatureCard = new FilterCreatureCard("creature card from your graveyard");
     private static final FilterLandCard filterLandCard = new FilterLandCard("land card from your graveyard");
 
     public GrimDiscovery(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{B}");
-
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}");
 
         // Choose one or both -
         this.getSpellAbility().getModes().setMinModes(1);
         this.getSpellAbility().getModes().setMaxModes(2);
         // Return target creature card from your graveyard to your hand;
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filterCreatureCard));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         // and/or return target land card from your graveyard to your hand.
         Mode mode1 = new Mode();
         mode1.getEffects().add(new ReturnToHandTargetEffect());

Mage.Sets/src/mage/cards/g/GrimHarvest.java

@@ -34,7 +34,7 @@ import mage.abilities.keyword.RecoverAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -42,16 +42,14 @@ import mage.target.common.TargetCardInYourGraveyard;
  * @author fireshoes
  */
 public class GrimHarvest extends CardImpl {
-    
-    private static FilterCreatureCard filter = new FilterCreatureCard("creature card from your graveyard");
 
     public GrimHarvest(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{B}");
 
         // Return target creature card from your graveyard to your hand.
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
-        
+
         // Recover {2}{B}
         this.addAbility(new RecoverAbility(new ManaCostsImpl("{2}{B}"), this));
     }

Mage.Sets/src/mage/cards/g/GroundSeal.java

@@ -28,21 +28,14 @@
 package mage.cards.g;
 
 import java.util.UUID;
-import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
+import mage.abilities.effects.common.CantBeTargetedCardsGraveyardsEffect;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
-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.game.Game;
-import mage.game.events.GameEvent;
-import mage.game.stack.StackObject;
 
 /**
  * @author jeffwadsworth
@@ -52,12 +45,11 @@ public class GroundSeal extends CardImpl {
     public GroundSeal(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}");
 
-
         // When Ground Seal enters the battlefield, draw a card.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1)));
 
         // Cards in graveyards can't be the targets of spells or abilities.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GroundSealEffect()));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedCardsGraveyardsEffect()));
     }
 
     public GroundSeal(final GroundSeal card) {
@@ -69,40 +61,3 @@ public class GroundSeal extends CardImpl {
         return new GroundSeal(this);
     }
 }
-
-class GroundSealEffect extends ContinuousRuleModifyingEffectImpl {
-
-    public GroundSealEffect() {
-        super(Duration.WhileOnBattlefield, Outcome.Benefit);
-        staticText = "Cards in graveyards can't be the targets of spells or abilities";
-    }
-
-    public GroundSealEffect(final GroundSealEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public GroundSealEffect copy() {
-        return new GroundSealEffect(this);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        return true;
-    }
-
-    @Override
-    public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.TARGET) {
-            Card targetCard = game.getCard(event.getTargetId());
-            StackObject stackObject = game.getStack().getStackObject(event.getSourceId());
-            if (targetCard != null && stackObject != null) {
-                Zone zone = game.getState().getZone(targetCard.getId());
-                if (zone != null && zone == Zone.GRAVEYARD) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}

Mage.Sets/src/mage/cards/h/HauntedCrossroads.java

@@ -36,7 +36,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -46,11 +46,11 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class HauntedCrossroads extends CardImpl {
 
     public HauntedCrossroads(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}");
 
         // {B}: Put target creature card from your graveyard on top of your library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl("{B}"));
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/cards/h/HazduhrTheAbbot.java

@@ -0,0 +1,130 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.h;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.ObjectColor;
+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.RedirectionEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.Duration;
+import mage.constants.SuperType;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetControlledCreaturePermanent;
+
+/**
+ *
+ * @author TheElk801 & L_J
+ */
+public class HazduhrTheAbbot extends CardImpl {
+
+    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("white creature you control");
+
+    static {
+        filter.add(new ColorPredicate(ObjectColor.WHITE));
+    }
+
+    public HazduhrTheAbbot(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{W}");
+        addSuperType(SuperType.LEGENDARY);
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.CLERIC);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(5);
+
+        // {X}, {T}: The next X damage that would be dealt this turn to target white creature you control is dealt to Hazduhr the Abbot instead.
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HazduhrTheAbbotRedirectDamageEffect(Duration.EndOfTurn), new ManaCostsImpl("{X}"));
+        ability.addCost(new TapSourceCost());
+        ability.addTarget(new TargetControlledCreaturePermanent(filter));
+        this.addAbility(ability);
+    }
+
+    public HazduhrTheAbbot(final HazduhrTheAbbot card) {
+        super(card);
+    }
+
+    @Override
+    public HazduhrTheAbbot copy() {
+        return new HazduhrTheAbbot(this);
+    }
+}
+
+class HazduhrTheAbbotRedirectDamageEffect extends RedirectionEffect {
+
+    private static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
+
+    public HazduhrTheAbbotRedirectDamageEffect(Duration duration) {
+        super(duration, 0, true);
+        this.staticText = "The next X damage that would be dealt this turn to target white creature you control is dealt to {this} instead";
+    }
+
+    public HazduhrTheAbbotRedirectDamageEffect(final HazduhrTheAbbotRedirectDamageEffect effect) {
+        super(effect);
+    }
+    
+    @Override
+    public void init(Ability source, Game game) {
+        amountToRedirect = source.getManaCostsToPay().getX();
+    }
+
+    @Override
+    public HazduhrTheAbbotRedirectDamageEffect copy() {
+        return new HazduhrTheAbbotRedirectDamageEffect(this);
+    }
+
+    @Override
+    public boolean applies(GameEvent event, Ability source, Game game) {
+        Permanent permanent = game.getBattlefield().getPermanent(source.getSourceId());
+        if (permanent != null) {
+            if (filter.match(permanent, permanent.getId(), permanent.getControllerId(), game)) {
+                if (event.getTargetId().equals(getTargetPointer().getFirst(game, source))) {
+                    if (event.getTargetId() != null) {
+                        TargetPermanent target = new TargetPermanent();
+                        target.add(source.getSourceId(), game);
+                        redirectTarget = target;
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/cards/h/HeadlessSkaab.java

@@ -35,7 +35,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -45,7 +45,7 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class HeadlessSkaab extends CardImpl {
 
     public HeadlessSkaab(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}");
         this.subtype.add(SubType.ZOMBIE);
         this.subtype.add(SubType.WARRIOR);
 
@@ -53,7 +53,7 @@ public class HeadlessSkaab extends CardImpl {
         this.toughness = new MageInt(6);
 
         // As an additional cost to cast Headless Skaab, exile a creature card from your graveyard.
-        this.getSpellAbility().addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))));
+        this.getSpellAbility().addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)));
         // Headless Skaab enters the battlefield tapped.
         this.addAbility(new EntersBattlefieldTappedAbility());
     }

Mage.Sets/src/mage/cards/h/HellsCaretaker.java

@@ -38,10 +38,10 @@ import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffec
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.SubType;
 import mage.constants.PhaseStep;
+import mage.constants.SubType;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 import mage.target.common.TargetControlledCreaturePermanent;
 
@@ -52,18 +52,18 @@ import mage.target.common.TargetControlledCreaturePermanent;
 public class HellsCaretaker extends CardImpl {
 
     public HellsCaretaker(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}");
         this.subtype.add(SubType.HORROR);
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
         // {tap}, Sacrifice a creature: Return target creature card from your graveyard to the battlefield. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, 
-                new ReturnFromGraveyardToBattlefieldTargetEffect(), 
-                new TapSourceCost(), 
+        Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD,
+                new ReturnFromGraveyardToBattlefieldTargetEffect(),
+                new TapSourceCost(),
                 new IsStepCondition(PhaseStep.UPKEEP), null);
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent()));
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/cards/h/Heroism.java

@@ -112,6 +112,7 @@ class HeroismEffect extends OneShotEffect {
             Cost cost = new ManaCostsImpl("{2}{R}");
             List<Permanent> permanentsToPrevent = new ArrayList<>();
             for (Permanent permanent : game.getState().getBattlefield().getAllActivePermanents(filter, player.getId(), game)) {
+                cost.clearPaid();
                 String message = "Pay " + cost.getText() + "? If you don't, " + permanent.getLogName() + "'s combat damage will be prevented this turn.";
                 if (player != null && player.chooseUse(Outcome.Neutral, message, source, game)) {
                     if (cost.pay(source, game, source.getSourceId(), player.getId(), false, null)) {

Mage.Sets/src/mage/cards/h/HuaTuoHonoredPhysician.java

@@ -40,7 +40,7 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -50,7 +50,7 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class HuaTuoHonoredPhysician extends CardImpl {
 
     public HuaTuoHonoredPhysician(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}{G}");
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add(SubType.HUMAN);
 
@@ -59,7 +59,7 @@ public class HuaTuoHonoredPhysician extends CardImpl {
 
         // {tap}: Put target creature card from your graveyard on top of your library. Activate this ability only during your turn, before attackers are declared.
         Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new TapSourceCost(), MyTurnBeforeAttackersDeclaredCondition.instance);
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/cards/j/JadelightRanger.java

@@ -0,0 +1,68 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.j;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.keyword.ExploreSourceEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class JadelightRanger extends CardImpl {
+
+    public JadelightRanger(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}{G}");
+
+        this.subtype.add(SubType.MERFOLK);
+        this.subtype.add(SubType.SCOUT);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(1);
+
+        // When Jadelight Ranger enters the battlefield, it explores, then it explores again.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new ExploreSourceEffect().setText("it explores"), false);
+        ability.addEffect(new ExploreSourceEffect().setText(", then it explores again. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard. Then repeat this process.) "));
+        this.addAbility(ability);
+    }
+
+    public JadelightRanger(final JadelightRanger card) {
+        super(card);
+    }
+
+    @Override
+    public JadelightRanger copy() {
+        return new JadelightRanger(this);
+    }
+}

Mage.Sets/src/mage/cards/j/JourneyToEternity.java

@@ -0,0 +1,123 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.j;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.DiesAttachedTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlAttachedEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.abilities.keyword.TransformAbility;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.cards.a.AtzalCaveOfEternity;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.constants.Zone;
+import mage.filter.StaticFilters;
+import mage.game.Game;
+import mage.players.Player;
+import mage.target.TargetPermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class JourneyToEternity extends CardImpl {
+
+    public JourneyToEternity(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{G}");
+
+        this.addSuperType(SuperType.LEGENDARY);
+        this.subtype.add(SubType.AURA);
+
+        this.transformable = true;
+        this.secondSideCardClazz = AtzalCaveOfEternity.class;
+
+        // Enchant creature you control
+        TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED);
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
+        Ability ability = new EnchantAbility(auraTarget.getTargetName());
+        this.addAbility(ability);
+
+        // When enchanted creature dies, return it to the battlefield under your control, then return Journey to Eternity to the battlefield transformed under your control.
+        this.addAbility(new TransformAbility());
+        ability = new DiesAttachedTriggeredAbility(new ReturnToBattlefieldUnderYourControlAttachedEffect("it"), "enchanted creature");
+        ability.addEffect(new JourneyToEternityReturnTransformedSourceEffect());
+        this.addAbility(ability);
+
+    }
+
+    public JourneyToEternity(final JourneyToEternity card) {
+        super(card);
+    }
+
+    @Override
+    public JourneyToEternity copy() {
+        return new JourneyToEternity(this);
+    }
+}
+
+class JourneyToEternityReturnTransformedSourceEffect extends OneShotEffect {
+
+    public JourneyToEternityReturnTransformedSourceEffect() {
+        super(Outcome.Benefit);
+        this.staticText = ", then return {this} to the battlefield transformed under your control.";
+    }
+
+    public JourneyToEternityReturnTransformedSourceEffect(final JourneyToEternityReturnTransformedSourceEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public JourneyToEternityReturnTransformedSourceEffect copy() {
+        return new JourneyToEternityReturnTransformedSourceEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Card card = game.getCard(source.getSourceId());
+        Player controller = game.getPlayer(source.getControllerId());
+        if (card != null && controller != null) {
+            Zone zone = game.getState().getZone(card.getId());
+            // cards needs to be in public non battlefield zone
+            if (zone.equals(Zone.BATTLEFIELD) || !zone.isPublicZone()) {
+                return true;
+            }
+            game.getState().setValue(TransformAbility.VALUE_KEY_ENTER_TRANSFORMED + source.getSourceId(), Boolean.TRUE);
+            controller.moveCards(card, Zone.BATTLEFIELD, source, game, false, false, false, null);
+        }
+        return true;
+    }
+}

Mage.Sets/src/mage/cards/j/JovensTools.java

@@ -0,0 +1,76 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.j;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.common.combat.CantBeBlockedByAllTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.Duration;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author L_J
+ */
+public class JovensTools extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("except by walls");
+    static {
+        filter.add(Predicates.not(new SubtypePredicate(SubType.WALL)));
+    }
+
+    public JovensTools(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}");
+
+        // {4}, {T}: Target creature can't be blocked this turn except by Walls.
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByAllTargetEffect(filter, Duration.EndOfTurn), new GenericManaCost(4));
+        ability.addCost(new TapSourceCost());
+        ability.addTarget(new TargetCreaturePermanent());
+        this.addAbility(ability);
+    }
+
+    public JovensTools(final JovensTools card) {
+        super(card);
+    }
+
+    @Override
+    public JovensTools copy() {
+        return new JovensTools(this);
+    }
+}

Mage.Sets/src/mage/cards/k/KarmicGuide.java

@@ -40,7 +40,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -50,7 +50,7 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class KarmicGuide extends CardImpl {
 
     public KarmicGuide(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{W}");
         this.subtype.add(SubType.ANGEL);
         this.subtype.add(SubType.SPIRIT);
 
@@ -64,7 +64,7 @@ public class KarmicGuide extends CardImpl {
         this.addAbility(new EchoAbility("{3}{W}{W}"));
         // When Karmic Guide enters the battlefield, return target creature card from your graveyard to the battlefield.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), false);
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/cards/k/KolaghansCommand.java

@@ -37,7 +37,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterPermanent;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.target.TargetPermanent;
 import mage.target.TargetPlayer;
@@ -49,7 +49,7 @@ import mage.target.common.TargetCreatureOrPlayer;
  * @author fireshoes
  */
 public class KolaghansCommand extends CardImpl {
-    
+
     private static final FilterPermanent filter = new FilterPermanent("artifact");
 
     static {
@@ -57,33 +57,33 @@ public class KolaghansCommand extends CardImpl {
     }
 
     public KolaghansCommand(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{B}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{B}{R}");
 
-        // Choose two - 
+        // Choose two -
         this.getSpellAbility().getModes().setMinModes(2);
         this.getSpellAbility().getModes().setMaxModes(2);
-        
+
         // Return target creature card from your graveyard to your hand;
         this.getSpellAbility().getEffects().add(new ReturnFromGraveyardToHandTargetEffect());
-        this.getSpellAbility().getTargets().add(new TargetCardInYourGraveyard(1, new FilterCreatureCard("creature card from your graveyard")));
-        
-        // or Target player discards a card; 
+        this.getSpellAbility().getTargets().add(new TargetCardInYourGraveyard(1, StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
+
+        // or Target player discards a card;
         Mode mode = new Mode();
         mode.getEffects().add(new DiscardTargetEffect(1));
         mode.getTargets().add(new TargetPlayer());
-        this.getSpellAbility().getModes().addMode(mode); 
-        
+        this.getSpellAbility().getModes().addMode(mode);
+
         // or Destroy target artifact;
         mode = new Mode();
         mode.getEffects().add(new DestroyTargetEffect());
         mode.getTargets().add(new TargetPermanent(filter));
-        this.getSpellAbility().getModes().addMode(mode); 
-        
+        this.getSpellAbility().getModes().addMode(mode);
+
         // or Kolaghan's Command deals 2 damage to target creature or player.
         mode = new Mode();
         mode.getEffects().add(new DamageTargetEffect(2));
         mode.getTargets().add(new TargetCreatureOrPlayer());
-        this.getSpellAbility().getModes().addMode(mode); 
+        this.getSpellAbility().getModes().addMode(mode);
     }
 
     public KolaghansCommand(final KolaghansCommand card) {

Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java

@@ -0,0 +1,107 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.k;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapTargetCost;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.combat.CantBeBlockedSourceEffect;
+import mage.abilities.effects.common.counter.AddCountersAllEffect;
+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.constants.Zone;
+import mage.counters.CounterType;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.permanent.AnotherPredicate;
+import mage.filter.predicate.permanent.TappedPredicate;
+import mage.target.common.TargetControlledPermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class KumenaTyrantOfOrazca extends CardImpl {
+
+    private static final FilterControlledPermanent filterAnother = new FilterControlledPermanent("another untapped Merfolk you control");
+    private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control");
+    private static final FilterControlledPermanent filterAll = new FilterControlledPermanent("Merfolk you control");
+
+    static {
+        filterAnother.add(new AnotherPredicate());
+        filterAnother.add(new SubtypePredicate(SubType.MERFOLK));
+        filterAnother.add(Predicates.not(new TappedPredicate()));
+
+        filter.add(new SubtypePredicate(SubType.MERFOLK));
+        filter.add(Predicates.not(new TappedPredicate()));
+
+        filter.add(new SubtypePredicate(SubType.MERFOLK));
+    }
+
+    public KumenaTyrantOfOrazca(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}{U}");
+
+        this.addSuperType(SuperType.LEGENDARY);
+        this.subtype.add(SubType.MERFOLK);
+        this.subtype.add(SubType.SHAMAN);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(4);
+
+        // Tap another untapped Merfolk you control: Kumena, Tyrant of Orzca can't be blocked this turn.
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
+                new CantBeBlockedSourceEffect(Duration.EndOfTurn),
+                new TapTargetCost(new TargetControlledPermanent(1, 1, filterAnother, true))));
+
+        // Tap three untapped Merfolk you control: Draw a card.
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
+                new DrawCardSourceControllerEffect(1),
+                new TapTargetCost(new TargetControlledPermanent(3, 3, filter, true))));
+
+        // Tap five untapped Merfolk you control: Put a +1/+1 counter on each Merfolk you control.
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
+                new AddCountersAllEffect(CounterType.P1P1.createInstance(), filterAll),
+                new TapTargetCost(new TargetControlledPermanent(5, 5, filter, true))));
+
+    }
+
+    public KumenaTyrantOfOrazca(final KumenaTyrantOfOrazca card) {
+        super(card);
+    }
+
+    @Override
+    public KumenaTyrantOfOrazca copy() {
+        return new KumenaTyrantOfOrazca(this);
+    }
+}

Mage.Sets/src/mage/cards/k/KumenasAwakening.java

@@ -0,0 +1,69 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.k;
+
+import java.util.UUID;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.condition.common.CitysBlessingCondition;
+import mage.abilities.decorator.ConditionalOneShotEffect;
+import mage.abilities.effects.common.DrawCardAllEffect;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.keyword.AscendAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.TargetController;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class KumenasAwakening extends CardImpl {
+
+    public KumenasAwakening(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}");
+
+        // Ascend (If you control ten or more permenants, you get the city's blessing for the rest of the game.)
+        this.addAbility(new AscendAbility());
+
+        // At the beginning of your upkeep, each player draws a card. If you have the city's blessing, instead only you draw a card.
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(
+                new ConditionalOneShotEffect(new DrawCardSourceControllerEffect(1), new DrawCardAllEffect(1), CitysBlessingCondition.instance,
+                        "each player draws a card. If you have the city's blessing, instead only you draw a card"),
+                TargetController.YOU, false));
+    }
+
+    public KumenasAwakening(final KumenasAwakening card) {
+        super(card);
+    }
+
+    @Override
+    public KumenasAwakening copy() {
+        return new KumenasAwakening(this);
+    }
+}

Mage.Sets/src/mage/cards/l/LegionLieutenant.java

@@ -0,0 +1,78 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.l;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.continuous.BoostAllEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.permanent.ControllerPredicate;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class LegionLieutenant extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Vampires you control");
+
+    static {
+        filter.add(new SubtypePredicate(SubType.VAMPIRE));
+        filter.add(new ControllerPredicate(TargetController.YOU));
+    }
+
+    public LegionLieutenant(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}{B}");
+
+        this.subtype.add(SubType.VAMPIRE);
+        this.subtype.add(SubType.KNIGHT);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // Other Vampires you control get +1/+1.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true)));
+    }
+
+    public LegionLieutenant(final LegionLieutenant card) {
+        super(card);
+    }
+
+    @Override
+    public LegionLieutenant copy() {
+        return new LegionLieutenant(this);
+    }
+}

Mage.Sets/src/mage/cards/l/LifeDeath.java

@@ -40,8 +40,8 @@ import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.constants.SpellAbilityType;
 import mage.constants.Zone;
+import mage.filter.StaticFilters;
 import mage.filter.common.FilterControlledLandPermanent;
-import mage.filter.common.FilterCreatureCard;
 import mage.game.Game;
 import mage.game.permanent.token.Token;
 import mage.players.Player;
@@ -64,7 +64,7 @@ public class LifeDeath extends SplitCard {
 
         // Death
         // Return target creature card from your graveyard to the battlefield. You lose life equal to its converted mana cost.
-        Target target = new TargetCardInYourGraveyard(1, new FilterCreatureCard("creature card from your graveyard"));
+        Target target = new TargetCardInYourGraveyard(1, StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD);
         getRightHalfCard().getSpellAbility().addTarget(target);
         getRightHalfCard().getSpellAbility().addEffect(new DeathEffect());
 

Mage.Sets/src/mage/cards/l/LilianaDeathsMajesty.java

@@ -40,7 +40,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.SuperType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.SubtypePredicate;
@@ -75,7 +75,7 @@ public class LilianaDeathsMajesty extends CardImpl {
         // -3: Return target creature card from your graveyard to the battlefield. That creature is a black Zombie in addition to its other colors and types.
         ability = new LoyaltyAbility(new BecomesBlackZombieAdditionEffect() // because the effect has to be active for triggered effects that e.g. check if the creature entering is a Zombie, the continuous effect needs to be added before the card moving effect is applied
                 .setText(""), -3);
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         ability.addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()
                 .setText("Return target creature card from your graveyard to the battlefield. That creature is a black Zombie in addition to its other colors and types"));
         this.addAbility(ability);

Mage.Sets/src/mage/cards/l/LilianaTheLastHope.java

@@ -40,12 +40,12 @@ import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.SubType;
 import mage.constants.Duration;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.command.emblems.LilianaTheLastHopeEmblem;
 import mage.players.Player;
@@ -114,7 +114,7 @@ class LilianaTheLastHopeEffect extends OneShotEffect {
         if (controller == null) {
             return false;
         }
-        TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"));
+        TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD);
         target.setNotTarget(true);
         if (target.canChoose(source.getSourceId(), source.getControllerId(), game)
                 && controller.chooseUse(outcome, "Return a creature card from your graveyard to hand?", source, game)

Mage.Sets/src/mage/cards/m/BafflingEnd.java

@@ -0,0 +1,86 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.m;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.LeavesBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.CreateTokenTargetEffect;
+import mage.abilities.effects.common.ExileTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.ComparisonType;
+import mage.constants.TargetController;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.game.permanent.token.DinosaurToken;
+import mage.target.Target;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetOpponent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class BafflingEnd extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost 3 or less an opponent controls");
+
+    static {
+        filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
+        filter.add(new ControllerPredicate(TargetController.OPPONENT));
+    }
+
+    public BafflingEnd(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}");
+
+        // When Mysterious end enters the battlefield, exile target creature with converted mana cost 3 or less an opponent controls.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new ExileTargetEffect());
+        ability.addTarget(new TargetPermanent(filter));
+        this.addAbility(ability);
+
+        // When Mysterious end leaves the battlefield, target opponent create a 3/3 green Dinosaur creature token with trample.
+        ability = new LeavesBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new DinosaurToken()), false);
+        Target target = new TargetOpponent();
+        ability.addTarget(target);
+        this.addAbility(ability);
+
+    }
+
+    public BafflingEnd(final BafflingEnd card) {
+        super(card);
+    }
+
+    @Override
+    public BafflingEnd copy() {
+        return new BafflingEnd(this);
+    }
+}

Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java

@@ -45,7 +45,7 @@ import mage.constants.SubLayer;
 import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.counters.Counters;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -59,11 +59,11 @@ import mage.target.targetpointer.FixedTarget;
 public class MakeshiftMannequin extends CardImpl {
 
     public MakeshiftMannequin(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{B}");
 
         // Return target creature card from your graveyard to the battlefield with a mannequin counter on it. For as long as that creature has a mannequin counter on it, it has "When this creature becomes the target of a spell or ability, sacrifice it."
         this.getSpellAbility().addEffect(new MakeshiftMannequinEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
     }
 
     public MakeshiftMannequin(final MakeshiftMannequin card) {

Mage.Sets/src/mage/cards/m/MakeshiftMauler.java

@@ -34,7 +34,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -44,7 +44,7 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class MakeshiftMauler extends CardImpl {
 
     public MakeshiftMauler(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}");
         this.subtype.add(SubType.ZOMBIE);
         this.subtype.add(SubType.HORROR);
 
@@ -52,7 +52,7 @@ public class MakeshiftMauler extends CardImpl {
         this.toughness = new MageInt(5);
 
         // As an additional cost to cast Makeshift Mauler, exile a creature card from your graveyard.
-        this.getSpellAbility().addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))));
+        this.getSpellAbility().addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)));
     }
 
     public MakeshiftMauler(final MakeshiftMauler card) {

Mage.Sets/src/mage/cards/m/MammothHarness.java

@@ -0,0 +1,135 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.m;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
+import mage.abilities.effects.common.continuous.LoseAbilityAttachedEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.abilities.keyword.FirstStrikeAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.AttachmentType;
+import mage.constants.CardType;
+import mage.constants.SubType;
+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.TargetPermanent;
+import mage.target.common.TargetCreaturePermanent;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author L_J
+ */
+public class MammothHarness extends CardImpl {
+
+    public MammothHarness(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}");
+        this.subtype.add(SubType.AURA);
+
+        // Enchant creature
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility));
+        Ability ability = new EnchantAbility(auraTarget.getTargetName());
+        this.addAbility(ability);
+        
+        // Enchanted creature loses flying.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LoseAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA)));
+
+        // Whenever enchanted creature blocks or becomes blocked by a creature, the other creature gains first strike until end of turn.
+        this.addAbility(new MammothHarnessTriggeredAbility());
+    }
+
+    public MammothHarness(final MammothHarness card) {
+        super(card);
+    }
+
+    @Override
+    public MammothHarness copy() {
+        return new MammothHarness(this);
+    }
+}
+
+class MammothHarnessTriggeredAbility extends BlocksOrBecomesBlockedTriggeredAbility {
+
+    public MammothHarnessTriggeredAbility() {
+        super(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), StaticFilters.FILTER_PERMANENT_CREATURE, false, null, false);
+    }
+
+    public MammothHarnessTriggeredAbility(final MammothHarnessTriggeredAbility ability) {
+        super(ability);
+
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(this.getSourceId());
+        if (sourcePermanent != null) {
+            Permanent attachedTo = game.getPermanentOrLKIBattlefield(sourcePermanent.getAttachedTo());
+            if (sourcePermanent != null) {
+                if (event.getSourceId().equals(attachedTo.getId())) {
+                    Permanent blocked = game.getPermanent(event.getTargetId());
+                    if (blocked != null && filter.match(blocked, game)) {
+                        this.getEffects().setTargetPointer(new FixedTarget(event.getTargetId()));
+                        return true;
+                    }
+                }
+                if (event.getTargetId().equals(attachedTo.getId())) {
+                    Permanent blocker = game.getPermanent(event.getSourceId());
+                    if (blocker != null) {
+                        this.getEffects().setTargetPointer(new FixedTarget(event.getSourceId()));
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return " Whenever enchanted creature blocks or becomes blocked by a creature, the other creature gains first strike until end of turn.";
+    }
+
+    @Override
+    public MammothHarnessTriggeredAbility copy() {
+        return new MammothHarnessTriggeredAbility(this);
+    }
+}

Mage.Sets/src/mage/cards/m/MarchOfTheDrowned.java

@@ -35,7 +35,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.filter.FilterCard;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.target.common.TargetCardInYourGraveyard;
 
@@ -57,7 +57,7 @@ public class MarchOfTheDrowned extends CardImpl {
         // Choose one —
         // • Return target creature card from your graveyard to your hand.
         this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         // • Return two target Pirate cards from your graveyard to your hand.
         Mode mode = new Mode();
         mode.getEffects().add(new ReturnFromGraveyardToHandTargetEffect());

Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java

@@ -0,0 +1,78 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.m;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.continuous.BoostAllEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.permanent.ControllerPredicate;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class MerfolkMistbinder extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Merfolk you control");
+
+    static {
+        filter.add(new SubtypePredicate(SubType.MERFOLK));
+        filter.add(new ControllerPredicate(TargetController.YOU));
+    }
+
+    public MerfolkMistbinder(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}{U}");
+
+        this.subtype.add(SubType.MERFOLK);
+        this.subtype.add(SubType.SHAMAN);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // Other Merfolk you control get +1/+1.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true)));
+    }
+
+    public MerfolkMistbinder(final MerfolkMistbinder card) {
+        super(card);
+    }
+
+    @Override
+    public MerfolkMistbinder copy() {
+        return new MerfolkMistbinder(this);
+    }
+}

Mage.Sets/src/mage/cards/m/Merseine.java

@@ -0,0 +1,172 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.m;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.common.SourceHasCounterCondition;
+import mage.abilities.decorator.ConditionalContinuousRuleModifyingEffect;
+import mage.abilities.costs.Cost;
+import mage.abilities.costs.CostImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.Effects;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.DontUntapInControllersUntapStepEnchantedEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.effects.common.counter.RemoveCounterSourceEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.*;
+import mage.counters.CounterType;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ * 
+ * @author L_J
+ */
+public class Merseine extends CardImpl {
+
+    public Merseine(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}{U}");
+        this.subtype.add(SubType.AURA);
+
+        // Enchant creature
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
+        this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
+
+        // Merseine enters the battlefield with three net counters on it.
+        Effect effect = new AddCountersSourceEffect(CounterType.NET.createInstance(3));
+        effect.setText("with three net counters on it");
+        this.addAbility(new EntersBattlefieldAbility(effect));
+
+        // Enchanted creature doesn't untap during its controller's untap step if Merseine has a net counter on it.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepEnchantedEffect(), 
+            new SourceHasCounterCondition(CounterType.NET)).setText("Enchanted creature doesn't untap during its controller's untap step if Merseine has a net counter on it")));
+        
+        // Pay enchanted creature's mana cost: Remove a net counter from Merseine. Any player may activate this ability, but only if he or she controls the enchanted creature.
+        SimpleActivatedAbility ability = new MerseineActivatedAbility();
+        ability.setMayActivate(TargetController.ANY);
+        this.addAbility(ability);
+    }
+
+    public Merseine(final Merseine card) {
+        super(card);
+    }
+
+    @Override
+    public Merseine copy() {
+        return new Merseine(this);
+    }
+}
+
+class MerseineActivatedAbility extends SimpleActivatedAbility {
+    
+    public MerseineActivatedAbility() {
+        super(Zone.BATTLEFIELD, new RemoveCounterSourceEffect(CounterType.NET.createInstance()), new MerseineCost());
+    }
+
+    private MerseineActivatedAbility(final MerseineActivatedAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public Effects getEffects(Game game, EffectType effectType) {
+        return super.getEffects(game, effectType);
+    }
+
+    @Override
+    public boolean canActivate(UUID playerId, Game game) {
+        Permanent sourcePermanent = game.getBattlefield().getPermanent(this.getSourceId());
+        if (sourcePermanent != null) {
+            Permanent attachedTo = game.getPermanent(sourcePermanent.getAttachedTo());
+            if (attachedTo != null) {
+                return super.canActivate(attachedTo.getControllerId(), game);
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public MerseineActivatedAbility copy() {
+        return new MerseineActivatedAbility(this);
+    }
+
+    @Override
+    public String getRule() {
+        return "Pay enchanted creature's mana cost: Remove a net counter from Merseine. Any player may activate this ability, but only if he or she controls the enchanted creature.";
+    }
+}
+
+class MerseineCost extends CostImpl {
+
+    public MerseineCost() {
+        this.text = "Pay enchanted creature's mana cost";
+    }
+
+    public MerseineCost(final MerseineCost cost) {
+        super(cost);
+    }
+
+    @Override
+    public MerseineCost copy() {
+        return new MerseineCost(this);
+    }
+
+    @Override
+    public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) {
+        Permanent sourcePermanent = game.getBattlefield().getPermanent(sourceId);
+        if (sourcePermanent != null) {
+            Permanent attachedTo = game.getPermanent(sourcePermanent.getAttachedTo());
+            if (attachedTo != null) {
+                return attachedTo.getManaCost().canPay(ability, sourceId, controllerId, game);
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana, Cost costToPay) {
+        Permanent sourcePermanent = game.getBattlefield().getPermanent(sourceId);
+        if (sourcePermanent != null) {
+            Permanent attachedTo = game.getPermanent(sourcePermanent.getAttachedTo());
+            if (attachedTo != null) {
+                paid = attachedTo.getManaCost().pay(ability, game, sourceId, controllerId, noMana);
+            }
+        }
+        return paid;
+    }
+}

Mage.Sets/src/mage/cards/m/MidnightRecovery.java

@@ -33,7 +33,7 @@ import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -42,13 +42,12 @@ import mage.target.common.TargetCardInYourGraveyard;
  */
 public class MidnightRecovery extends CardImpl {
 
-    public MidnightRecovery (UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}");
-
+    public MidnightRecovery(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{B}");
 
         // Return target creature card from your graveyard to your hand.
         this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
 
         // Cipher (Then you may exilce this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
         this.getSpellAbility().addEffect(new CipherEffect());
@@ -60,7 +59,7 @@ public class MidnightRecovery extends CardImpl {
     }
 
     @Override
-    public MidnightRecovery  copy() {
+    public MidnightRecovery copy() {
         return new MidnightRecovery(this);
     }
 }

Mage.Sets/src/mage/cards/m/MidnightRitual.java

@@ -38,7 +38,7 @@ import mage.cards.CardsImpl;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.token.ZombieToken;
 import mage.players.Player;
@@ -50,14 +50,12 @@ import mage.target.common.TargetCardInYourGraveyard;
  */
 public class MidnightRitual extends CardImpl {
 
-    private final FilterCreatureCard filter = new FilterCreatureCard("creature card from your graveyard");
-
     public MidnightRitual(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{2}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{2}{B}");
 
         // Exile X target creature cards from your graveyard.
         // For each creature card exiled this way, create a 2/2 black Zombie creature token.
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.getSpellAbility().addEffect(new MidnightRitualEffect());
     }
 
@@ -65,7 +63,7 @@ public class MidnightRitual extends CardImpl {
     public void adjustTargets(Ability ability, Game game) {
         if (ability instanceof SpellAbility) {
             ability.getTargets().clear();
-            ability.addTarget(new TargetCardInYourGraveyard(ability.getManaCostsToPay().getX(), filter));
+            ability.addTarget(new TargetCardInYourGraveyard(ability.getManaCostsToPay().getX(), StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         }
     }
 

Mage.Sets/src/mage/cards/m/MorgueBurst.java

@@ -37,7 +37,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Zone;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -51,11 +51,11 @@ import mage.target.common.TargetCreatureOrPlayer;
 public class MorgueBurst extends CardImpl {
 
     public MorgueBurst(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{B}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{B}{R}");
 
         // Return target creature card from your graveyard to your hand. Morgue Burst deals damage to target creature or player equal to the power of the card returned this way.
         this.getSpellAbility().addEffect(new MorgueBurstEffect());
-        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
     }
 

Mage.Sets/src/mage/cards/m/MortuaryMire.java

@@ -36,7 +36,7 @@ import mage.abilities.mana.BlackManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -46,14 +46,14 @@ import mage.target.common.TargetCardInYourGraveyard;
 public class MortuaryMire extends CardImpl {
 
     public MortuaryMire(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
+        super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
 
         // Mortuary Mire enters the battlefield tapped.
         this.addAbility(new EntersBattlefieldTappedAbility());
 
         // When Mortuary Mire enters the battlefield, you may put target creature card from your graveyard on top of your library.
         Ability ability = new EntersBattlefieldTriggeredAbility(new PutOnLibraryTargetEffect(true), true);
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         this.addAbility(ability);
 
         // {T}: Add {B} to your mana pool.

Mage.Sets/src/mage/cards/n/NecromanticThirst.java

@@ -36,10 +36,10 @@ import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.SubType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.constants.TargetController;
-import mage.filter.common.FilterCreatureCard;
+import mage.filter.StaticFilters;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCardInYourGraveyard;
 import mage.target.common.TargetCreaturePermanent;
@@ -51,7 +51,7 @@ import mage.target.common.TargetCreaturePermanent;
 public class NecromanticThirst extends CardImpl {
 
     public NecromanticThirst(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}");
         this.subtype.add(SubType.AURA);
 
         // Enchant creature
@@ -59,13 +59,13 @@ public class NecromanticThirst extends CardImpl {
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit));
         this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
-        
+
         // Whenever enchanted creature deals combat damage to a player, you may return target creature card from your graveyard to your hand.
         Ability ability = new DealsDamageToAPlayerAttachedTriggeredAbility(
-                new ReturnFromGraveyardToHandTargetEffect(), 
+                new ReturnFromGraveyardToHandTargetEffect(),
                 "enchanted creature", true, false, true, TargetController.ANY);
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
-        this.addAbility(ability);    
+        ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
+        this.addAbility(ability);
     }
 
     public NecromanticThirst(final NecromanticThirst card) {