diff --git a/Mage.Client/src/main/java/mage/client/cards/Cards.java b/Mage.Client/src/main/java/mage/client/cards/Cards.java
index 3360df1160..14c7109b1b 100644
--- a/Mage.Client/src/main/java/mage/client/cards/Cards.java
+++ b/Mage.Client/src/main/java/mage/client/cards/Cards.java
@@ -34,20 +34,31 @@
package mage.client.cards;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
import mage.cards.MageCard;
import mage.client.plugins.impl.Plugins;
import mage.client.util.CardsViewUtil;
import mage.client.util.Config;
-import mage.view.*;
+import mage.view.CardView;
+import mage.view.CardsView;
+import mage.view.PermanentView;
+import mage.view.SimpleCardsView;
+import mage.view.StackAbilityView;
import org.apache.log4j.Logger;
import org.mage.card.arcane.CardPanel;
-import javax.swing.border.Border;
-import javax.swing.border.EmptyBorder;
-import java.awt.*;
-import java.util.*;
-import java.util.Map.Entry;
-
/**
*
* @author BetaSteward_at_googlemail.com
@@ -58,7 +69,7 @@ public class Cards extends javax.swing.JPanel {
private final Map<UUID, MageCard> cards = new LinkedHashMap<>();
private boolean dontDisplayTapped = false;
- private static final int GAP_X = 5;
+ private static final int GAP_X = 5; // needed for marking cards with coloured fram (e.g. on hand)
private String zone;
private static final Border emptyBorder = new EmptyBorder(0,0,0,0);
diff --git a/Mage.Client/src/main/java/mage/client/components/ext/dlg/DialogManager.java b/Mage.Client/src/main/java/mage/client/components/ext/dlg/DialogManager.java
index 66db7ad4c3..2c9dc93239 100644
--- a/Mage.Client/src/main/java/mage/client/components/ext/dlg/DialogManager.java
+++ b/Mage.Client/src/main/java/mage/client/components/ext/dlg/DialogManager.java
@@ -20,7 +20,7 @@ import java.util.UUID;
public class DialogManager extends JComponent implements MouseListener,
MouseMotionListener {
- private final static Map<UUID, DialogManager> dialogManagers = new HashMap<UUID, DialogManager>();
+ private final static Map<UUID, DialogManager> dialogManagers = new HashMap<>();
public static DialogManager getManager(UUID gameId) {
if (!dialogManagers.containsKey(gameId)) {
diff --git a/Mage.Client/src/main/java/mage/client/dialog/ExileZoneDialog.form b/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.form
similarity index 97%
rename from Mage.Client/src/main/java/mage/client/dialog/ExileZoneDialog.form
rename to Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.form
index df7949b8fc..caf3d65750 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/ExileZoneDialog.form
+++ b/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.form
@@ -23,7 +23,7 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="cards" alignment="1" pref="418" max="32767" attributes="0"/>
+ <Component id="cards" alignment="1" pref="239" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
diff --git a/Mage.Client/src/main/java/mage/client/dialog/ExileZoneDialog.java b/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java
similarity index 50%
rename from Mage.Client/src/main/java/mage/client/dialog/ExileZoneDialog.java
rename to Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java
index d85e8d2ee6..18d3cbdc59 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/ExileZoneDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java
@@ -27,42 +27,123 @@
*/
/*
- * ExileZoneDialog.java
+ * CardInfoWindowDialog.java
*
* Created on Feb 1, 2010, 3:00:35 PM
*/
package mage.client.dialog;
+import static com.sun.java.accessibility.util.AWTEventMonitor.addWindowListener;
+import java.awt.Point;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import java.beans.PropertyVetoException;
import java.util.UUID;
import java.util.logging.Level;
import java.util.logging.Logger;
-import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
+import javax.swing.ImageIcon;
+import javax.swing.SwingUtilities;
import mage.client.cards.BigCard;
import mage.client.util.Config;
+import mage.client.util.ImageHelper;
+import mage.client.util.SettingsManager;
+import mage.client.util.gui.GuiDisplayUtil;
+import mage.view.CardsView;
import mage.view.ExileView;
+import mage.view.SimpleCardsView;
+import org.mage.plugins.card.utils.impl.ImageManagerImpl;
/**
*
* @author BetaSteward_at_googlemail.com
*/
-public class ExileZoneDialog extends MageDialog {
+public class CardInfoWindowDialog extends MageDialog {
- /** Creates new form ExileZoneDialog */
- public ExileZoneDialog() {
- this.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+ public static enum ShowType { REVEAL, LOOKED_AT, EXILE, GRAVEYARD, OTHER };
+
+ private ShowType showType;
+ private boolean positioned;
+ private String name;
+
+ public CardInfoWindowDialog(ShowType showType, String name) {
+ this.name = name;
+ this.title = name;
+ this.showType = showType;
+ this.positioned = false;
initComponents();
+
this.setModal(false);
+ switch(this.showType) {
+ case LOOKED_AT:
+ this.setFrameIcon(new ImageIcon(ImageManagerImpl.getInstance().getLookedAtImage()));
+ this.setClosable(true);
+ break;
+ case REVEAL:
+ this.setFrameIcon(new ImageIcon(ImageManagerImpl.getInstance().getRevealedImage()));
+ this.setClosable(true);
+ break;
+ case GRAVEYARD:
+ this.setFrameIcon(new ImageIcon(ImageHelper.getImageFromResources("/info/grave.png")));
+ this.setIconifiable(false);
+ this.setClosable(true);
+ this.setDefaultCloseOperation(HIDE_ON_CLOSE);
+ addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosing(WindowEvent e) {
+ CardInfoWindowDialog.this.hideDialog();
+ }
+ });
+ break;
+ case EXILE:
+ this.setFrameIcon(new ImageIcon(ImageManagerImpl.getInstance().getExileImage()));
+ break;
+ default:
+ // no icon yet
+ }
+ this.setTitelBarToolTip(name);
}
public void cleanUp() {
cards.cleanUp();
}
+ public void loadCards(SimpleCardsView showCards, BigCard bigCard, UUID gameId) {
+ cards.loadCards(showCards, bigCard, gameId);
+ showAndPositionWindow();
+ }
+
+ public void loadCards(CardsView showCards, BigCard bigCard, UUID gameId) {
+ cards.loadCards(showCards, bigCard, gameId, null);
+ if (showType.equals(ShowType.GRAVEYARD)) {
+ setTitle(name + "'s Graveyard (" + showCards.size() + ")");
+ this.setTitelBarToolTip(name);
+ }
+ showAndPositionWindow();
+ }
+
+ private void showAndPositionWindow() {
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ int width = CardInfoWindowDialog.this.getWidth();
+ int height = CardInfoWindowDialog.this.getHeight();
+ if (width > 0 && height > 0) {
+ Point centered = SettingsManager.getInstance().getComponentPosition(width, height);
+ if (!positioned) {
+ positioned = true;
+ int xPos = centered.x / 2;
+ int yPos = centered.y / 2;
+ CardInfoWindowDialog.this.setLocation(xPos, yPos);
+ show();
+ }
+ GuiDisplayUtil.keepComponentInsideScreen(centered.x, centered.y, CardInfoWindowDialog.this);
+ }
+ }
+ });
+ }
+
public void loadCards(ExileView exile, BigCard bigCard, UUID gameId) {
- this.title = exile.getName();
- this.setTitelBarToolTip(exile.getName());
boolean changed = cards.loadCards(exile, bigCard, gameId, null);
if (exile.size() > 0) {
show();
@@ -70,7 +151,7 @@ public class ExileZoneDialog extends MageDialog {
try {
this.setIcon(false);
} catch (PropertyVetoException ex) {
- Logger.getLogger(ExileZoneDialog.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.getLogger(CardInfoWindowDialog.class.getName()).log(Level.SEVERE, null, ex);
}
}
}
@@ -99,7 +180,7 @@ public class ExileZoneDialog extends MageDialog {
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(cards, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 418, Short.MAX_VALUE)
+ .addComponent(cards, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 239, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
index 2e53ee5cdd..0eec9111ea 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
@@ -429,7 +429,7 @@ public class ConnectDialog extends MageDialog {
BufferedReader in = null;
try {
- URL serverListURL = new URL(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CONNECTION_URL_SERVER_LIST, "http://176.31.186.181/files/server-list.txt"));
+ URL serverListURL = new URL(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CONNECTION_URL_SERVER_LIST, "http://xmage.de/files/server-list.txt"));
Connection.ProxyType configProxyType = Connection.ProxyType.valueByText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_PROXY_TYPE, "None"));
Proxy p = null;
diff --git a/Mage.Client/src/main/java/mage/client/dialog/ShowCardsDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ShowCardsDialog.java
index 7e221e11e7..433aecd21c 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/ShowCardsDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/ShowCardsDialog.java
@@ -34,6 +34,16 @@
package mage.client.dialog;
+import java.awt.Component;
+import java.awt.Point;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.UUID;
+import javax.swing.ImageIcon;
+import javax.swing.JLayeredPane;
+import javax.swing.SwingUtilities;
import mage.cards.CardDimensions;
import mage.client.MageFrame;
import mage.client.cards.BigCard;
@@ -44,29 +54,29 @@ import mage.client.util.gui.GuiDisplayUtil;
import mage.view.CardsView;
import mage.view.SimpleCardsView;
import org.mage.card.arcane.CardPanel;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.UUID;
+import org.mage.plugins.card.utils.impl.ImageManagerImpl;
/**
* @author BetaSteward_at_googlemail.com
*/
public class ShowCardsDialog extends MageDialog implements MouseListener {
- private boolean reloaded = false;
+
+
+ // remember if this dialog was already auto positioned, so don't do it after the first time
+ private boolean positioned;
+
/**
* Creates new form ShowCardsDialog
*/
public ShowCardsDialog() {
+ this.positioned = false;
+
this.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
initComponents();
this.setModal(false);
+
}
public void cleanUp() {
@@ -88,7 +98,6 @@ public class ShowCardsDialog extends MageDialog implements MouseListener {
}
public void loadCards(String name, CardsView showCards, BigCard bigCard, CardDimensions dimension, UUID gameId, boolean modal, Map<String, Serializable> options) {
- this.reloaded = true;
this.title = name;
this.setTitelBarToolTip(name);
cardArea.loadCards(showCards, bigCard, dimension, gameId, this);
@@ -106,7 +115,7 @@ public class ShowCardsDialog extends MageDialog implements MouseListener {
if (getParent() != MageFrame.getDesktop() /*|| this.isClosed*/) {
MageFrame.getDesktop().add(this, JLayeredPane.DEFAULT_LAYER);
}
- pack();
+ pack();
this.revalidate();
this.repaint();
@@ -115,26 +124,21 @@ public class ShowCardsDialog extends MageDialog implements MouseListener {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
- int width = ShowCardsDialog.this.getWidth();
- int height = ShowCardsDialog.this.getWidth();
- if (width > 0 && height > 0) {
- Point centered = SettingsManager.getInstance().getComponentPosition(width, height);
- ShowCardsDialog.this.setLocation(centered.x, centered.y);
- GuiDisplayUtil.keepComponentInsideScreen(centered.x, centered.y, ShowCardsDialog.this);
+ if (!positioned) {
+ int width = ShowCardsDialog.this.getWidth();
+ int height = ShowCardsDialog.this.getHeight();
+ if (width > 0 && height > 0) {
+ Point centered = SettingsManager.getInstance().getComponentPosition(width, height);
+ ShowCardsDialog.this.setLocation(centered.x, centered.y);
+ positioned = true;
+ GuiDisplayUtil.keepComponentInsideScreen(centered.x, centered.y, ShowCardsDialog.this);
+ }
}
ShowCardsDialog.this.setVisible(true);
}
});
}
- public boolean isReloaded() {
- return this.reloaded;
- }
-
- public void clearReloaded() {
- this.reloaded = false;
- }
-
private void initComponents() {
cardArea = new CardArea();
diff --git a/Mage.Client/src/main/java/mage/client/game/GamePane.java b/Mage.Client/src/main/java/mage/client/game/GamePane.java
index 35d1c16a97..9b7c00a5eb 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePane.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePane.java
@@ -114,6 +114,16 @@ public class GamePane extends MagePane {
return gameId;
}
+ @Override
+ public void deactivated() {
+ gamePanel.deactivated();
+ }
+
+ @Override
+ public void activated() {
+ gamePanel.activated();
+ }
+
private mage.client.game.GamePanel gamePanel;
private javax.swing.JScrollPane jScrollPane1;
private UUID gameId;
diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
index 029e928fd7..ade062dacb 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -50,6 +50,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -85,7 +86,8 @@ import mage.client.components.HoverButton;
import mage.client.components.MageComponents;
import mage.client.components.ext.dlg.DialogManager;
import mage.client.components.layout.RelativeLayout;
-import mage.client.dialog.ExileZoneDialog;
+import mage.client.dialog.CardInfoWindowDialog;
+import mage.client.dialog.CardInfoWindowDialog.ShowType;
import mage.client.dialog.PickChoiceDialog;
import mage.client.dialog.PickNumberDialog;
import mage.client.dialog.PickPileDialog;
@@ -143,9 +145,14 @@ public final class GamePanel extends javax.swing.JPanel {
private static final int X_PHASE_WIDTH = 55;
private static final int STACK_MIN_CARDS_OFFSET_Y = 7;
private final Map<UUID, PlayAreaPanel> players = new HashMap<>();
- private final Map<UUID, ExileZoneDialog> exiles = new HashMap<>();
- private final Map<String, ShowCardsDialog> revealed = new HashMap<>();
- private final Map<String, ShowCardsDialog> lookedAt = new HashMap<>();
+
+ // non modal frames
+ private final Map<UUID, CardInfoWindowDialog> exiles = new HashMap<>();
+ private final Map<String, CardInfoWindowDialog> revealed = new HashMap<>();
+ private final Map<String, CardInfoWindowDialog> lookedAt = new HashMap<>();
+ private final Map<String, CardInfoWindowDialog> graveyardWindows = new HashMap<>();
+ private final Map<String, CardsView> graveyards = new HashMap<>();
+
private final ArrayList<ShowCardsDialog> pickTarget = new ArrayList<>();
private UUID gameId;
private UUID playerId; // playerId of the player
@@ -255,15 +262,19 @@ public final class GamePanel extends javax.swing.JPanel {
if (pickNumber != null) {
pickNumber.removeDialog();
}
- for (ExileZoneDialog exileDialog: exiles.values()) {
+ for (CardInfoWindowDialog exileDialog: exiles.values()) {
exileDialog.cleanUp();
exileDialog.removeDialog();
}
- for (ShowCardsDialog revealDialog: revealed.values()) {
+ for (CardInfoWindowDialog graveyardDialog: graveyardWindows.values()) {
+ graveyardDialog.cleanUp();
+ graveyardDialog.removeDialog();
+ }
+ for (CardInfoWindowDialog revealDialog: revealed.values()) {
revealDialog.cleanUp();
revealDialog.removeDialog();
}
- for (ShowCardsDialog lookedAtDialog: lookedAt.values()) {
+ for (CardInfoWindowDialog lookedAtDialog: lookedAt.values()) {
lookedAtDialog.cleanUp();
lookedAtDialog.removeDialog();
}
@@ -648,6 +659,17 @@ public final class GamePanel extends javax.swing.JPanel {
if (player.getPlayerId().equals(playerId)) {
updateSkipButtons(player.isPassedTurn(), player.isPassedUntilEndOfTurn(), player.isPassedUntilNextMain(), player.isPassedAllTurns(), player.isPassedUntilStackResolved());
}
+ // update open or remove closed graveyard windows
+
+ graveyards.put(player.getName(), player.getGraveyard());
+ if (graveyardWindows.containsKey(player.getName())) {
+ CardInfoWindowDialog cardInfoWindowDialog = graveyardWindows.get(player.getName());
+ if (cardInfoWindowDialog.isClosed()) {
+ graveyardWindows.remove(player.getName());
+ } else {
+ cardInfoWindowDialog.loadCards(player.getGraveyard(), bigCard, gameId);
+ }
+ }
} else {
logger.warn("Couldn't find player.");
logger.warn(" uuid:" + player.getPlayerId());
@@ -682,13 +704,14 @@ public final class GamePanel extends javax.swing.JPanel {
for (ExileView exile: game.getExile()) {
if (!exiles.containsKey(exile.getId())) {
- ExileZoneDialog newExile = new ExileZoneDialog();
+ CardInfoWindowDialog newExile = new CardInfoWindowDialog(ShowType.EXILE, exile.getName());
exiles.put(exile.getId(), newExile);
MageFrame.getDesktop().add(newExile, JLayeredPane.MODAL_LAYER);
newExile.show();
}
exiles.get(exile.getId()).loadCards(exile, bigCard, gameId);
}
+
showRevealed(game);
showLookedAt(game);
if (game.getCombat().size() > 0) {
@@ -805,30 +828,103 @@ public final class GamePanel extends javax.swing.JPanel {
currentStep.setLocation(prevPoint.x - 15, prevPoint.y);
}
}
-
- private void showRevealed(GameView game) {
- for (RevealedView reveal: game.getRevealed()) {
- if (!revealed.containsKey(reveal.getName())) {
- ShowCardsDialog newReveal = new ShowCardsDialog();
- revealed.put(reveal.getName(), newReveal);
- }
- revealed.get(reveal.getName()).loadCards("Revealed " + reveal.getName(), reveal.getCards(), bigCard, Config.dimensions, gameId, false);
+
+ // Called if the game frame is deactivated because the tabled the deck editor or other frames go to foreground
+ public void deactivated() {
+ // hide the non modal windows (because otherwise they are shown on top of the new active pane)
+ for (CardInfoWindowDialog exileDialog: exiles.values()) {
+ exileDialog.hideDialog();
}
+ for (CardInfoWindowDialog graveyardDialog: graveyardWindows.values()) {
+ graveyardDialog.hideDialog();
+ }
+ for (CardInfoWindowDialog revealDialog: revealed.values()) {
+ revealDialog.hideDialog();
+ }
+ for (CardInfoWindowDialog lookedAtDialog: lookedAt.values()) {
+ lookedAtDialog.hideDialog();
+ }
+ }
+
+ // Called if the game frame comes to front again
+ public void activated() {
+ // hide the non modal windows (because otherwise they are shown on top of the new active pane)
+ for (CardInfoWindowDialog exileDialog: exiles.values()) {
+ exileDialog.show();
+ }
+ for (CardInfoWindowDialog graveyardDialog: graveyardWindows.values()) {
+ graveyardDialog.show();
+ }
+ for (CardInfoWindowDialog revealDialog: revealed.values()) {
+ revealDialog.show();
+ }
+ for (CardInfoWindowDialog lookedAtDialog: lookedAt.values()) {
+ lookedAtDialog.show();
+ }
+ }
+
+ public void openGraveyardWindow(String playerName) {
+ if(graveyardWindows.containsKey(playerName)) {
+ CardInfoWindowDialog cardInfoWindowDialog = graveyardWindows.get(playerName);
+ if (cardInfoWindowDialog.isVisible()) {
+ cardInfoWindowDialog.hideDialog();
+ } else {
+ cardInfoWindowDialog.show();
+ }
+ return;
+ }
+ CardInfoWindowDialog newGraveyard = new CardInfoWindowDialog(ShowType.GRAVEYARD, playerName);
+ graveyardWindows.put(playerName, newGraveyard);
+ MageFrame.getDesktop().add(newGraveyard, JLayeredPane.MODAL_LAYER);
+ newGraveyard.loadCards(graveyards.get(playerName), bigCard, gameId);
+ }
+
+ private void showRevealed(GameView game) {
+ for (RevealedView revealView: game.getRevealed()) {
+ handleGameInfoWindow(revealed, ShowType.REVEAL, revealView.getName(), revealView.getCards());
+ }
+ removeClosedCardInfoWindows(revealed);
}
private void showLookedAt(GameView game) {
- for (ShowCardsDialog looked: lookedAt.values()) {
- looked.clearReloaded();
+ for (LookedAtView lookedAtView: game.getLookedAt()) {
+ handleGameInfoWindow(lookedAt, ShowType.LOOKED_AT, lookedAtView.getName(), lookedAtView.getCards());
}
- for (LookedAtView looked: game.getLookedAt()) {
- if (!lookedAt.containsKey(looked.getName())) {
- ShowCardsDialog newLookedAt = new ShowCardsDialog();
- lookedAt.put(looked.getName(), newLookedAt);
+ removeClosedCardInfoWindows(lookedAt);
+ }
+
+ private void handleGameInfoWindow(Map<String, CardInfoWindowDialog> windowMap, ShowType showType, String name, LinkedHashMap cardsView) {
+ CardInfoWindowDialog cardInfoWindowDialog;
+ if (!windowMap.containsKey(name)) {
+ cardInfoWindowDialog = new CardInfoWindowDialog(showType, name);
+ windowMap.put(name, cardInfoWindowDialog);
+ MageFrame.getDesktop().add(cardInfoWindowDialog, JLayeredPane.MODAL_LAYER);
+ } else {
+ cardInfoWindowDialog = windowMap.get(name);
+ }
+
+ if (cardInfoWindowDialog != null && !cardInfoWindowDialog.isClosed()) {
+ switch(showType) {
+ case REVEAL:
+ cardInfoWindowDialog.loadCards((CardsView) cardsView, bigCard, gameId);
+ break;
+ case LOOKED_AT:
+ cardInfoWindowDialog.loadCards((SimpleCardsView) cardsView, bigCard, gameId);
+ break;
}
- lookedAt.get(looked.getName()).loadCards("Looked at by " + looked.getName(), looked.getCards(), bigCard, Config.dimensions, gameId, false);
}
}
-
+
+ private void removeClosedCardInfoWindows(Map<String, CardInfoWindowDialog> windowMap) {
+ // Remove closed window objects from the maps
+ for (Iterator<Map.Entry<String, CardInfoWindowDialog>> iterator = windowMap.entrySet().iterator(); iterator.hasNext();) {
+ Map.Entry<String, CardInfoWindowDialog> entry = iterator.next();
+ if (entry.getValue().isClosed()) {
+ iterator.remove();
+ }
+ }
+ }
+
public void ask(String question, GameView gameView, int messageId) {
updateGame(gameView);
this.feedbackPanel.getFeedback(FeedbackMode.QUESTION, question, false, null, messageId);
diff --git a/Mage.Client/src/main/java/mage/client/game/HelperPanel.java b/Mage.Client/src/main/java/mage/client/game/HelperPanel.java
index 5f325d1f98..602e94b6b1 100644
--- a/Mage.Client/src/main/java/mage/client/game/HelperPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/HelperPanel.java
@@ -226,7 +226,7 @@ public class HelperPanel extends JPanel {
if (message.length() < this.getWidth() / 10) {
message = getSmallText(message);
} else {
- message = "Use ability?" + getSmallText(message.substring(this.getWidth() / 10));
+ message = "Use ability?" + getSmallText(message.substring(0, this.getWidth() / 10));
}
}
textArea.setText(message);
diff --git a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
index 47b9f52048..de217391c7 100644
--- a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
+++ b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
@@ -34,6 +34,28 @@
package mage.client.game;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.image.BufferedImage;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import javax.swing.BorderFactory;
+import javax.swing.GroupLayout;
+import javax.swing.GroupLayout.Alignment;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.LayoutStyle.ComponentPlacement;
+import javax.swing.SwingConstants;
+import javax.swing.border.Border;
+import javax.swing.border.LineBorder;
import mage.MageException;
import mage.cards.MageCard;
import mage.cards.action.ActionCallback;
@@ -60,20 +82,6 @@ import mage.view.ManaPoolView;
import mage.view.PlayerView;
import org.mage.card.arcane.ManaSymbols;
-import javax.swing.*;
-import javax.swing.GroupLayout.Alignment;
-import javax.swing.LayoutStyle.ComponentPlacement;
-import javax.swing.border.Border;
-import javax.swing.border.LineBorder;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
/**
* Enhanced player pane.
*
@@ -787,11 +795,12 @@ public class PlayerPanelExt extends javax.swing.JPanel {
}
private void btnGraveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnGraveActionPerformed
+ MageFrame.getGame(gameId).openGraveyardWindow(player.getName());
/*if (graveyard == null) {
graveyard = new ShowCardsDialog();
}*/
//graveyard.loadCards(player.getName() + " graveyard", player.getGraveyard(), bigCard, Config.dimensions, gameId, false);
- DialogManager.getManager(gameId).showGraveyardDialog(player.getGraveyard(), bigCard, gameId);
+ // DialogManager.getManager(gameId).showGraveyardDialog(player.getGraveyard(), bigCard, gameId);
}
private void btnCommandZoneActionPerformed(java.awt.event.ActionEvent evt) {
diff --git a/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java b/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java
index 8252189c8c..72847cca1a 100644
--- a/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java
+++ b/Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java
@@ -75,21 +75,26 @@ public class GuiDisplayUtil {
Dimension screenDim = c.getToolkit().getScreenSize();
GraphicsConfiguration g = c.getGraphicsConfiguration();
if (g != null) {
- Insets insets = c.getToolkit().getScreenInsets(g);
-
+ Insets insets = c.getToolkit().getScreenInsets(g);
+ boolean setLocation = false;
if (x + c.getWidth() > screenDim.width - insets.right) {
x = (screenDim.width - insets.right) - c.getWidth();
+ setLocation = true;
} else if (x < insets.left) {
x = insets.left;
+ setLocation = true;
}
if (y + c.getHeight() > screenDim.height - insets.bottom) {
y = (screenDim.height - insets.bottom) - c.getHeight();
+ setLocation = true;
} else if (y < insets.top) {
y = insets.top;
+ setLocation = true;
+ }
+ if (setLocation) {
+ c.setLocation(x, y);
}
-
- c.setLocation(x, y);
} else {
System.out.println("GuiDisplayUtil::keepComponentInsideScreen -> no GraphicsConfiguration");
}
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java
index a65db2670e..fa6428a9f3 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java
@@ -43,7 +43,7 @@ public class GathererSets implements Iterable<DownloadJob> {
"CMD", "C13", "C14", "PC2",
"ISD", "DKA", "AVR",
"RTR", "GTC", "DGM",
- "MMA",
+ "MMA", "MM2",
"THS", "BNG", "JOU",
"CNS", "VMA", "TPR",
"KTK", "FRF", "DTK"};
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java
index 5bb3f704db..80c7b7b4dc 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java
@@ -16,6 +16,7 @@ public class MagicCardsImageSource implements CardImageSource {
private static final Map<String, String> setNameTokenReplacement = new HashMap<String, String>() {
{
+ put("CLASH", "clash-pack");
put("TPR", "tempest-remastered");
put("ORI", "magic-origins");
put("MM2", "modern-masters-2015");
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/utils/ImageManager.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/ImageManager.java
index 52138aa996..63f2dcf900 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/utils/ImageManager.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/utils/ImageManager.java
@@ -15,6 +15,9 @@ public interface ImageManager {
Image getTokenIconImage();
Image getTriggeredAbilityImage();
Image getActivatedAbilityImage();
+ Image getLookedAtImage();
+ Image getRevealedImage();
+ Image getExileImage();
Image getCopyInformIconImage();
Image getCounterImageViolet();
Image getCounterImageRed();
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java
index 4ec5ac433d..9209be5d87 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java
@@ -110,6 +110,33 @@ public class ImageManagerImpl implements ImageManager {
return imageTokenIcon;
}
+ @Override
+ public Image getLookedAtImage() {
+ if (lookedAtIcon == null) {
+ Image image = getImageFromResourceTransparent("/game/looked_at.png", Color.WHITE, new Rectangle(20, 20));
+ lookedAtIcon = BufferedImageBuilder.bufferImage(image, BufferedImage.TYPE_INT_ARGB);
+ }
+ return lookedAtIcon;
+ }
+
+ @Override
+ public Image getRevealedImage() {
+ if (revealedIcon == null) {
+ Image image = getImageFromResourceTransparent("/game/revealed.png", Color.WHITE, new Rectangle(20, 20));
+ revealedIcon = BufferedImageBuilder.bufferImage(image, BufferedImage.TYPE_INT_ARGB);
+ }
+ return revealedIcon;
+ }
+
+ @Override
+ public Image getExileImage() {
+ if (exileIcon == null) {
+ Image image = getImageFromResourceTransparent("/info/exile.png", Color.WHITE, new Rectangle(20, 20));
+ exileIcon = BufferedImageBuilder.bufferImage(image, BufferedImage.TYPE_INT_ARGB);
+ }
+ return exileIcon;
+ }
+
@Override
public BufferedImage getTriggeredAbilityImage() {
if (triggeredAbilityIcon == null) {
@@ -374,6 +401,9 @@ public class ImageManagerImpl implements ImageManager {
private static BufferedImage imageTokenIcon;
private static BufferedImage triggeredAbilityIcon;
private static BufferedImage activatedAbilityIcon;
+ private static BufferedImage lookedAtIcon;
+ private static BufferedImage revealedIcon;
+ private static BufferedImage exileIcon;
private static BufferedImage imageCopyIcon;
private static BufferedImage imageCounterGreen;
private static BufferedImage imageCounterGrey;
diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt
index 93fdf9a8e0..406edd7926 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -1,3 +1,20 @@
+#Generate|TOK:MM2|Eldrazi Spawn 1|
+#Generate|TOK:MM2|Eldrazi Spawn 2|
+#Generate|TOK:MM2|Eldrazi Spawn 3|
+#Generate|TOK:MM2|Elephant|
+#Generate|TOK:MM2|Faerie Rogue|
+#Generate|TOK:MM2|Germ|
+#Generate|TOK:MM2|Golem|
+#Generate|TOK:MM2|Insect|
+#Generate|TOK:MM2|Myr|
+#Generate|TOK:MM2|Saproling|
+#Generate|TOK:MM2|Snake|
+#Generate|TOK:MM2|Soldier|
+#Generate|TOK:MM2|Spirit|
+#Generate|TOK:MM2|Thrull|
+#Generate|TOK:MM2|Wolf|
+#Generate|TOK:MM2|Wurm|
+
#Generate|TOK:TPR|Goblin|
#Generate|TOK:TPR|Pegasus|
#Generate|TOK:TPR|Rat|
diff --git a/Mage.Client/src/main/resources/game/looked_at.png b/Mage.Client/src/main/resources/game/looked_at.png
new file mode 100644
index 0000000000..0f679faa85
Binary files /dev/null and b/Mage.Client/src/main/resources/game/looked_at.png differ
diff --git a/Mage.Client/src/main/resources/game/revealed.png b/Mage.Client/src/main/resources/game/revealed.png
new file mode 100644
index 0000000000..c004949400
Binary files /dev/null and b/Mage.Client/src/main/resources/game/revealed.png differ
diff --git a/Mage.Client/src/main/resources/image.url.properties b/Mage.Client/src/main/resources/image.url.properties
index 21a5556cc2..75f83debf0 100644
--- a/Mage.Client/src/main/resources/image.url.properties
+++ b/Mage.Client/src/main/resources/image.url.properties
@@ -64,6 +64,6 @@ ddd=gvl
unh=uh
dde=pvc
# Remove setname as soon as the images can be downloaded
-ignore.urls=TOK,MMB
+ignore.urls=TOK,MM2
# sets ordered by release time (newest goes first)
-token.lookup.order=TPR,MPRP,DD3,DDO,ORI,MMB,PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC
\ No newline at end of file
+token.lookup.order=TPR,MPRP,DD3,DDO,ORI,MM2,PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC
\ No newline at end of file
diff --git a/Mage.Common/src/mage/utils/MageVersion.java b/Mage.Common/src/mage/utils/MageVersion.java
index 5a9acc7466..36583d77a3 100644
--- a/Mage.Common/src/mage/utils/MageVersion.java
+++ b/Mage.Common/src/mage/utils/MageVersion.java
@@ -42,7 +42,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
public final static int MAGE_VERSION_MAJOR = 1;
public final static int MAGE_VERSION_MINOR = 4;
public final static int MAGE_VERSION_PATCH = 1;
- public final static String MAGE_VERSION_MINOR_PATCH = "v2";
+ public final static String MAGE_VERSION_MINOR_PATCH = "v3";
public final static String MAGE_VERSION_INFO = "";
private final int major;
diff --git a/Mage.Common/src/mage/view/LookedAtView.java b/Mage.Common/src/mage/view/LookedAtView.java
index db1759c0c0..a7485e7120 100644
--- a/Mage.Common/src/mage/view/LookedAtView.java
+++ b/Mage.Common/src/mage/view/LookedAtView.java
@@ -46,7 +46,7 @@ public class LookedAtView implements Serializable {
public LookedAtView(String name, Cards cards, Game game) {
this.name = name;
for (Card card: cards.getCards(game)) {
- this.cards.put(card.getId(), new CardView(card, game, card.getId()));
+ this.cards.put(card.getId(), new SimpleCardView(card.getId(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), card.getTokenSetCode()));
}
}
diff --git a/Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java b/Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java
index a4ef94288b..127efc1b71 100644
--- a/Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java
+++ b/Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java
@@ -487,7 +487,7 @@ public class ConnectDialog extends JDialog {
private void findPublicServerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
BufferedReader in = null;
try {
- URL serverListURL = new URL("http://XMage.info/files/server-list.txt");
+ URL serverListURL = new URL("http://XMage.de/files/server-list.txt");
in = new BufferedReader(new InputStreamReader(serverListURL.openStream()));
List<String> servers = new ArrayList<>();
diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
index 1ba65e80b4..dda37ca177 100644
--- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
@@ -311,8 +311,9 @@ public class ComputerPlayer extends PlayerImpl implements Player {
if (card != null) {
cards.add(card);
}
- }
- while(!target.isChosen() && !cards.isEmpty()) {
+ }
+ while((outcome.isGood() ? target.getTargets().size() < target.getMaxNumberOfTargets() : !target.isChosen())
+ && !cards.isEmpty()) {
Card pick = pickTarget(cards, outcome, target, null, game);
if (pick != null) {
target.addTarget(pick.getId(), null, game);
diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/HolidayCube2015.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/HolidayCube2015.java
new file mode 100644
index 0000000000..7d8d980924
--- /dev/null
+++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/HolidayCube2015.java
@@ -0,0 +1,582 @@
+/*
+ * 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.tournament.cubes;
+
+import mage.game.draft.DraftCube;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class HolidayCube2015 extends DraftCube {
+
+ public HolidayCube2015() {
+ super("MTGO Holiday Cube 2015");
+
+ cubeCards.add(new CardIdentity("Abrupt Decay", ""));
+ cubeCards.add(new CardIdentity("Academy Ruins", ""));
+ cubeCards.add(new CardIdentity("Acidic Slime", ""));
+ cubeCards.add(new CardIdentity("Adarkar Wastes", ""));
+ cubeCards.add(new CardIdentity("Ajani Goldmane", ""));
+ cubeCards.add(new CardIdentity("Ajani Vengeant", ""));
+ cubeCards.add(new CardIdentity("Ajani, Caller of the Pride", ""));
+ cubeCards.add(new CardIdentity("Alesha, Who Smiles at Death", ""));
+ cubeCards.add(new CardIdentity("Ancestral Recall", ""));
+ cubeCards.add(new CardIdentity("Ancestral Vision", ""));
+ cubeCards.add(new CardIdentity("Ancient Grudge", ""));
+ cubeCards.add(new CardIdentity("Ancient Tomb", ""));
+ cubeCards.add(new CardIdentity("Angel of Serenity", ""));
+ cubeCards.add(new CardIdentity("Animate Dead", ""));
+ cubeCards.add(new CardIdentity("Arbor Elf", ""));
+ cubeCards.add(new CardIdentity("Archangel of Thune", ""));
+ cubeCards.add(new CardIdentity("Arid Mesa", ""));
+ cubeCards.add(new CardIdentity("Armageddon", ""));
+ cubeCards.add(new CardIdentity("Ashiok, Nightmare Weaver", ""));
+ cubeCards.add(new CardIdentity("Augur of Bolas", ""));
+ cubeCards.add(new CardIdentity("Avacyn's Pilgrim", ""));
+ cubeCards.add(new CardIdentity("Avalanche Riders", ""));
+ cubeCards.add(new CardIdentity("Avenger of Zendikar", ""));
+ cubeCards.add(new CardIdentity("Awakening Zone", ""));
+ cubeCards.add(new CardIdentity("Azorius Signet", ""));
+ cubeCards.add(new CardIdentity("Badlands", ""));
+ cubeCards.add(new CardIdentity("Balance", ""));
+ cubeCards.add(new CardIdentity("Baleful Strix", ""));
+ cubeCards.add(new CardIdentity("Baneslayer Angel", ""));
+ cubeCards.add(new CardIdentity("Banisher Priest", ""));
+ cubeCards.add(new CardIdentity("Banishing Light", ""));
+ cubeCards.add(new CardIdentity("Basalt Monolith", ""));
+ cubeCards.add(new CardIdentity("Batterskull", ""));
+ cubeCards.add(new CardIdentity("Battlefield Forge", ""));
+ cubeCards.add(new CardIdentity("Bayou", ""));
+ cubeCards.add(new CardIdentity("Bazaar of Baghdad", ""));
+ cubeCards.add(new CardIdentity("Beast Within", ""));
+ cubeCards.add(new CardIdentity("Birds of Paradise", ""));
+ cubeCards.add(new CardIdentity("Birthing Pod", ""));
+ cubeCards.add(new CardIdentity("Bitterblossom", ""));
+ cubeCards.add(new CardIdentity("Black Lotus", ""));
+ cubeCards.add(new CardIdentity("Blade Splicer", ""));
+ cubeCards.add(new CardIdentity("Blightsteel Colossus", ""));
+ cubeCards.add(new CardIdentity("Blood Crypt", ""));
+ cubeCards.add(new CardIdentity("Bloodbraid Elf", ""));
+ cubeCards.add(new CardIdentity("Bloodghast", ""));
+ cubeCards.add(new CardIdentity("Bloodline Keeper", ""));
+ cubeCards.add(new CardIdentity("Bloodsoaked Champion", ""));
+ cubeCards.add(new CardIdentity("Bloodstained Mire", ""));
+ cubeCards.add(new CardIdentity("Bone Shredder", ""));
+ cubeCards.add(new CardIdentity("Bonfire of the Damned", ""));
+ cubeCards.add(new CardIdentity("Boros Charm", ""));
+ cubeCards.add(new CardIdentity("Boros Reckoner", ""));
+ cubeCards.add(new CardIdentity("Boros Signet", ""));
+ cubeCards.add(new CardIdentity("Braids, Cabal Minion", ""));
+ cubeCards.add(new CardIdentity("Brain Freeze", ""));
+ cubeCards.add(new CardIdentity("Brain Maggot", ""));
+ cubeCards.add(new CardIdentity("Brainstorm", ""));
+ cubeCards.add(new CardIdentity("Breeding Pool", ""));
+ cubeCards.add(new CardIdentity("Bribery", ""));
+ cubeCards.add(new CardIdentity("Brimaz, King of Oreskos", ""));
+ cubeCards.add(new CardIdentity("Brimstone Volley", ""));
+ cubeCards.add(new CardIdentity("Buried Alive", ""));
+ cubeCards.add(new CardIdentity("Burning of Xinye", ""));
+ cubeCards.add(new CardIdentity("Burst Lightning", ""));
+ cubeCards.add(new CardIdentity("Caves of Koilos", ""));
+ cubeCards.add(new CardIdentity("Chain Lightning", ""));
+ cubeCards.add(new CardIdentity("Chandra, Pyromaster", ""));
+ cubeCards.add(new CardIdentity("Chandra's Phoenix", ""));
+ cubeCards.add(new CardIdentity("Char", ""));
+ cubeCards.add(new CardIdentity("Channel", ""));
+ cubeCards.add(new CardIdentity("Chrome Mox", ""));
+ cubeCards.add(new CardIdentity("Clifftop Retreat", ""));
+ cubeCards.add(new CardIdentity("Cloudgoat Ranger", ""));
+ cubeCards.add(new CardIdentity("Coalition Relic", ""));
+ cubeCards.add(new CardIdentity("Compulsive Research", ""));
+ cubeCards.add(new CardIdentity("Consecrated Sphinx", ""));
+ cubeCards.add(new CardIdentity("Control Magic", ""));
+ cubeCards.add(new CardIdentity("Corpse Dance", ""));
+ cubeCards.add(new CardIdentity("Council's Judgment", ""));
+ cubeCards.add(new CardIdentity("Counterspell", ""));
+ cubeCards.add(new CardIdentity("Courser of Kruphix", ""));
+ cubeCards.add(new CardIdentity("Crater's Claws", ""));
+ cubeCards.add(new CardIdentity("Craterhoof Behemoth", ""));
+ cubeCards.add(new CardIdentity("Crucible of Worlds", ""));
+ cubeCards.add(new CardIdentity("Cryptic Command", ""));
+ cubeCards.add(new CardIdentity("Dack Fayden", ""));
+ cubeCards.add(new CardIdentity("Damnation", ""));
+ cubeCards.add(new CardIdentity("Daretti, Scrap Savant", ""));
+ cubeCards.add(new CardIdentity("Dark Confidant", ""));
+ cubeCards.add(new CardIdentity("Dark Ritual", ""));
+ cubeCards.add(new CardIdentity("Day of Judgment", ""));
+ cubeCards.add(new CardIdentity("Daze", ""));
+ cubeCards.add(new CardIdentity("Deathrite Shaman", ""));
+ cubeCards.add(new CardIdentity("Deceiver Exarch", ""));
+ cubeCards.add(new CardIdentity("Delver of Secrets", ""));
+ cubeCards.add(new CardIdentity("Demonic Tutor", ""));
+ cubeCards.add(new CardIdentity("Deranged Hermit", ""));
+ cubeCards.add(new CardIdentity("Desecration Demon", ""));
+ cubeCards.add(new CardIdentity("Diabolic Edict", ""));
+ cubeCards.add(new CardIdentity("Dig Through Time", ""));
+ cubeCards.add(new CardIdentity("Dimir Signet", ""));
+ cubeCards.add(new CardIdentity("Disenchant", ""));
+ cubeCards.add(new CardIdentity("Disfigure", ""));
+ cubeCards.add(new CardIdentity("Dismember", ""));
+ cubeCards.add(new CardIdentity("Domri Rade", ""));
+ cubeCards.add(new CardIdentity("Dragon Hunter", ""));
+ cubeCards.add(new CardIdentity("Dragonlord Atarka", ""));
+ cubeCards.add(new CardIdentity("Dragonlord Silumgar", ""));
+ cubeCards.add(new CardIdentity("Dragonskull Summit", ""));
+ cubeCards.add(new CardIdentity("Dreadbore", ""));
+ cubeCards.add(new CardIdentity("Drowned Catacomb", ""));
+ cubeCards.add(new CardIdentity("Dualcaster Mage", ""));
+ cubeCards.add(new CardIdentity("Duplicant", ""));
+ cubeCards.add(new CardIdentity("Duress", ""));
+ cubeCards.add(new CardIdentity("Edric, Spymaster of Trest", ""));
+ cubeCards.add(new CardIdentity("Eidolon of the Great Revel", ""));
+ cubeCards.add(new CardIdentity("Electrolyze", ""));
+ cubeCards.add(new CardIdentity("Elesh Norn, Grand Cenobite", ""));
+ cubeCards.add(new CardIdentity("Elspeth, Knight-Errant", ""));
+ cubeCards.add(new CardIdentity("Elspeth, Sun's Champion", ""));
+ cubeCards.add(new CardIdentity("Elves of Deep Shadow", ""));
+ cubeCards.add(new CardIdentity("Elvish Mystic", ""));
+ cubeCards.add(new CardIdentity("Emeria Angel", ""));
+ cubeCards.add(new CardIdentity("Empty the Warrens", ""));
+ cubeCards.add(new CardIdentity("Emrakul, the Aeons Torn", ""));
+ cubeCards.add(new CardIdentity("Enlightened Tutor", ""));
+ cubeCards.add(new CardIdentity("Entomb", ""));
+ cubeCards.add(new CardIdentity("Eternal Witness", ""));
+ cubeCards.add(new CardIdentity("Eureka", ""));
+ cubeCards.add(new CardIdentity("Everflowing Chalice", ""));
+ cubeCards.add(new CardIdentity("Exalted Angel", ""));
+ cubeCards.add(new CardIdentity("Fact or Fiction", ""));
+ cubeCards.add(new CardIdentity("Faith's Fetters", ""));
+ cubeCards.add(new CardIdentity("Faithless Looting", ""));
+ cubeCards.add(new CardIdentity("Fastbond", ""));
+ cubeCards.add(new CardIdentity("Fauna Shaman", ""));
+ cubeCards.add(new CardIdentity("Fiend Hunter", ""));
+ cubeCards.add(new CardIdentity("Figure of Destiny", ""));
+ cubeCards.add(new CardIdentity("Fire // Ice", ""));
+ cubeCards.add(new CardIdentity("Fireblast", ""));
+ cubeCards.add(new CardIdentity("Firebolt", ""));
+ cubeCards.add(new CardIdentity("Firedrinker Satyr", ""));
+ cubeCards.add(new CardIdentity("Firestorm", ""));
+ cubeCards.add(new CardIdentity("Flametongue Kavu", ""));
+ cubeCards.add(new CardIdentity("Flickerwisp", ""));
+ cubeCards.add(new CardIdentity("Flooded Strand", ""));
+ cubeCards.add(new CardIdentity("Force of Will", ""));
+ cubeCards.add(new CardIdentity("Force Spike", ""));
+ cubeCards.add(new CardIdentity("Frantic Search", ""));
+ cubeCards.add(new CardIdentity("Freyalise, Llanowar's Fury", ""));
+ cubeCards.add(new CardIdentity("Frost Titan", ""));
+ cubeCards.add(new CardIdentity("Fyndhorn Elves", ""));
+ cubeCards.add(new CardIdentity("Gaddock Teeg", ""));
+ cubeCards.add(new CardIdentity("Gaea's Cradle", ""));
+ cubeCards.add(new CardIdentity("Garruk Relentless", ""));
+ cubeCards.add(new CardIdentity("Garruk Wildspeaker", ""));
+ cubeCards.add(new CardIdentity("Garruk, Apex Predator", ""));
+ cubeCards.add(new CardIdentity("Garruk, Caller of Beasts", ""));
+ cubeCards.add(new CardIdentity("Garruk, Primal Hunter", ""));
+ cubeCards.add(new CardIdentity("Gatekeeper of Malakir", ""));
+ cubeCards.add(new CardIdentity("Geist of Saint Traft", ""));
+ cubeCards.add(new CardIdentity("Genesis Wave", ""));
+ cubeCards.add(new CardIdentity("Geralf's Messenger", ""));
+ cubeCards.add(new CardIdentity("Gideon Jura", ""));
+ cubeCards.add(new CardIdentity("Gifts Ungiven", ""));
+ cubeCards.add(new CardIdentity("Gilded Lotus", ""));
+ cubeCards.add(new CardIdentity("Gitaxian Probe", ""));
+ cubeCards.add(new CardIdentity("Glacial Fortress", ""));
+ cubeCards.add(new CardIdentity("Glen Elendra Archmage", ""));
+ cubeCards.add(new CardIdentity("Go for the Throat", ""));
+ cubeCards.add(new CardIdentity("Goblin Guide", ""));
+ cubeCards.add(new CardIdentity("Goblin Welder", ""));
+ cubeCards.add(new CardIdentity("Godless Shrine", ""));
+ cubeCards.add(new CardIdentity("Golgari Signet", ""));
+ cubeCards.add(new CardIdentity("Gore-House Chainwalker", ""));
+ cubeCards.add(new CardIdentity("Grave Titan", ""));
+ cubeCards.add(new CardIdentity("Greater Gargadon", ""));
+ cubeCards.add(new CardIdentity("Green Sun's Zenith", ""));
+ cubeCards.add(new CardIdentity("Grim Lavamancer", ""));
+ cubeCards.add(new CardIdentity("Grim Monolith", ""));
+ cubeCards.add(new CardIdentity("Griselbrand", ""));
+ cubeCards.add(new CardIdentity("Grove of the Burnwillows", ""));
+ cubeCards.add(new CardIdentity("Gruul Signet", ""));
+ cubeCards.add(new CardIdentity("Gurmag Angler", ""));
+ cubeCards.add(new CardIdentity("Gush", ""));
+ cubeCards.add(new CardIdentity("Guttersnipe", ""));
+ cubeCards.add(new CardIdentity("Hallowed Fountain", ""));
+ cubeCards.add(new CardIdentity("Hallowed Spiritkeeper", ""));
+ cubeCards.add(new CardIdentity("Harmonize", ""));
+ cubeCards.add(new CardIdentity("Heartbeat of Spring", ""));
+ cubeCards.add(new CardIdentity("Hellrider", ""));
+ cubeCards.add(new CardIdentity("Hero of Bladehold", ""));
+ cubeCards.add(new CardIdentity("Hero of Oxid Ridge", ""));
+ cubeCards.add(new CardIdentity("Hero's Downfall", ""));
+ cubeCards.add(new CardIdentity("Hinterland Harbor", ""));
+ cubeCards.add(new CardIdentity("Honor of the Pure", ""));
+ cubeCards.add(new CardIdentity("Horizon Canopy", ""));
+ cubeCards.add(new CardIdentity("Huntmaster of the Fells", ""));
+ cubeCards.add(new CardIdentity("Hymn to Tourach", ""));
+ cubeCards.add(new CardIdentity("Hypnotic Specter", ""));
+ cubeCards.add(new CardIdentity("Imperial Recruiter", ""));
+ cubeCards.add(new CardIdentity("Imperial Seal", ""));
+ cubeCards.add(new CardIdentity("Impulse", ""));
+ cubeCards.add(new CardIdentity("Incinerate", ""));
+ cubeCards.add(new CardIdentity("Indrik Stomphowler", ""));
+ cubeCards.add(new CardIdentity("Inferno Titan", ""));
+ cubeCards.add(new CardIdentity("Inkwell Leviathan", ""));
+ cubeCards.add(new CardIdentity("Inquisition of Kozilek", ""));
+ cubeCards.add(new CardIdentity("Iona, Shield of Emeria", ""));
+ cubeCards.add(new CardIdentity("Isamaru, Hound of Konda", ""));
+ cubeCards.add(new CardIdentity("Isochron Scepter", ""));
+ cubeCards.add(new CardIdentity("Isolated Chapel", ""));
+ cubeCards.add(new CardIdentity("Izzet Charm", ""));
+ cubeCards.add(new CardIdentity("Izzet Signet", ""));
+ cubeCards.add(new CardIdentity("Jace Beleren", ""));
+ cubeCards.add(new CardIdentity("Jace, Architect of Thought", ""));
+ cubeCards.add(new CardIdentity("Jace, the Mind Sculptor", ""));
+ cubeCards.add(new CardIdentity("Jackal Pup", ""));
+ cubeCards.add(new CardIdentity("Jeskai Ascendancy", ""));
+ cubeCards.add(new CardIdentity("Joraga Treespeaker", ""));
+ cubeCards.add(new CardIdentity("Journey to Nowhere", ""));
+ cubeCards.add(new CardIdentity("Karakas", ""));
+ cubeCards.add(new CardIdentity("Kargan Dragonlord", ""));
+ cubeCards.add(new CardIdentity("Karn Liberated", ""));
+ cubeCards.add(new CardIdentity("Kiki-Jiki, Mirror Breaker", ""));
+ cubeCards.add(new CardIdentity("Kiora, the Crashing Wave", ""));
+ cubeCards.add(new CardIdentity("Kitchen Finks", ""));
+ cubeCards.add(new CardIdentity("Koth of the Hammer", ""));
+ cubeCards.add(new CardIdentity("Kozilek, Butcher of Truth", ""));
+ cubeCards.add(new CardIdentity("Krosan Grip", ""));
+ cubeCards.add(new CardIdentity("Kuldotha Forgemaster", ""));
+ cubeCards.add(new CardIdentity("Land Tax", ""));
+ cubeCards.add(new CardIdentity("Leonin Arbiter", ""));
+ cubeCards.add(new CardIdentity("Leonin Relic-Warder", ""));
+ cubeCards.add(new CardIdentity("Library of Alexandria", ""));
+ cubeCards.add(new CardIdentity("Life from the Loam", ""));
+ cubeCards.add(new CardIdentity("Lifebane Zombie", ""));
+ cubeCards.add(new CardIdentity("Lightning Bolt", ""));
+ cubeCards.add(new CardIdentity("Lightning Greaves", ""));
+ cubeCards.add(new CardIdentity("Lightning Helix", ""));
+ cubeCards.add(new CardIdentity("Lightning Mauler", ""));
+ cubeCards.add(new CardIdentity("Lightning Strike", ""));
+ cubeCards.add(new CardIdentity("Liliana of the Veil", ""));
+ cubeCards.add(new CardIdentity("Lingering Souls", ""));
+ cubeCards.add(new CardIdentity("Lion's Eye Diamond", ""));
+ cubeCards.add(new CardIdentity("Living Death", ""));
+ cubeCards.add(new CardIdentity("Llanowar Elves", ""));
+ cubeCards.add(new CardIdentity("Llanowar Wastes", ""));
+ cubeCards.add(new CardIdentity("Lodestone Golem", ""));
+ cubeCards.add(new CardIdentity("Looter il-Kor", ""));
+ cubeCards.add(new CardIdentity("Lotus Bloom", ""));
+ cubeCards.add(new CardIdentity("Lotus Cobra", ""));
+ cubeCards.add(new CardIdentity("Maelstrom Pulse", ""));
+ cubeCards.add(new CardIdentity("Magma Jet", ""));
+ cubeCards.add(new CardIdentity("Magus of the Moon", ""));
+ cubeCards.add(new CardIdentity("Makeshift Mannequin", ""));
+ cubeCards.add(new CardIdentity("Mana Confluence", ""));
+ cubeCards.add(new CardIdentity("Mana Crypt", ""));
+ cubeCards.add(new CardIdentity("Mana Drain", ""));
+ cubeCards.add(new CardIdentity("Mana Leak", ""));
+ cubeCards.add(new CardIdentity("Mana Tithe", ""));
+ cubeCards.add(new CardIdentity("Mana Vault", ""));
+ cubeCards.add(new CardIdentity("Manic Vandal", ""));
+ cubeCards.add(new CardIdentity("Man-o'-War", ""));
+ cubeCards.add(new CardIdentity("Mardu Woe-Reaper", ""));
+ cubeCards.add(new CardIdentity("Marsh Flats", ""));
+ cubeCards.add(new CardIdentity("Massacre Wurm", ""));
+ cubeCards.add(new CardIdentity("Master of the Wild Hunt", ""));
+ cubeCards.add(new CardIdentity("Masticore", ""));
+ cubeCards.add(new CardIdentity("Maze of Ith", ""));
+ cubeCards.add(new CardIdentity("Meloku the Clouded Mirror", ""));
+ cubeCards.add(new CardIdentity("Mental Misstep", ""));
+ cubeCards.add(new CardIdentity("Memory Jar", ""));
+ cubeCards.add(new CardIdentity("Mesmeric Fiend", ""));
+ cubeCards.add(new CardIdentity("Metalworker", ""));
+ cubeCards.add(new CardIdentity("Mind Twist", ""));
+ cubeCards.add(new CardIdentity("Mindslaver", ""));
+ cubeCards.add(new CardIdentity("Mind's Desire", ""));
+ cubeCards.add(new CardIdentity("Mirari's Wake", ""));
+ cubeCards.add(new CardIdentity("Mirran Crusader", ""));
+ cubeCards.add(new CardIdentity("Mishra's Factory", ""));
+ cubeCards.add(new CardIdentity("Mishra's Workshop", ""));
+ cubeCards.add(new CardIdentity("Misty Rainforest", ""));
+ cubeCards.add(new CardIdentity("Mizzium Mortars", ""));
+ cubeCards.add(new CardIdentity("Moat", ""));
+ cubeCards.add(new CardIdentity("Momentary Blink", ""));
+ cubeCards.add(new CardIdentity("Monastery Mentor", ""));
+ cubeCards.add(new CardIdentity("Monastery Swiftspear", ""));
+ cubeCards.add(new CardIdentity("Mother of Runes", ""));
+ cubeCards.add(new CardIdentity("Mox Diamond", ""));
+ cubeCards.add(new CardIdentity("Mox Emerald", ""));
+ cubeCards.add(new CardIdentity("Mox Jet", ""));
+ cubeCards.add(new CardIdentity("Mox Pearl", ""));
+ cubeCards.add(new CardIdentity("Mox Ruby", ""));
+ cubeCards.add(new CardIdentity("Mox Sapphire", ""));
+ cubeCards.add(new CardIdentity("Mulldrifter", ""));
+ cubeCards.add(new CardIdentity("Murderous Cut", ""));
+ cubeCards.add(new CardIdentity("Mutavault", ""));
+ cubeCards.add(new CardIdentity("Myr Battlesphere", ""));
+ cubeCards.add(new CardIdentity("Mystical Tutor", ""));
+ cubeCards.add(new CardIdentity("Mystic Snake", ""));
+ cubeCards.add(new CardIdentity("Narset Transcendent", ""));
+ cubeCards.add(new CardIdentity("Natural Order", ""));
+ cubeCards.add(new CardIdentity("Nature's Claim", ""));
+ cubeCards.add(new CardIdentity("Necromancy", ""));
+ cubeCards.add(new CardIdentity("Necropotence", ""));
+ cubeCards.add(new CardIdentity("Nekrataal", ""));
+ cubeCards.add(new CardIdentity("Nether Void", ""));
+ cubeCards.add(new CardIdentity("Nevinyrral's Disk", ""));
+ cubeCards.add(new CardIdentity("Nezumi Graverobber", ""));
+ cubeCards.add(new CardIdentity("Nezumi Shortfang", ""));
+ cubeCards.add(new CardIdentity("Nicol Bolas, Planeswalker", ""));
+ cubeCards.add(new CardIdentity("Nissa, Worldwaker", ""));
+ cubeCards.add(new CardIdentity("Noble Hierarch", ""));
+ cubeCards.add(new CardIdentity("Oath of Druids", ""));
+ cubeCards.add(new CardIdentity("Oblivion Ring", ""));
+ cubeCards.add(new CardIdentity("Olivia Voldaren", ""));
+ cubeCards.add(new CardIdentity("Oona's Prowler", ""));
+ cubeCards.add(new CardIdentity("Ophiomancer", ""));
+ cubeCards.add(new CardIdentity("Opposition", ""));
+ cubeCards.add(new CardIdentity("Oracle of Mul Daya", ""));
+ cubeCards.add(new CardIdentity("Orzhov Signet", ""));
+ cubeCards.add(new CardIdentity("Outpost Siege", ""));
+ cubeCards.add(new CardIdentity("Overgrown Tomb", ""));
+ cubeCards.add(new CardIdentity("Pack Rat", ""));
+ cubeCards.add(new CardIdentity("Palinchron", ""));
+ cubeCards.add(new CardIdentity("Parallax Wave", ""));
+ cubeCards.add(new CardIdentity("Path to Exile", ""));
+ cubeCards.add(new CardIdentity("Pattern of Rebirth", ""));
+ cubeCards.add(new CardIdentity("Pentad Prism", ""));
+ cubeCards.add(new CardIdentity("Pernicious Deed", ""));
+ cubeCards.add(new CardIdentity("Pestermite", ""));
+ cubeCards.add(new CardIdentity("Phantasmal Image", ""));
+ cubeCards.add(new CardIdentity("Phyrexian Metamorph", ""));
+ cubeCards.add(new CardIdentity("Phyrexian Obliterator", ""));
+ cubeCards.add(new CardIdentity("Phyrexian Revoker", ""));
+ cubeCards.add(new CardIdentity("Pithing Needle", ""));
+ cubeCards.add(new CardIdentity("Plateau", ""));
+ cubeCards.add(new CardIdentity("Polluted Delta", ""));
+ cubeCards.add(new CardIdentity("Polukranos, World Eater", ""));
+ cubeCards.add(new CardIdentity("Ponder", ""));
+ cubeCards.add(new CardIdentity("Porcelain Legionnaire", ""));
+ cubeCards.add(new CardIdentity("Preordain", ""));
+ cubeCards.add(new CardIdentity("Primal Command", ""));
+ cubeCards.add(new CardIdentity("Primeval Titan", ""));
+ cubeCards.add(new CardIdentity("Progenitus", ""));
+ cubeCards.add(new CardIdentity("Prophetic Flamespeaker", ""));
+ cubeCards.add(new CardIdentity("Punishing Fire", ""));
+ cubeCards.add(new CardIdentity("Puppeteer Clique", ""));
+ cubeCards.add(new CardIdentity("Putrid Imp", ""));
+ cubeCards.add(new CardIdentity("Qasali Pridemage", ""));
+ cubeCards.add(new CardIdentity("Rakdos Cackler", ""));
+ cubeCards.add(new CardIdentity("Rakdos Signet", ""));
+ cubeCards.add(new CardIdentity("Rakdos's Return", ""));
+ cubeCards.add(new CardIdentity("Ral Zarek", ""));
+ cubeCards.add(new CardIdentity("Ranger of Eos", ""));
+ cubeCards.add(new CardIdentity("Ravages of War", ""));
+ cubeCards.add(new CardIdentity("Reanimate", ""));
+ cubeCards.add(new CardIdentity("Reclamation Sage", ""));
+ cubeCards.add(new CardIdentity("Recurring Nightmare", ""));
+ cubeCards.add(new CardIdentity("Regrowth", ""));
+ cubeCards.add(new CardIdentity("Remand", ""));
+ cubeCards.add(new CardIdentity("Repeal", ""));
+ cubeCards.add(new CardIdentity("Restoration Angel", ""));
+ cubeCards.add(new CardIdentity("Reveillark", ""));
+ cubeCards.add(new CardIdentity("Rift Bolt", ""));
+ cubeCards.add(new CardIdentity("Riftwing Cloudskate", ""));
+ cubeCards.add(new CardIdentity("Rishadan Port", ""));
+ cubeCards.add(new CardIdentity("Rofellos, Llanowar Emissary", ""));
+ cubeCards.add(new CardIdentity("Rootbound Crag", ""));
+ cubeCards.add(new CardIdentity("Sacred Foundry", ""));
+ cubeCards.add(new CardIdentity("Sakura-Tribe Elder", ""));
+ cubeCards.add(new CardIdentity("Sarkhan, the Dragonspeaker", ""));
+ cubeCards.add(new CardIdentity("Savannah", ""));
+ cubeCards.add(new CardIdentity("Scalding Tarn", ""));
+ cubeCards.add(new CardIdentity("Scavenging Ooze", ""));
+ cubeCards.add(new CardIdentity("Scroll Rack", ""));
+ cubeCards.add(new CardIdentity("Scrubland", ""));
+ cubeCards.add(new CardIdentity("Search for Tomorrow", ""));
+ cubeCards.add(new CardIdentity("Searing Blaze", ""));
+ cubeCards.add(new CardIdentity("Searing Spear", ""));
+ cubeCards.add(new CardIdentity("Secure the Wastes", ""));
+ cubeCards.add(new CardIdentity("Seeker of the Way", ""));
+ cubeCards.add(new CardIdentity("Seething Song", ""));
+ cubeCards.add(new CardIdentity("Selesnya Signet", ""));
+ cubeCards.add(new CardIdentity("Sensei's Divining Top", ""));
+ cubeCards.add(new CardIdentity("Shadowmage Infiltrator", ""));
+ cubeCards.add(new CardIdentity("Shallow Grave", ""));
+ cubeCards.add(new CardIdentity("Shardless Agent", ""));
+ cubeCards.add(new CardIdentity("Shelldock Isle", ""));
+ cubeCards.add(new CardIdentity("Sheoldred, Whispering One", ""));
+ cubeCards.add(new CardIdentity("Shivan Reef", ""));
+ cubeCards.add(new CardIdentity("Show and Tell", ""));
+ cubeCards.add(new CardIdentity("Shriekmaw", ""));
+ cubeCards.add(new CardIdentity("Shrine of Burning Rage", ""));
+ cubeCards.add(new CardIdentity("Sidisi, Undead Vizier", ""));
+ cubeCards.add(new CardIdentity("Siege Rhino", ""));
+ cubeCards.add(new CardIdentity("Siege-Gang Commander", ""));
+ cubeCards.add(new CardIdentity("Silverblade Paladin", ""));
+ cubeCards.add(new CardIdentity("Simic Signet", ""));
+ cubeCards.add(new CardIdentity("Sin Collector", ""));
+ cubeCards.add(new CardIdentity("Skinrender", ""));
+ cubeCards.add(new CardIdentity("Skullclamp", ""));
+ cubeCards.add(new CardIdentity("Smash to Smithereens", ""));
+ cubeCards.add(new CardIdentity("Smokestack", ""));
+ cubeCards.add(new CardIdentity("Snapcaster Mage", ""));
+ cubeCards.add(new CardIdentity("Sneak Attack", ""));
+ cubeCards.add(new CardIdentity("Sol Ring", ""));
+ cubeCards.add(new CardIdentity("Soldier of the Pantheon", ""));
+ cubeCards.add(new CardIdentity("Solemn Simulacrum", ""));
+ cubeCards.add(new CardIdentity("Song of the Dryads", ""));
+ cubeCards.add(new CardIdentity("Sorin, Lord of Innistrad", ""));
+ cubeCards.add(new CardIdentity("Soulfire Grand Master", ""));
+ cubeCards.add(new CardIdentity("Sower of Temptation", ""));
+ cubeCards.add(new CardIdentity("Spear of Heliod", ""));
+ cubeCards.add(new CardIdentity("Spectral Procession", ""));
+ cubeCards.add(new CardIdentity("Spell Pierce", ""));
+ cubeCards.add(new CardIdentity("Spellskite", ""));
+ cubeCards.add(new CardIdentity("Sphinx of the Steel Wind", ""));
+ cubeCards.add(new CardIdentity("Sphinx's Revelation", ""));
+ cubeCards.add(new CardIdentity("Spirit of the Labyrinth", ""));
+ cubeCards.add(new CardIdentity("Splinter Twin", ""));
+ cubeCards.add(new CardIdentity("Staff of Domination", ""));
+ cubeCards.add(new CardIdentity("Steam Vents", ""));
+ cubeCards.add(new CardIdentity("Stomping Ground", ""));
+ cubeCards.add(new CardIdentity("Stoneforge Mystic", ""));
+ cubeCards.add(new CardIdentity("Stormbreath Dragon", ""));
+ cubeCards.add(new CardIdentity("Strip Mine", ""));
+ cubeCards.add(new CardIdentity("Stromkirk Noble", ""));
+ cubeCards.add(new CardIdentity("Student of Warfare", ""));
+ cubeCards.add(new CardIdentity("Stunted Growth", ""));
+ cubeCards.add(new CardIdentity("Sulfur Falls", ""));
+ cubeCards.add(new CardIdentity("Sulfuric Vortex", ""));
+ cubeCards.add(new CardIdentity("Sulfurous Springs", ""));
+ cubeCards.add(new CardIdentity("Sun Titan", ""));
+ cubeCards.add(new CardIdentity("Sundering Titan", ""));
+ cubeCards.add(new CardIdentity("Sunpetal Grove", ""));
+ cubeCards.add(new CardIdentity("Supreme Verdict", ""));
+ cubeCards.add(new CardIdentity("Survival of the Fittest", ""));
+ cubeCards.add(new CardIdentity("Sword of Body and Mind", ""));
+ cubeCards.add(new CardIdentity("Sword of Feast and Famine", ""));
+ cubeCards.add(new CardIdentity("Sword of Fire and Ice", ""));
+ cubeCards.add(new CardIdentity("Sword of Light and Shadow", ""));
+ cubeCards.add(new CardIdentity("Sword of War and Peace", ""));
+ cubeCards.add(new CardIdentity("Swords to Plowshares", ""));
+ cubeCards.add(new CardIdentity("Sylvan Caryatid", ""));
+ cubeCards.add(new CardIdentity("Sylvan Library", ""));
+ cubeCards.add(new CardIdentity("Taiga", ""));
+ cubeCards.add(new CardIdentity("Tamiyo, the Moon Sage", ""));
+ cubeCards.add(new CardIdentity("Tangle Wire", ""));
+ cubeCards.add(new CardIdentity("Tarmogoyf", ""));
+ cubeCards.add(new CardIdentity("Tasigur, the Golden Fang", ""));
+ cubeCards.add(new CardIdentity("Temple Garden", ""));
+ cubeCards.add(new CardIdentity("Tendrils of Agony", ""));
+ cubeCards.add(new CardIdentity("Terastodon", ""));
+ cubeCards.add(new CardIdentity("Terminate", ""));
+ cubeCards.add(new CardIdentity("Tezzeret the Seeker", ""));
+ cubeCards.add(new CardIdentity("Tezzeret, Agent of Bolas", ""));
+ cubeCards.add(new CardIdentity("Thada Adel, Acquisitor", ""));
+ cubeCards.add(new CardIdentity("Thalia, Guardian of Thraben", ""));
+ cubeCards.add(new CardIdentity("The Abyss", ""));
+ cubeCards.add(new CardIdentity("Thirst for Knowledge", ""));
+ cubeCards.add(new CardIdentity("Thoughtseize", ""));
+ cubeCards.add(new CardIdentity("Thragtusk", ""));
+ cubeCards.add(new CardIdentity("Thran Dynamo", ""));
+ cubeCards.add(new CardIdentity("Through the Breach", ""));
+ cubeCards.add(new CardIdentity("Thrun, the Last Troll", ""));
+ cubeCards.add(new CardIdentity("Thundermaw Hellkite", ""));
+ cubeCards.add(new CardIdentity("Tidehollow Sculler", ""));
+ cubeCards.add(new CardIdentity("Time Spiral", ""));
+ cubeCards.add(new CardIdentity("Time Walk", ""));
+ cubeCards.add(new CardIdentity("Timetwister", ""));
+ cubeCards.add(new CardIdentity("Tinker", ""));
+ cubeCards.add(new CardIdentity("Tolarian Academy", ""));
+ cubeCards.add(new CardIdentity("Tombstalker", ""));
+ cubeCards.add(new CardIdentity("Tooth and Nail", ""));
+ cubeCards.add(new CardIdentity("Torch Fiend", ""));
+ cubeCards.add(new CardIdentity("Treachery", ""));
+ cubeCards.add(new CardIdentity("Treasure Cruise", ""));
+ cubeCards.add(new CardIdentity("Treetop Village", ""));
+ cubeCards.add(new CardIdentity("Trinket Mage", ""));
+ cubeCards.add(new CardIdentity("Troll Ascetic", ""));
+ cubeCards.add(new CardIdentity("Tropical Island", ""));
+ cubeCards.add(new CardIdentity("True-Name Nemesis", ""));
+ cubeCards.add(new CardIdentity("Trygon Predator", ""));
+ cubeCards.add(new CardIdentity("Tundra", ""));
+ cubeCards.add(new CardIdentity("Turnabout", ""));
+ cubeCards.add(new CardIdentity("Ugin, the Spirit Dragon", ""));
+ cubeCards.add(new CardIdentity("Ulamog, the Infinite Gyre", ""));
+ cubeCards.add(new CardIdentity("Ultimate Price", ""));
+ cubeCards.add(new CardIdentity("Umezawa's Jitte", ""));
+ cubeCards.add(new CardIdentity("Unburial Rites", ""));
+ cubeCards.add(new CardIdentity("Underground River", ""));
+ cubeCards.add(new CardIdentity("Underground Sea", ""));
+ cubeCards.add(new CardIdentity("Unexpectedly Absent", ""));
+ cubeCards.add(new CardIdentity("Upheaval", ""));
+ cubeCards.add(new CardIdentity("Urborg, Tomb of Yawgmoth", ""));
+ cubeCards.add(new CardIdentity("Utter End", ""));
+ cubeCards.add(new CardIdentity("Vampire Nighthawk", ""));
+ cubeCards.add(new CardIdentity("Vampiric Tutor", ""));
+ cubeCards.add(new CardIdentity("Vedalken Shackles", ""));
+ cubeCards.add(new CardIdentity("Vendilion Clique", ""));
+ cubeCards.add(new CardIdentity("Vengevine", ""));
+ cubeCards.add(new CardIdentity("Venser, Shaper Savant", ""));
+ cubeCards.add(new CardIdentity("Venser, the Sojourner", ""));
+ cubeCards.add(new CardIdentity("Verdant Catacombs", ""));
+ cubeCards.add(new CardIdentity("Villainous Wealth", ""));
+ cubeCards.add(new CardIdentity("Vindicate", ""));
+ cubeCards.add(new CardIdentity("Voice of Resurgence", ""));
+ cubeCards.add(new CardIdentity("Volcanic Island", ""));
+ cubeCards.add(new CardIdentity("Volrath's Stronghold", ""));
+ cubeCards.add(new CardIdentity("Wall of Blossoms", ""));
+ cubeCards.add(new CardIdentity("Wall of Omens", ""));
+ cubeCards.add(new CardIdentity("Wall of Roots", ""));
+ cubeCards.add(new CardIdentity("War Priest of Thune", ""));
+ cubeCards.add(new CardIdentity("Wasteland", ""));
+ cubeCards.add(new CardIdentity("Watery Grave", ""));
+ cubeCards.add(new CardIdentity("Weathered Wayfarer", ""));
+ cubeCards.add(new CardIdentity("Wheel of Fortune", ""));
+ cubeCards.add(new CardIdentity("Whisperwood Elemental", ""));
+ cubeCards.add(new CardIdentity("Wildfire", ""));
+ cubeCards.add(new CardIdentity("Windswept Heath", ""));
+ cubeCards.add(new CardIdentity("Winter Orb", ""));
+ cubeCards.add(new CardIdentity("Wolfir Silverheart", ""));
+ cubeCards.add(new CardIdentity("Wooded Foothills", ""));
+ cubeCards.add(new CardIdentity("Woodfall Primus", ""));
+ cubeCards.add(new CardIdentity("Woodland Cemetery", ""));
+ cubeCards.add(new CardIdentity("Worn Powerstone", ""));
+ cubeCards.add(new CardIdentity("Wrath of God", ""));
+ cubeCards.add(new CardIdentity("Wurmcoil Engine", ""));
+ cubeCards.add(new CardIdentity("Xenagos, the Reveler", ""));
+ cubeCards.add(new CardIdentity("Yavimaya Coast", ""));
+ cubeCards.add(new CardIdentity("Yavimaya Elder", ""));
+ cubeCards.add(new CardIdentity("Yawgmoth's Bargain", ""));
+ cubeCards.add(new CardIdentity("Yawgmoth's Will", ""));
+ cubeCards.add(new CardIdentity("Young Pyromancer", ""));
+ cubeCards.add(new CardIdentity("Zealous Conscripts", ""));
+ cubeCards.add(new CardIdentity("Zuran Orb", ""));
+ cubeCards.add(new CardIdentity("Zurgo Bellstriker", ""));
+ }
+}
diff --git a/Mage.Server/config/config.xml b/Mage.Server/config/config.xml
index ec01eac5b8..e794554230 100644
--- a/Mage.Server/config/config.xml
+++ b/Mage.Server/config/config.xml
@@ -41,14 +41,14 @@
<!--<playerType name="Computer - minimax" jar="mage-player-aiminimax.jar" className="mage.player.ai.ComputerPlayer3"/>-->
<playerType name="Computer - mad" jar="mage-player-ai-ma.jar" className="mage.player.ai.ComputerPlayer7"/>
<!--<playerType name="Computer - monte carlo" jar="mage-player-aimcts.jar" className="mage.player.ai.ComputerPlayerMCTS"/>-->
- <playerType name="Computer - draftbot" jar="mage-player-ai-draft-bot.jar" className="mage.player.ai.ComputerDraftPlayer"/>
+ <playerType name="Computer - draftbot" jar="mage-player-ai-draft-bot.jar" className="mage.player.ai.ComputerDraftPlayer"/>
</playerTypes>
<gameTypes>
<gameType name="Two Player Duel" jar="mage-game-twoplayerduel.jar" className="mage.game.TwoPlayerMatch" typeName="mage.game.TwoPlayerDuelType"/>
<gameType name="Free For All" jar="mage-game-freeforall.jar" className="mage.game.FreeForAllMatch" typeName="mage.game.FreeForAllType"/>
<gameType name="Commander Two Player Duel" jar="mage-game-commanderduel.jar" className="mage.game.CommanderDuelMatch" typeName="mage.game.CommanderDuelType"/>
<gameType name="Commander Free For All" jar="mage-game-commanderfreeforall.jar" className="mage.game.CommanderFreeForAllMatch" typeName="mage.game.CommanderFreeForAllType"/>
- <gameType name="Tiny Leaders Two Player Duel" jar="mage-game-tinyleadersduel.jar" className="mage.game.TinyLeadersDuelMatch" typeName="mage.game.TinyLeadersDuelType"/>
+ <gameType name="Tiny Leaders Two Player Duel" jar="mage-game-tinyleadersduel.jar" className="mage.game.TinyLeadersDuelMatch" typeName="mage.game.TinyLeadersDuelType"/>
</gameTypes>
<tournamentTypes>
<tournamentType name="Constructed Elimination" jar="mage-tournament-constructed.jar" className="mage.tournament.ConstructedEliminationTournament" typeName="mage.tournament.ConstructedEliminationTournamentType"/>
@@ -70,6 +70,7 @@
<draftCube name="MTGO Cube March 2014" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.MTGOMarchCube2014"/>
<draftCube name="MTGO Holiday Cube 2013" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.HolidayCube2013"/>
<draftCube name="MTGO Holiday Cube 2014" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.HolidayCube2014"/>
+ <draftCube name="MTGO Holiday Cube 2015" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.HolidayCube2015"/>
<draftCube name="MTGO Legacy Cube (600 cards)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.MTGOLegacyCube"/>
<draftCube name="MTGO Legacy Cube 2015 (600 cards)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.MTGOLegacyCube2015"/>
<draftCube name="The Peasant's Toolbox (800 cards)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.PeasantsToolboxCube"/>
@@ -82,6 +83,9 @@
<deckType name="Constructed - Vintage" jar="mage-deck-constructed.jar" className="mage.deck.Vintage"/>
<deckType name="Constructed - Legacy" jar="mage-deck-constructed.jar" className="mage.deck.Legacy"/>
<deckType name="Constructed - Pauper" jar="mage-deck-constructed.jar" className="mage.deck.Pauper"/>
+ <deckType name="Variant Magic - Commander" jar="mage-deck-constructed.jar" className="mage.deck.Commander"/>
+ <deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed.jar" className="mage.deck.DuelCommander"/>
+ <deckType name="Variant Magic - Tiny Leaders" jar="mage-deck-constructed.jar" className="mage.deck.TinyLeaders"/>
<deckType name="Block Constructed - Innistrad" jar="mage-deck-constructed.jar" className="mage.deck.InnistradBlock"/>
<deckType name="Block Constructed - Kamigawa" jar="mage-deck-constructed.jar" className="mage.deck.KamigawaBlock"/>
<deckType name="Block Constructed - Khans of Tarkir" jar="mage-deck-constructed.jar" className="mage.deck.KhansOfTarkirBlock"/>
@@ -91,9 +95,6 @@
<deckType name="Block Constructed - Shards of Alara" jar="mage-deck-constructed.jar" className="mage.deck.ShardsOfAlaraBlock"/>
<deckType name="Block Constructed - Theros" jar="mage-deck-constructed.jar" className="mage.deck.TherosBlock"/>
<deckType name="Block Constructed - Zendikar" jar="mage-deck-constructed.jar" className="mage.deck.ZendikarBlock"/>
- <deckType name="Variant Magic - Commander" jar="mage-deck-constructed.jar" className="mage.deck.Commander"/>
- <deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed.jar" className="mage.deck.DuelCommander"/>
- <deckType name="Variant Magic - Tiny Leaders" jar="mage-deck-constructed.jar" className="mage.deck.TinyLeaders"/>
<deckType name="Limited" jar="mage-deck-limited.jar" className="mage.deck.Limited"/>
</deckTypes>
</config>
diff --git a/Mage.Server/release/config/config.xml b/Mage.Server/release/config/config.xml
index 6e34884d6c..ad1e56d316 100644
--- a/Mage.Server/release/config/config.xml
+++ b/Mage.Server/release/config/config.xml
@@ -27,7 +27,7 @@
<gameType name="Free For All" jar="mage-game-freeforall-${project.version}.jar" className="mage.game.FreeForAllMatch" typeName="mage.game.FreeForAllType"/>
<gameType name="Commander Two Player Duel" jar="mage-game-commanderduel-${project.version}.jar" className="mage.game.CommanderDuelMatch" typeName="mage.game.CommanderDuelType"/>
<gameType name="Commander Free For All" jar="mage-game-commanderfreeforall-${project.version}.jar" className="mage.game.CommanderFreeForAllMatch" typeName="mage.game.CommanderFreeForAllType"/>
- <gameType name="Tiny Leaders Two Player Duel" jar="mage-game-tinyleadersduel-${project.version}.jar" className="mage.game.TinyLeadersDuelMatch" typeName="mage.game.TinyLeadersDuelType"/>
+ <gameType name="Tiny Leaders Two Player Duel" jar="mage-game-tinyleadersduel-${project.version}.jar" className="mage.game.TinyLeadersDuelMatch" typeName="mage.game.TinyLeadersDuelType"/>
</gameTypes>
<tournamentTypes>
<tournamentType name="Constructed Elimination" jar="mage-tournament-constructed-${project.version}.jar" className="mage.tournament.ConstructedEliminationTournament" typeName="mage.tournament.ConstructedEliminationTournamentType"/>
@@ -48,6 +48,7 @@
<draftCube name="Mono Blue Cube" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.MonoBlueCube"/>
<draftCube name="MTGO Holiday Cube 2013" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.HolidayCube2013"/>
<draftCube name="MTGO Holiday Cube 2014" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.HolidayCube2014"/>
+ <draftCube name="MTGO Holiday Cube 2015" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.HolidayCube2015"/>
<draftCube name="MTGO Cube March 2014" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.MTGOMarchCube2014"/>
<draftCube name="MTGO Legacy Cube (600 cards)" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.MTGOLegacyCube"/>
<draftCube name="MTGO Legacy Cube 2015 (600 cards)" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.MTGOLegacyCube2015"/>
@@ -61,6 +62,9 @@
<deckType name="Constructed - Vintage" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Vintage"/>
<deckType name="Constructed - Legacy" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Legacy"/>
<deckType name="Constructed - Pauper" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Pauper"/>
+ <deckType name="Variant Magic - Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Commander"/>
+ <deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.DuelCommander"/>
+ <deckType name="Variant Magic - Tiny Leaders" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.TinyLeaders"/>
<deckType name="Block Constructed - Innistrad" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.InnistradBlock"/>
<deckType name="Block Constructed - Kamigawa" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.KamigawaBlock"/>
<deckType name="Block Constructed - Khans of Tarkir" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.KhansOfTarkirBlock"/>
@@ -70,9 +74,6 @@
<deckType name="Block Constructed - Shards of Alara" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.ShardsOfAlaraBlock"/>
<deckType name="Block Constructed - Theros" jar="mage-deck-constructed.jar" className="mage.deck.TherosBlock"/>
<deckType name="Block Constructed - Zendikar" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.ZendikarBlock"/>
- <deckType name="Variant Magic - Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Commander"/>
- <deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.DuelCommander"/>
- <deckType name="Variant Magic - Tiny Leaders" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.TinyLeaders"/>
<deckType name="Limited" jar="mage-deck-limited-${project.version}.jar" className="mage.deck.Limited"/>
</deckTypes>
</config>
diff --git a/Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java b/Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
index 0b43412b38..cafa72133a 100644
--- a/Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
+++ b/Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
@@ -255,7 +255,6 @@ public class GameSessionPlayer extends GameSessionWatcher {
list.add(new LookedAtView(entry.getKey(), entry.getValue(), game));
}
gameView.setLookedAt(list);
- game.getState().clearLookedAt(playerId);
return gameView;
}
diff --git a/Mage.Sets/src/mage/sets/ClashPack.java b/Mage.Sets/src/mage/sets/ClashPack.java
new file mode 100644
index 0000000000..88c39d8b8e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/ClashPack.java
@@ -0,0 +1,50 @@
+/*
+* 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.sets;
+
+import java.util.GregorianCalendar;
+import mage.cards.ExpansionSet;
+import mage.constants.SetType;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class ClashPack extends ExpansionSet {
+ private static final ClashPack fINSTANCE = new ClashPack();
+
+ public static ClashPack getInstance() {
+ return fINSTANCE;
+ }
+
+ private ClashPack() {
+ super("Clash Pack", "CLASH", "mage.sets.clashpack", new GregorianCalendar(2014, 7, 18).getTime(), SetType.SUPPLEMENTAL);
+ this.hasBasicLands = false;
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/alarareborn/SenTriplets.java b/Mage.Sets/src/mage/sets/alarareborn/SenTriplets.java
new file mode 100644
index 0000000000..394d3170ca
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alarareborn/SenTriplets.java
@@ -0,0 +1,191 @@
+/*
+ * 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.sets.alarareborn;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.effects.AsThoughEffectImpl;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.constants.AsThoughEffectType;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Layer;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.SubLayer;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.players.Player;
+import mage.target.common.TargetOpponent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class SenTriplets extends CardImpl {
+
+ public SenTriplets(UUID ownerId) {
+ super(ownerId, 109, "Sen Triplets", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}{W}{U}{B}");
+ this.expansionSetCode = "ARB";
+ this.supertype.add("Legendary");
+ this.subtype.add("Human");
+ this.subtype.add("Wizard");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(3);
+
+ // At the beginning of your upkeep, choose target opponent.
+ // This turn, that player can't cast spells or activate abilities and plays with his or her hand revealed.
+ // You may play cards from that player's hand this turn.
+ Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SenTripletsRuleModifyingEffect(), TargetController.YOU, false, false);
+ ability.addEffect(new SenTripletsOpponentRevealsHandEffect());
+ ability.addEffect(new SenTripletsPlayFromOpponentsHandEffect());
+ ability.addTarget(new TargetOpponent());
+ this.addAbility(ability);
+ }
+
+ public SenTriplets(final SenTriplets card) {
+ super(card);
+ }
+
+ @Override
+ public SenTriplets copy() {
+ return new SenTriplets(this);
+ }
+}
+
+class SenTripletsRuleModifyingEffect extends ContinuousRuleModifyingEffectImpl {
+
+ public SenTripletsRuleModifyingEffect() {
+ super(Duration.EndOfTurn, Outcome.Benefit);
+ staticText = "At the beginning of your upkeep, choose target opponent. This turn, that player can't cast spells or activate abilities";
+ }
+
+ public SenTripletsRuleModifyingEffect(final SenTripletsRuleModifyingEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public SenTripletsRuleModifyingEffect copy() {
+ return new SenTripletsRuleModifyingEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ return true;
+ }
+
+ @Override
+ public String getInfoMessage(Ability source, GameEvent event, Game game) {
+ Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source));
+ MageObject mageObject = game.getObject(source.getSourceId());
+ if (targetPlayer != null && mageObject != null) {
+ return "This turn you can't cast spells or activate abilities" +
+ " (" + mageObject.getLogName() + ")";
+ }
+ return null;
+ }
+
+ @Override
+ public boolean checksEventType(GameEvent event, Game game) {
+ return event.getType() == GameEvent.EventType.CAST_SPELL || event.getType() == GameEvent.EventType.ACTIVATE_ABILITY;
+ }
+
+ @Override
+ public boolean applies(GameEvent event, Ability source, Game game) {
+ return event.getPlayerId().equals(getTargetPointer().getFirst(game, source));
+ }
+}
+
+class SenTripletsOpponentRevealsHandEffect extends ContinuousEffectImpl {
+
+ public SenTripletsOpponentRevealsHandEffect() {
+ super(Duration.EndOfTurn, Layer.PlayerEffects, SubLayer.NA, Outcome.Detriment);
+ staticText = "and plays with his or her hand revealed";
+ }
+
+ public SenTripletsOpponentRevealsHandEffect(final SenTripletsOpponentRevealsHandEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Player player = game.getPlayer(getTargetPointer().getFirst(game, source));
+ if (player != null) {
+ player.revealCards(player.getName() + "'s hand cards", player.getHand(), game, false);
+ }
+ return true;
+ }
+
+ @Override
+ public SenTripletsOpponentRevealsHandEffect copy() {
+ return new SenTripletsOpponentRevealsHandEffect(this);
+ }
+}
+
+class SenTripletsPlayFromOpponentsHandEffect extends AsThoughEffectImpl {
+
+
+ public SenTripletsPlayFromOpponentsHandEffect() {
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+ staticText = "You may play cards from that player's hand this turn";
+ }
+
+ public SenTripletsPlayFromOpponentsHandEffect(final SenTripletsPlayFromOpponentsHandEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ return true;
+ }
+
+ @Override
+ public SenTripletsPlayFromOpponentsHandEffect copy() {
+ return new SenTripletsPlayFromOpponentsHandEffect(this);
+ }
+
+ @Override
+ public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
+ Card card = game.getCard(objectId);
+ return card != null &&
+ card.getOwnerId().equals(getTargetPointer().getFirst(game, source)) &&
+ game.getState().getZone(objectId).equals(Zone.HAND) &&
+ affectedControllerId.equals(source.getControllerId());
+ }
+
+}
+
+
diff --git a/Mage.Sets/src/mage/sets/alliances/ArcaneDenial.java b/Mage.Sets/src/mage/sets/alliances/ArcaneDenial1.java
similarity index 86%
rename from Mage.Sets/src/mage/sets/alliances/ArcaneDenial.java
rename to Mage.Sets/src/mage/sets/alliances/ArcaneDenial1.java
index 21f5df01eb..483888568c 100644
--- a/Mage.Sets/src/mage/sets/alliances/ArcaneDenial.java
+++ b/Mage.Sets/src/mage/sets/alliances/ArcaneDenial1.java
@@ -33,20 +33,20 @@ import java.util.UUID;
*
* @author LevelX2
*/
-public class ArcaneDenial extends mage.sets.commander2013.ArcaneDenial {
+public class ArcaneDenial1 extends mage.sets.commander2013.ArcaneDenial {
- public ArcaneDenial(UUID ownerId) {
+ public ArcaneDenial1(UUID ownerId) {
super(ownerId);
this.cardNumber = 32;
this.expansionSetCode = "ALL";
}
- public ArcaneDenial(final ArcaneDenial card) {
+ public ArcaneDenial1(final ArcaneDenial1 card) {
super(card);
}
@Override
- public ArcaneDenial copy() {
- return new ArcaneDenial(this);
+ public ArcaneDenial1 copy() {
+ return new ArcaneDenial1(this);
}
}
diff --git a/Mage.Sets/src/mage/sets/alliances/StormCrow.java b/Mage.Sets/src/mage/sets/alliances/ArcaneDenial2.java
similarity index 85%
rename from Mage.Sets/src/mage/sets/alliances/StormCrow.java
rename to Mage.Sets/src/mage/sets/alliances/ArcaneDenial2.java
index fc0f90d598..ac89fc3c15 100644
--- a/Mage.Sets/src/mage/sets/alliances/StormCrow.java
+++ b/Mage.Sets/src/mage/sets/alliances/ArcaneDenial2.java
@@ -33,20 +33,20 @@ import java.util.UUID;
*
* @author LevelX2
*/
-public class StormCrow extends mage.sets.ninthedition.StormCrow {
+public class ArcaneDenial2 extends mage.sets.commander2013.ArcaneDenial {
- public StormCrow(UUID ownerId) {
+ public ArcaneDenial2(UUID ownerId) {
super(ownerId);
- this.cardNumber = 54;
+ this.cardNumber = 33;
this.expansionSetCode = "ALL";
}
- public StormCrow(final StormCrow card) {
+ public ArcaneDenial2(final ArcaneDenial2 card) {
super(card);
}
@Override
- public StormCrow copy() {
- return new StormCrow(this);
+ public ArcaneDenial2 copy() {
+ return new ArcaneDenial2(this);
}
}
diff --git a/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java b/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java
index 4fea6246ce..8b66591b48 100644
--- a/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java
+++ b/Mage.Sets/src/mage/sets/alliances/ElvishRanger1.java
@@ -37,15 +37,12 @@ import mage.constants.Rarity;
*
* @author Backfir3
*/
-public class ElvishRanger1 extends CardImpl {
+public class ElvishRanger1 extends mage.sets.portal.ElvishRanger {
public ElvishRanger1(UUID ownerId) {
- super(ownerId, 67, "Elvish Ranger", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}");
+ super(ownerId);
+ this.cardNumber = 67;
this.expansionSetCode = "ALL";
- this.subtype.add("Elf");
-
- this.power = new MageInt(4);
- this.toughness = new MageInt(1);
}
public ElvishRanger1(final ElvishRanger1 card) {
diff --git a/Mage.Sets/src/mage/sets/alliances/ElvishRanger2.java b/Mage.Sets/src/mage/sets/alliances/ElvishRanger2.java
index c41a416127..9aa1ebd775 100644
--- a/Mage.Sets/src/mage/sets/alliances/ElvishRanger2.java
+++ b/Mage.Sets/src/mage/sets/alliances/ElvishRanger2.java
@@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author Backfir3
*/
-public class ElvishRanger2 extends mage.sets.alliances.ElvishRanger1 {
+public class ElvishRanger2 extends mage.sets.portal.ElvishRanger {
public ElvishRanger2(UUID ownerId) {
super(ownerId);
diff --git a/Mage.Sets/src/mage/sets/alliances/DeadlyInsect.java b/Mage.Sets/src/mage/sets/alliances/FalseDemise1.java
similarity index 83%
rename from Mage.Sets/src/mage/sets/alliances/DeadlyInsect.java
rename to Mage.Sets/src/mage/sets/alliances/FalseDemise1.java
index a78b52a38e..980d5b7005 100644
--- a/Mage.Sets/src/mage/sets/alliances/DeadlyInsect.java
+++ b/Mage.Sets/src/mage/sets/alliances/FalseDemise1.java
@@ -1,52 +1,55 @@
-/*
- * 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.sets.alliances;
-
-import java.util.UUID;
-
-/**
- *
- * @author LevelX2
- */
-public class DeadlyInsect extends mage.sets.mercadianmasques.DeadlyInsect {
-
- public DeadlyInsect(UUID ownerId) {
- super(ownerId);
- this.cardNumber = 64;
- this.expansionSetCode = "ALL";
- }
-
- public DeadlyInsect(final DeadlyInsect card) {
- super(card);
- }
-
- @Override
- public DeadlyInsect copy() {
- return new DeadlyInsect(this);
- }
-}
+/*
+ * 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.sets.alliances;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class FalseDemise1 extends mage.sets.mercadianmasques.FalseDemise {
+
+ public FalseDemise1(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 40;
+ this.expansionSetCode = "ALL";
+ this.rarity = Rarity.COMMON;
+ }
+
+ public FalseDemise1(final FalseDemise1 card) {
+ super(card);
+ }
+
+ @Override
+ public FalseDemise1 copy() {
+ return new FalseDemise1(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/alliances/FalseDemise2.java b/Mage.Sets/src/mage/sets/alliances/FalseDemise2.java
new file mode 100644
index 0000000000..614a15ca4d
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alliances/FalseDemise2.java
@@ -0,0 +1,55 @@
+/*
+ * 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.sets.alliances;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class FalseDemise2 extends mage.sets.mercadianmasques.FalseDemise {
+
+ public FalseDemise2(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 41;
+ this.expansionSetCode = "ALL";
+ this.rarity = Rarity.COMMON;
+ }
+
+ public FalseDemise2(final FalseDemise2 card) {
+ super(card);
+ }
+
+ @Override
+ public FalseDemise2 copy() {
+ return new FalseDemise2(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/alliances/GorillaChieftain.java b/Mage.Sets/src/mage/sets/alliances/GorillaChieftain1.java
similarity index 87%
rename from Mage.Sets/src/mage/sets/alliances/GorillaChieftain.java
rename to Mage.Sets/src/mage/sets/alliances/GorillaChieftain1.java
index 158ab6df2a..487d2863c4 100644
--- a/Mage.Sets/src/mage/sets/alliances/GorillaChieftain.java
+++ b/Mage.Sets/src/mage/sets/alliances/GorillaChieftain1.java
@@ -33,20 +33,20 @@ import java.util.UUID;
*
* @author Quercitron
*/
-public class GorillaChieftain extends mage.sets.seventhedition.GorillaChieftain {
+public class GorillaChieftain1 extends mage.sets.seventhedition.GorillaChieftain {
- public GorillaChieftain(UUID ownerId) {
+ public GorillaChieftain1(UUID ownerId) {
super(ownerId);
this.cardNumber = 77;
this.expansionSetCode = "ALL";
}
- public GorillaChieftain(final GorillaChieftain card) {
+ public GorillaChieftain1(final GorillaChieftain1 card) {
super(card);
}
@Override
- public GorillaChieftain copy() {
- return new GorillaChieftain(this);
+ public GorillaChieftain1 copy() {
+ return new GorillaChieftain1(this);
}
}
diff --git a/Mage.Sets/src/mage/sets/alliances/ElvishRanger.java b/Mage.Sets/src/mage/sets/alliances/GorillaChieftain2.java
similarity index 85%
rename from Mage.Sets/src/mage/sets/alliances/ElvishRanger.java
rename to Mage.Sets/src/mage/sets/alliances/GorillaChieftain2.java
index ac3c61195d..facc87d9df 100644
--- a/Mage.Sets/src/mage/sets/alliances/ElvishRanger.java
+++ b/Mage.Sets/src/mage/sets/alliances/GorillaChieftain2.java
@@ -31,22 +31,22 @@ import java.util.UUID;
/**
*
- * @author Plopman
+ * @author Quercitron
*/
-public class ElvishRanger extends mage.sets.portal.ElvishRanger {
+public class GorillaChieftain2 extends mage.sets.seventhedition.GorillaChieftain {
- public ElvishRanger(UUID ownerId) {
+ public GorillaChieftain2(UUID ownerId) {
super(ownerId);
- this.cardNumber = 67;
+ this.cardNumber = 78;
this.expansionSetCode = "ALL";
}
- public ElvishRanger(final ElvishRanger card) {
+ public GorillaChieftain2(final GorillaChieftain2 card) {
super(card);
}
@Override
- public ElvishRanger copy() {
- return new ElvishRanger(this);
+ public GorillaChieftain2 copy() {
+ return new GorillaChieftain2(this);
}
}
diff --git a/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics.java b/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics1.java
similarity index 86%
rename from Mage.Sets/src/mage/sets/alliances/GuerrillaTactics.java
rename to Mage.Sets/src/mage/sets/alliances/GuerrillaTactics1.java
index f09c089f24..c887643a77 100644
--- a/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics.java
+++ b/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics1.java
@@ -1,54 +1,54 @@
-/*
- * 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.sets.alliances;
-
+/*
+ * 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.sets.alliances;
+
import java.util.UUID;
-import mage.constants.Rarity;
-
-/**
- *
- * @author dustinconrad
- */
-public class GuerrillaTactics extends mage.sets.ninthedition.GuerrillaTactics {
-
- public GuerrillaTactics(UUID ownerId) {
- super(ownerId);
- this.cardNumber = 110;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author dustinconrad
+ */
+public class GuerrillaTactics1 extends mage.sets.ninthedition.GuerrillaTactics {
+
+ public GuerrillaTactics1(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 110;
this.expansionSetCode = "ALL";
- this.rarity = Rarity.COMMON;
- }
-
- public GuerrillaTactics(final GuerrillaTactics card) {
- super(card);
- }
-
- @Override
- public GuerrillaTactics copy() {
- return new GuerrillaTactics(this);
- }
-}
+ this.rarity = Rarity.COMMON;
+ }
+
+ public GuerrillaTactics1(final GuerrillaTactics1 card) {
+ super(card);
+ }
+
+ @Override
+ public GuerrillaTactics1 copy() {
+ return new GuerrillaTactics1(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics2.java b/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics2.java
new file mode 100644
index 0000000000..c8590db5f2
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alliances/GuerrillaTactics2.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.alliances;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author dustinconrad
+ */
+public class GuerrillaTactics2 extends mage.sets.ninthedition.GuerrillaTactics {
+
+ public GuerrillaTactics2(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 111;
+ this.expansionSetCode = "ALL";
+ this.rarity = Rarity.COMMON;
+ }
+
+ public GuerrillaTactics2(final GuerrillaTactics2 card) {
+ super(card);
+ }
+
+ @Override
+ public GuerrillaTactics2 copy() {
+ return new GuerrillaTactics2(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/alliances/Reprisal.java b/Mage.Sets/src/mage/sets/alliances/Reprisal1.java
similarity index 90%
rename from Mage.Sets/src/mage/sets/alliances/Reprisal.java
rename to Mage.Sets/src/mage/sets/alliances/Reprisal1.java
index 643407129a..9bc04ed91c 100644
--- a/Mage.Sets/src/mage/sets/alliances/Reprisal.java
+++ b/Mage.Sets/src/mage/sets/alliances/Reprisal1.java
@@ -34,21 +34,21 @@ import mage.constants.Rarity;
*
* @author Quercitron
*/
-public class Reprisal extends mage.sets.seventhedition.Reprisal {
+public class Reprisal1 extends mage.sets.seventhedition.Reprisal {
- public Reprisal(UUID ownerId) {
+ public Reprisal1(UUID ownerId) {
super(ownerId);
this.cardNumber = 144;
this.expansionSetCode = "ALL";
this.rarity = Rarity.COMMON;
}
- public Reprisal(final Reprisal card) {
+ public Reprisal1(final Reprisal1 card) {
super(card);
}
@Override
- public Reprisal copy() {
- return new Reprisal(this);
+ public Reprisal1 copy() {
+ return new Reprisal1(this);
}
}
diff --git a/Mage.Sets/src/mage/sets/alliances/Reprisal2.java b/Mage.Sets/src/mage/sets/alliances/Reprisal2.java
new file mode 100644
index 0000000000..80ac2f0193
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alliances/Reprisal2.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.alliances;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author Quercitron
+ */
+public class Reprisal2 extends mage.sets.seventhedition.Reprisal {
+
+ public Reprisal2(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 145;
+ this.expansionSetCode = "ALL";
+ this.rarity = Rarity.COMMON;
+ }
+
+ public Reprisal2(final Reprisal2 card) {
+ super(card);
+ }
+
+ @Override
+ public Reprisal2 copy() {
+ return new Reprisal2(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/alliances/RoyalHerbalist1.java b/Mage.Sets/src/mage/sets/alliances/RoyalHerbalist1.java
new file mode 100644
index 0000000000..43da9ffc9b
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alliances/RoyalHerbalist1.java
@@ -0,0 +1,71 @@
+/*
+ * 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.sets.alliances;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.ExileFromTopOfLibraryCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class RoyalHerbalist1 extends CardImpl {
+
+ public RoyalHerbalist1(UUID ownerId) {
+ super(ownerId, 147, "Royal Herbalist", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}");
+ this.expansionSetCode = "ALL";
+ this.subtype.add("Human");
+ this.subtype.add("Cleric");
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(1);
+
+ // {2}, Exile the top card of your library: You gain 1 life.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ManaCostsImpl("{2}"));
+ ability.addCost(new ExileFromTopOfLibraryCost(1));
+ this.addAbility(ability);
+ }
+
+ public RoyalHerbalist1(final RoyalHerbalist1 card) {
+ super(card);
+ }
+
+ @Override
+ public RoyalHerbalist1 copy() {
+ return new RoyalHerbalist1(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/alliances/RoyalHerbalist2.java b/Mage.Sets/src/mage/sets/alliances/RoyalHerbalist2.java
new file mode 100644
index 0000000000..df1a431a58
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alliances/RoyalHerbalist2.java
@@ -0,0 +1,56 @@
+/*
+ * 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.sets.alliances;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class RoyalHerbalist2 extends mage.sets.alliances.RoyalHerbalist1 {
+
+ public RoyalHerbalist2(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 148;
+ }
+
+ public RoyalHerbalist2(final RoyalHerbalist2 card) {
+ super(card);
+ }
+
+ @Override
+ public RoyalHerbalist2 copy() {
+ return new RoyalHerbalist2(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/alliances/SeasonedTactician.java b/Mage.Sets/src/mage/sets/alliances/SeasonedTactician.java
new file mode 100644
index 0000000000..bc9ed2cad6
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alliances/SeasonedTactician.java
@@ -0,0 +1,73 @@
+/*
+ * 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.sets.alliances;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.ExileFromTopOfLibraryCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.PreventNextDamageFromChosenSourceToYouEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class SeasonedTactician extends CardImpl {
+
+ public SeasonedTactician(UUID ownerId) {
+ super(ownerId, 150, "Seasoned Tactician", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{W}");
+ this.expansionSetCode = "ALL";
+ this.subtype.add("Human");
+ this.subtype.add("Advisor");
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(3);
+
+ // {3}, Exile the top four cards of your library: The next time a source of your choice would deal damage to you this turn, prevent that damage.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn),
+ new ManaCostsImpl("{3}"));
+ ability.addCost(new ExileFromTopOfLibraryCost(4));
+ this.addAbility(ability);
+ }
+
+ public SeasonedTactician(final SeasonedTactician card) {
+ super(card);
+ }
+
+ @Override
+ public SeasonedTactician copy() {
+ return new SeasonedTactician(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/antiquities/CitanulDruid.java b/Mage.Sets/src/mage/sets/antiquities/CitanulDruid.java
new file mode 100644
index 0000000000..dff9da458e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/antiquities/CitanulDruid.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.sets.antiquities;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SpellCastOpponentTriggeredAbility;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.SetTargetPointer;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.counters.CounterType;
+import mage.filter.common.FilterArtifactSpell;
+import mage.filter.predicate.permanent.ControllerPredicate;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class CitanulDruid extends CardImpl {
+ private static final FilterArtifactSpell filter = new FilterArtifactSpell();
+
+ static {
+ filter.add(new ControllerPredicate(TargetController.OPPONENT));
+ }
+
+
+ public CitanulDruid(UUID ownerId) {
+ super(ownerId, 61, "Citanul Druid", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{G}");
+ this.expansionSetCode = "ATQ";
+ this.subtype.add("Human");
+ this.subtype.add("Druid");
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(1);
+
+ // Whenever an opponent casts an artifact spell, put a +1/+1 counter on Citanul Druid.
+ this.addAbility(new SpellCastOpponentTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filter, false));
+ }
+
+ public CitanulDruid(final CitanulDruid card) {
+ super(card);
+ }
+
+ @Override
+ public CitanulDruid copy() {
+ return new CitanulDruid(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/antiquities/IvoryTower.java b/Mage.Sets/src/mage/sets/antiquities/IvoryTower.java
new file mode 100644
index 0000000000..6f4d25c427
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/antiquities/IvoryTower.java
@@ -0,0 +1,97 @@
+/*
+ * 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.sets.antiquities;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.OnEventTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.game.Game;
+import mage.game.events.GameEvent.EventType;
+import mage.players.Player;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class IvoryTower extends CardImpl {
+
+ public IvoryTower(UUID ownerId) {
+ super(ownerId, 18, "Ivory Tower", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}");
+ this.expansionSetCode = "ATQ";
+
+ this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep",
+ new IvoryTowerEffect(), false));
+ }
+
+ public IvoryTower(final IvoryTower card) {
+ super(card);
+ }
+
+ @Override
+ public IvoryTower copy() {
+ return new IvoryTower(this);
+ }
+}
+
+class IvoryTowerEffect extends OneShotEffect {
+
+ public IvoryTowerEffect() {
+ super(Outcome.GainLife);
+ this.staticText = "you gain X life, where X is the number of cards in your hand minus 4.";
+ }
+
+ public IvoryTowerEffect(IvoryTowerEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Player player = game.getPlayer(source.getControllerId());
+ if(player != null) {
+ int amount = player.getHand().size() - 4;
+ if(amount > 0) {
+ player.gainLife(amount, game);
+ }
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public IvoryTowerEffect copy() {
+ return new IvoryTowerEffect(this);
+ }
+
+}
+
diff --git a/Mage.Sets/src/mage/sets/antiquities/Onulet.java b/Mage.Sets/src/mage/sets/antiquities/Onulet.java
new file mode 100644
index 0000000000..b3a44081d8
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/antiquities/Onulet.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.antiquities;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class Onulet extends mage.sets.mastersedition.Onulet {
+
+ public Onulet(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 24;
+ this.expansionSetCode = "ATQ";
+ this.rarity = Rarity.UNCOMMON;
+ }
+
+ public Onulet(final Onulet card) {
+ super(card);
+ }
+
+ @Override
+ public Onulet copy() {
+ return new Onulet(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/antiquities/StaffOfZegon.java b/Mage.Sets/src/mage/sets/antiquities/StaffOfZegon.java
new file mode 100644
index 0000000000..d2de484bc0
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/antiquities/StaffOfZegon.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.antiquities;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class StaffOfZegon extends mage.sets.masterseditioniv.StaffOfZegon {
+
+ public StaffOfZegon(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 30;
+ this.expansionSetCode = "ATQ";
+ }
+
+ public StaffOfZegon(final StaffOfZegon card) {
+ super(card);
+ }
+
+ @Override
+ public StaffOfZegon copy() {
+ return new StaffOfZegon(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/antiquities/SuChi.java b/Mage.Sets/src/mage/sets/antiquities/SuChi.java
new file mode 100644
index 0000000000..ddcf6367db
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/antiquities/SuChi.java
@@ -0,0 +1,53 @@
+/*
+ * 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.sets.antiquities;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class SuChi extends mage.sets.vintagemasters.SuChi {
+
+ public SuChi(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 31;
+ this.expansionSetCode = "ATQ";
+ }
+
+ public SuChi(final SuChi card) {
+ super(card);
+ }
+
+ @Override
+ public SuChi copy() {
+ return new SuChi(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/apocalypse/UrborgElf.java b/Mage.Sets/src/mage/sets/apocalypse/UrborgElf.java
new file mode 100644
index 0000000000..147e44e996
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/apocalypse/UrborgElf.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.sets.apocalypse;
+
+import java.util.UUID;
+
+import mage.MageInt;
+import mage.abilities.mana.BlackManaAbility;
+import mage.abilities.mana.BlueManaAbility;
+import mage.abilities.mana.GreenManaAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author EvilGeek
+ */
+public class UrborgElf extends CardImpl {
+
+ public UrborgElf(UUID ownerId) {
+ super(ownerId, 90, "Urborg Elf", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}");
+ this.expansionSetCode = "APC";
+ this.subtype.add("Elf");
+ this.subtype.add("Druid");
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(1);
+
+ // {tap}: Add {G}, {U}, or {B} to your mana pool.
+ this.addAbility(new GreenManaAbility());
+ this.addAbility(new BlueManaAbility());
+ this.addAbility(new BlackManaAbility());
+ }
+
+ public UrborgElf(final UrborgElf card) {
+ super(card);
+ }
+
+ @Override
+ public UrborgElf copy() {
+ return new UrborgElf(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/arabiannights/CuombajjWitches.java b/Mage.Sets/src/mage/sets/arabiannights/CuombajjWitches.java
new file mode 100644
index 0000000000..ce19524adc
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/arabiannights/CuombajjWitches.java
@@ -0,0 +1,53 @@
+/*
+ * 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.sets.arabiannights;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class CuombajjWitches extends mage.sets.mastersedition.CuombajjWitches {
+
+ public CuombajjWitches(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 1;
+ this.expansionSetCode = "ARN";
+ }
+
+ public CuombajjWitches(final CuombajjWitches card) {
+ super(card);
+ }
+
+ @Override
+ public CuombajjWitches copy() {
+ return new CuombajjWitches(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MisthollowGriffin.java b/Mage.Sets/src/mage/sets/avacynrestored/MisthollowGriffin.java
index 82b73f9be3..e8cf377ac8 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/MisthollowGriffin.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/MisthollowGriffin.java
@@ -76,7 +76,7 @@ public class MisthollowGriffin extends CardImpl {
class MisthollowGriffinPlayEffect extends AsThoughEffectImpl {
public MisthollowGriffinPlayEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
staticText = "You may cast {this} from exile";
}
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/StolenGoods.java b/Mage.Sets/src/mage/sets/avacynrestored/StolenGoods.java
index 0d1a260fe2..7709f8614f 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/StolenGoods.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/StolenGoods.java
@@ -115,7 +115,7 @@ class StolenGoodsEffect extends OneShotEffect {
class StolenGoodsCastFromExileEffect extends AsThoughEffectImpl {
public StolenGoodsCastFromExileEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
staticText = "You may cast card from exile";
}
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrnateKanzashi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrnateKanzashi.java
index e18a544749..504916c8d7 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrnateKanzashi.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrnateKanzashi.java
@@ -119,7 +119,7 @@ class OrnateKanzashiEffect extends OneShotEffect {
class OrnateKanzashiCastFromExileEffect extends AsThoughEffectImpl {
public OrnateKanzashiCastFromExileEffect(UUID cardId) {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
staticText = "You may play that card from exile this turn";
}
diff --git a/Mage.Sets/src/mage/sets/clashpack/CourserOfKruphix.java b/Mage.Sets/src/mage/sets/clashpack/CourserOfKruphix.java
new file mode 100644
index 0000000000..98524ef6af
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/clashpack/CourserOfKruphix.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.clashpack;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class CourserOfKruphix extends mage.sets.bornofthegods.CourserOfKruphix {
+
+ public CourserOfKruphix(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 12;
+ this.expansionSetCode = "CLASH";
+ this.rarity = Rarity.SPECIAL;
+ }
+
+ public CourserOfKruphix(final CourserOfKruphix card) {
+ super(card);
+ }
+
+ @Override
+ public CourserOfKruphix copy() {
+ return new CourserOfKruphix(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/clashpack/FatedIntervention.java b/Mage.Sets/src/mage/sets/clashpack/FatedIntervention.java
new file mode 100644
index 0000000000..df451800e4
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/clashpack/FatedIntervention.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.clashpack;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class FatedIntervention extends mage.sets.bornofthegods.FatedIntervention {
+
+ public FatedIntervention(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 2;
+ this.expansionSetCode = "CLASH";
+ this.rarity = Rarity.SPECIAL;
+ }
+
+ public FatedIntervention(final FatedIntervention card) {
+ super(card);
+ }
+
+ @Override
+ public FatedIntervention copy() {
+ return new FatedIntervention(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/clashpack/FontOfFertility.java b/Mage.Sets/src/mage/sets/clashpack/FontOfFertility.java
new file mode 100644
index 0000000000..65dc6e6c42
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/clashpack/FontOfFertility.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.clashpack;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class FontOfFertility extends mage.sets.journeyintonyx.FontOfFertility {
+
+ public FontOfFertility(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 3;
+ this.expansionSetCode = "CLASH";
+ this.rarity = Rarity.SPECIAL;
+ }
+
+ public FontOfFertility(final FontOfFertility card) {
+ super(card);
+ }
+
+ @Override
+ public FontOfFertility copy() {
+ return new FontOfFertility(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/clashpack/HerosDownfall.java b/Mage.Sets/src/mage/sets/clashpack/HerosDownfall.java
new file mode 100644
index 0000000000..94d55e720b
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/clashpack/HerosDownfall.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.clashpack;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class HerosDownfall extends mage.sets.theros.HerosDownfall {
+
+ public HerosDownfall(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 8;
+ this.expansionSetCode = "CLASH";
+ this.rarity = Rarity.SPECIAL;
+ }
+
+ public HerosDownfall(final HerosDownfall card) {
+ super(card);
+ }
+
+ @Override
+ public HerosDownfall copy() {
+ return new HerosDownfall(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/clashpack/HydraBroodmaster.java b/Mage.Sets/src/mage/sets/clashpack/HydraBroodmaster.java
new file mode 100644
index 0000000000..be735b6dbd
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/clashpack/HydraBroodmaster.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.clashpack;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class HydraBroodmaster extends mage.sets.journeyintonyx.HydraBroodmaster {
+
+ public HydraBroodmaster(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 4;
+ this.expansionSetCode = "CLASH";
+ this.rarity = Rarity.SPECIAL;
+ }
+
+ public HydraBroodmaster(final HydraBroodmaster card) {
+ super(card);
+ }
+
+ @Override
+ public HydraBroodmaster copy() {
+ return new HydraBroodmaster(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/clashpack/NecropolisFiend.java b/Mage.Sets/src/mage/sets/clashpack/NecropolisFiend.java
new file mode 100644
index 0000000000..920343b98e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/clashpack/NecropolisFiend.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.clashpack;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class NecropolisFiend extends mage.sets.khansoftarkir.NecropolisFiend {
+
+ public NecropolisFiend(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 7;
+ this.expansionSetCode = "CLASH";
+ this.rarity = Rarity.SPECIAL;
+ }
+
+ public NecropolisFiend(final NecropolisFiend card) {
+ super(card);
+ }
+
+ @Override
+ public NecropolisFiend copy() {
+ return new NecropolisFiend(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/clashpack/PrognosticSphinx.java b/Mage.Sets/src/mage/sets/clashpack/PrognosticSphinx.java
new file mode 100644
index 0000000000..1c831c9ab0
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/clashpack/PrognosticSphinx.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.clashpack;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class PrognosticSphinx extends mage.sets.theros.PrognosticSphinx {
+
+ public PrognosticSphinx(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 1;
+ this.expansionSetCode = "CLASH";
+ this.rarity = Rarity.SPECIAL;
+ }
+
+ public PrognosticSphinx(final PrognosticSphinx card) {
+ super(card);
+ }
+
+ @Override
+ public PrognosticSphinx copy() {
+ return new PrognosticSphinx(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/clashpack/ProphetOfKruphix.java b/Mage.Sets/src/mage/sets/clashpack/ProphetOfKruphix.java
new file mode 100644
index 0000000000..7437e2fab4
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/clashpack/ProphetOfKruphix.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.clashpack;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ProphetOfKruphix extends mage.sets.theros.ProphetOfKruphix {
+
+ public ProphetOfKruphix(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 5;
+ this.expansionSetCode = "CLASH";
+ this.rarity = Rarity.SPECIAL;
+ }
+
+ public ProphetOfKruphix(final ProphetOfKruphix card) {
+ super(card);
+ }
+
+ @Override
+ public ProphetOfKruphix copy() {
+ return new ProphetOfKruphix(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/clashpack/ReaperOfTheWilds.java b/Mage.Sets/src/mage/sets/clashpack/ReaperOfTheWilds.java
new file mode 100644
index 0000000000..dcaa6a5812
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/clashpack/ReaperOfTheWilds.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.clashpack;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ReaperOfTheWilds extends mage.sets.theros.ReaperOfTheWilds {
+
+ public ReaperOfTheWilds(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 10;
+ this.expansionSetCode = "CLASH";
+ this.rarity = Rarity.SPECIAL;
+ }
+
+ public ReaperOfTheWilds(final ReaperOfTheWilds card) {
+ super(card);
+ }
+
+ @Override
+ public ReaperOfTheWilds copy() {
+ return new ReaperOfTheWilds(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/clashpack/SultaiAscendancy.java b/Mage.Sets/src/mage/sets/clashpack/SultaiAscendancy.java
new file mode 100644
index 0000000000..3cba2cae8f
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/clashpack/SultaiAscendancy.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.clashpack;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class SultaiAscendancy extends mage.sets.khansoftarkir.SultaiAscendancy {
+
+ public SultaiAscendancy(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 9;
+ this.expansionSetCode = "CLASH";
+ this.rarity = Rarity.SPECIAL;
+ }
+
+ public SultaiAscendancy(final SultaiAscendancy card) {
+ super(card);
+ }
+
+ @Override
+ public SultaiAscendancy copy() {
+ return new SultaiAscendancy(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/clashpack/TempleOfMystery.java b/Mage.Sets/src/mage/sets/clashpack/TempleOfMystery.java
new file mode 100644
index 0000000000..fb8fbee480
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/clashpack/TempleOfMystery.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.clashpack;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class TempleOfMystery extends mage.sets.theros.TempleOfMystery {
+
+ public TempleOfMystery(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 6;
+ this.expansionSetCode = "CLASH";
+ this.rarity = Rarity.SPECIAL;
+ }
+
+ public TempleOfMystery(final TempleOfMystery card) {
+ super(card);
+ }
+
+ @Override
+ public TempleOfMystery copy() {
+ return new TempleOfMystery(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/clashpack/WhipOfErebos.java b/Mage.Sets/src/mage/sets/clashpack/WhipOfErebos.java
new file mode 100644
index 0000000000..f48c4ba085
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/clashpack/WhipOfErebos.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.clashpack;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class WhipOfErebos extends mage.sets.theros.WhipOfErebos {
+
+ public WhipOfErebos(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 11;
+ this.expansionSetCode = "CLASH";
+ this.rarity = Rarity.SPECIAL;
+ }
+
+ public WhipOfErebos(final WhipOfErebos card) {
+ super(card);
+ }
+
+ @Override
+ public WhipOfErebos copy() {
+ return new WhipOfErebos(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/coldsnap/HaakonStromgaldScourge.java b/Mage.Sets/src/mage/sets/coldsnap/HaakonStromgaldScourge.java
index feb9190524..3905fb266a 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/HaakonStromgaldScourge.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/HaakonStromgaldScourge.java
@@ -90,7 +90,7 @@ public class HaakonStromgaldScourge extends CardImpl {
class HaakonStromgaldScourgePlayEffect extends AsThoughEffectImpl {
public HaakonStromgaldScourgePlayEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
staticText = "You may cast {this} from your graveyard";
}
@@ -163,7 +163,7 @@ class HaakonStromgaldScourgePlayEffect2 extends ContinuousRuleModifyingEffectImp
class HaakonPlayKnightsFromGraveyardEffect extends AsThoughEffectImpl {
public HaakonPlayKnightsFromGraveyardEffect () {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit);
staticText = "As long as {this} is on the battlefield, you may play Knight cards from your graveyard";
}
diff --git a/Mage.Sets/src/mage/sets/commander/ChromeshellCrab.java b/Mage.Sets/src/mage/sets/commander/ChromeshellCrab.java
new file mode 100644
index 0000000000..5c46924088
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/commander/ChromeshellCrab.java
@@ -0,0 +1,90 @@
+/*
+ * 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.sets.commander;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.continuous.ExchangeControlTargetEffect;
+import mage.abilities.keyword.MorphAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.target.common.TargetControlledCreaturePermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ChromeshellCrab extends CardImpl {
+
+ private static final String rule = "you may exchange control of target creature you control and target creature an opponent controls";
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
+
+ static {
+ filter.add(new ControllerPredicate(TargetController.OPPONENT));
+ }
+
+ public ChromeshellCrab(UUID ownerId) {
+ super(ownerId, 41, "Chromeshell Crab", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}");
+ this.expansionSetCode = "CMD";
+ this.subtype.add("Crab");
+ this.subtype.add("Beast");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(3);
+
+ // Morph {4}{U}
+ this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{U}")));
+
+ // When Chromeshell Crab is turned face up, you may exchange control of target creature you control and target creature an opponent controls.
+ Effect effect = new ExchangeControlTargetEffect(Duration.EndOfGame, rule, false, true);
+ effect.setText("exchange control of target creature you control and target creature an opponent controls");
+ Ability ability = new TurnedFaceUpSourceTriggeredAbility(effect, false, true);
+ ability.addTarget(new TargetControlledCreaturePermanent());
+ ability.addTarget(new TargetCreaturePermanent(filter));
+ this.addAbility(ability);
+ }
+
+ public ChromeshellCrab(final ChromeshellCrab card) {
+ super(card);
+ }
+
+ @Override
+ public ChromeshellCrab copy() {
+ return new ChromeshellCrab(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/commander/KaradorGhostChieftain.java b/Mage.Sets/src/mage/sets/commander/KaradorGhostChieftain.java
index d466c65ca4..74aa3fba19 100644
--- a/Mage.Sets/src/mage/sets/commander/KaradorGhostChieftain.java
+++ b/Mage.Sets/src/mage/sets/commander/KaradorGhostChieftain.java
@@ -160,7 +160,7 @@ class KaradorGhostChieftainContinuousEffect extends ContinuousEffectImpl {
class KaradorGhostChieftainCastFromGraveyardEffect extends AsThoughEffectImpl {
KaradorGhostChieftainCastFromGraveyardEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
staticText = "You may cast one creature card from your graveyard";
}
diff --git a/Mage.Sets/src/mage/sets/commander2013/MosswortBridge.java b/Mage.Sets/src/mage/sets/commander2013/MosswortBridge.java
index 7b06549eec..67a79cfed7 100644
--- a/Mage.Sets/src/mage/sets/commander2013/MosswortBridge.java
+++ b/Mage.Sets/src/mage/sets/commander2013/MosswortBridge.java
@@ -55,7 +55,7 @@ public class MosswortBridge extends CardImpl {
this.expansionSetCode = "C13";
// Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)
- this.addAbility(new HideawayAbility(this));
+ this.addAbility(new HideawayAbility());
// {tap}: Add {G} to your mana pool.
this.addAbility(new GreenManaAbility());
diff --git a/Mage.Sets/src/mage/sets/conflux/GrixisIllusionist.java b/Mage.Sets/src/mage/sets/conflux/GrixisIllusionist.java
index 8057f0fa27..c30582b9eb 100644
--- a/Mage.Sets/src/mage/sets/conflux/GrixisIllusionist.java
+++ b/Mage.Sets/src/mage/sets/conflux/GrixisIllusionist.java
@@ -37,7 +37,10 @@ import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
+import mage.constants.TargetController;
import mage.constants.Zone;
+import mage.filter.common.FilterLandPermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.Target;
import mage.target.common.TargetLandPermanent;
@@ -47,6 +50,12 @@ import mage.target.common.TargetLandPermanent;
*/
public class GrixisIllusionist extends CardImpl {
+ private static final FilterLandPermanent filter = new FilterLandPermanent("land you control");
+
+ static {
+ filter.add(new ControllerPredicate(TargetController.YOU));
+ }
+
public GrixisIllusionist(UUID ownerId) {
super(ownerId, 29, "Grixis Illusionist", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}");
this.expansionSetCode = "CON";
@@ -58,10 +67,9 @@ public class GrixisIllusionist extends CardImpl {
// {tap}: Target land you control becomes the basic land type of your choice until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn), new TapSourceCost());
- Target target = new TargetLandPermanent();
+ Target target = new TargetLandPermanent(filter);
ability.addTarget(target);
this.addAbility(ability);
-
}
public GrixisIllusionist(final GrixisIllusionist card) {
diff --git a/Mage.Sets/src/mage/sets/darkascension/FiendOfTheShadows.java b/Mage.Sets/src/mage/sets/darkascension/FiendOfTheShadows.java
index 933b2050b9..42579afa73 100644
--- a/Mage.Sets/src/mage/sets/darkascension/FiendOfTheShadows.java
+++ b/Mage.Sets/src/mage/sets/darkascension/FiendOfTheShadows.java
@@ -95,7 +95,7 @@ class FiendOfTheShadowsEffect extends AsThoughEffectImpl {
private final UUID exileId;
public FiendOfTheShadowsEffect(UUID exileId) {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
this.exileId = exileId;
staticText = "You may play that card for as long as it remains exiled";
}
diff --git a/Mage.Sets/src/mage/sets/darkascension/Gravecrawler.java b/Mage.Sets/src/mage/sets/darkascension/Gravecrawler.java
index 41db14c4d5..acaaa23dbb 100644
--- a/Mage.Sets/src/mage/sets/darkascension/Gravecrawler.java
+++ b/Mage.Sets/src/mage/sets/darkascension/Gravecrawler.java
@@ -87,7 +87,7 @@ class GravecrawlerPlayEffect extends AsThoughEffectImpl {
}
public GravecrawlerPlayEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
staticText = "You may cast {this} from your graveyard as long as you control a Zombie";
}
diff --git a/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java b/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java
index 61935aede9..2c0818761e 100644
--- a/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java
+++ b/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java
@@ -94,7 +94,7 @@ public class HavengulLich extends CardImpl {
class HavengulLichPlayEffect extends AsThoughEffectImpl {
public HavengulLichPlayEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
staticText = "You may cast target creature card in a graveyard this turn";
}
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/CommuneWithLava.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/CommuneWithLava.java
index 1518ef2cc8..4487794cdf 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/CommuneWithLava.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/CommuneWithLava.java
@@ -115,7 +115,7 @@ class CommuneWithLavaMayPlayEffect extends AsThoughEffectImpl {
int castOnTurn = 0;
public CommuneWithLavaMayPlayEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.Custom, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.Custom, Outcome.Benefit);
this.staticText = "Until the end of your next turn, you may play that card.";
}
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/HedonistsTrove.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/HedonistsTrove.java
index ab7d60e272..4174deb76f 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/HedonistsTrove.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/HedonistsTrove.java
@@ -118,7 +118,7 @@ class HedonistsTroveExileEffect extends OneShotEffect {
class HedonistsTrovePlayLandEffect extends AsThoughEffectImpl {
public HedonistsTrovePlayLandEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit);
staticText = "You may play land cards exiled by {this}";
}
@@ -157,7 +157,7 @@ class HedonistsTroveCastNonlandCardsEffect extends AsThoughEffectImpl {
private UUID cardId;
public HedonistsTroveCastNonlandCardsEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit);
staticText = "You may cast nonland cards exiled with {this}. You can't cast more than one spell this way each turn";
}
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/IreShaman.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/IreShaman.java
index 093bc8ae69..6f26e4f112 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/IreShaman.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/IreShaman.java
@@ -125,7 +125,7 @@ class IreShamanExileEffect extends OneShotEffect {
class IreShamanCastFromExileEffect extends AsThoughEffectImpl {
public IreShamanCastFromExileEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
staticText = "You may play the card from exile";
}
diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/RisenExecutioner.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/RisenExecutioner.java
index a1b4f29bab..901c17b432 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/RisenExecutioner.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/RisenExecutioner.java
@@ -100,7 +100,7 @@ public class RisenExecutioner extends CardImpl {
class RisenExecutionerCastEffect extends AsThoughEffectImpl {
RisenExecutionerCastEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
staticText = "You may cast {this} from your graveyard";
}
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter1.java b/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter1.java
new file mode 100644
index 0000000000..1680fd5489
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter1.java
@@ -0,0 +1,53 @@
+/*
+ * 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.sets.fallenempires;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class ElvishHunter1 extends mage.sets.masterseditionii.ElvishHunter {
+
+ public ElvishHunter1(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 72;
+ this.expansionSetCode = "FEM";
+ }
+
+ public ElvishHunter1(final ElvishHunter1 card) {
+ super(card);
+ }
+
+ @Override
+ public ElvishHunter1 copy() {
+ return new ElvishHunter1(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter2.java b/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter2.java
new file mode 100644
index 0000000000..85ee6e335e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter2.java
@@ -0,0 +1,53 @@
+/*
+ * 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.sets.fallenempires;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class ElvishHunter2 extends mage.sets.masterseditionii.ElvishHunter {
+
+ public ElvishHunter2(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 73;
+ this.expansionSetCode = "FEM";
+ }
+
+ public ElvishHunter2(final ElvishHunter2 card) {
+ super(card);
+ }
+
+ @Override
+ public ElvishHunter2 copy() {
+ return new ElvishHunter2(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter3.java b/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter3.java
new file mode 100644
index 0000000000..9760808898
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fallenempires/ElvishHunter3.java
@@ -0,0 +1,53 @@
+/*
+ * 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.sets.fallenempires;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class ElvishHunter3 extends mage.sets.masterseditionii.ElvishHunter {
+
+ public ElvishHunter3(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 74;
+ this.expansionSetCode = "FEM";
+ }
+
+ public ElvishHunter3(final ElvishHunter3 card) {
+ super(card);
+ }
+
+ @Override
+ public ElvishHunter3 copy() {
+ return new ElvishHunter3(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/fatereforged/MarangRiverProwler.java b/Mage.Sets/src/mage/sets/fatereforged/MarangRiverProwler.java
index 5c4ddec9a4..3e87e84061 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/MarangRiverProwler.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/MarangRiverProwler.java
@@ -92,7 +92,7 @@ class MarangRiverProwlerCastEffect extends AsThoughEffectImpl {
}
MarangRiverProwlerCastEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
staticText = "You may cast {this} from your graveyard as long as you control a black or green permanent";
}
diff --git a/Mage.Sets/src/mage/sets/fatereforged/OjutaiSoulOfWinter.java b/Mage.Sets/src/mage/sets/fatereforged/OjutaiSoulOfWinter.java
index ee0b842c36..4649e5ed85 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/OjutaiSoulOfWinter.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/OjutaiSoulOfWinter.java
@@ -40,7 +40,9 @@ import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.SetTargetPointer;
import mage.constants.TargetController;
+import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.common.FilterNonlandPermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent;
@@ -51,13 +53,13 @@ import mage.target.TargetPermanent;
*/
public class OjutaiSoulOfWinter extends CardImpl {
- private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dragon you control");
- private static final FilterCreaturePermanent filterPermanent = new FilterCreaturePermanent("permanent an opponent controls");
+ private static final FilterCreaturePermanent filterDragon = new FilterCreaturePermanent("Dragon you control");
+ private static final FilterPermanent filterNonlandPermanent = new FilterNonlandPermanent("nonland permanent an opponent controls");
static {
- filter.add(new SubtypePredicate("Dragon"));
- filter.add(new ControllerPredicate(TargetController.YOU));
- filterPermanent.add(new ControllerPredicate(TargetController.OPPONENT));
+ filterDragon.add(new SubtypePredicate("Dragon"));
+ filterDragon.add(new ControllerPredicate(TargetController.YOU));
+ filterNonlandPermanent.add(new ControllerPredicate(TargetController.OPPONENT));
}
public OjutaiSoulOfWinter(UUID ownerId) {
@@ -75,9 +77,9 @@ public class OjutaiSoulOfWinter extends CardImpl {
// Whenever a Dragon you control attacks, tap target nonland permanent an opponent controls. That permanent doesn't untap during its controller's next untap step.
Ability ability = new AttacksAllTriggeredAbility(
new TapTargetEffect(),
- false, filter, SetTargetPointer.NONE, false);
+ false, filterDragon, SetTargetPointer.NONE, false);
ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("That permanent"));
- ability.addTarget(new TargetPermanent(filterPermanent));
+ ability.addTarget(new TargetPermanent(filterNonlandPermanent));
this.addAbility(ability);
}
diff --git a/Mage.Sets/src/mage/sets/fatereforged/OutpostSiege.java b/Mage.Sets/src/mage/sets/fatereforged/OutpostSiege.java
index 418d99d1e1..f49e7e15cc 100644
--- a/Mage.Sets/src/mage/sets/fatereforged/OutpostSiege.java
+++ b/Mage.Sets/src/mage/sets/fatereforged/OutpostSiege.java
@@ -136,7 +136,7 @@ class OutpostSiegeExileEffect extends OneShotEffect {
class CastFromNonHandZoneTargetEffect extends AsThoughEffectImpl {
public CastFromNonHandZoneTargetEffect(Duration duration) {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, duration, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, duration, Outcome.Benefit);
staticText = "until end of turn, you may play that card";
}
diff --git a/Mage.Sets/src/mage/sets/fifthedition/PhantasmalForces.java b/Mage.Sets/src/mage/sets/fifthedition/PhantasmalForces.java
new file mode 100644
index 0000000000..9e1ad079cc
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fifthedition/PhantasmalForces.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.fifthedition;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces {
+
+ public PhantasmalForces(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 106;
+ this.expansionSetCode = "5ED";
+ }
+
+ public PhantasmalForces(final PhantasmalForces card) {
+ super(card);
+ }
+
+ @Override
+ public PhantasmalForces copy() {
+ return new PhantasmalForces(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ApprenticeWizard.java b/Mage.Sets/src/mage/sets/fourthedition/ApprenticeWizard.java
new file mode 100644
index 0000000000..34537065ea
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fourthedition/ApprenticeWizard.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.fourthedition;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ApprenticeWizard extends mage.sets.mastersedition.ApprenticeWizard {
+
+ public ApprenticeWizard(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 61;
+ this.expansionSetCode = "4ED";
+ }
+
+ public ApprenticeWizard(final ApprenticeWizard card) {
+ super(card);
+ }
+
+ @Override
+ public ApprenticeWizard copy() {
+ return new ApprenticeWizard(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/fourthedition/IvoryTower.java b/Mage.Sets/src/mage/sets/fourthedition/IvoryTower.java
new file mode 100644
index 0000000000..5d228eb598
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fourthedition/IvoryTower.java
@@ -0,0 +1,55 @@
+/*
+ * 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.sets.fourthedition;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class IvoryTower extends mage.sets.antiquities.IvoryTower {
+
+ public IvoryTower(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 346;
+ this.expansionSetCode = "4ED";
+ this.rarity = Rarity.RARE;
+ }
+
+ public IvoryTower(final IvoryTower card) {
+ super(card);
+ }
+
+ @Override
+ public IvoryTower copy() {
+ return new IvoryTower(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/fourthedition/Onulet.java b/Mage.Sets/src/mage/sets/fourthedition/Onulet.java
new file mode 100644
index 0000000000..a7ad5753d5
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fourthedition/Onulet.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.fourthedition;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class Onulet extends mage.sets.mastersedition.Onulet {
+
+ public Onulet(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 358;
+ this.expansionSetCode = "4ED";
+ this.rarity = Rarity.RARE;
+ }
+
+ public Onulet(final Onulet card) {
+ super(card);
+ }
+
+ @Override
+ public Onulet copy() {
+ return new Onulet(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/fourthedition/PhantasmalForces.java b/Mage.Sets/src/mage/sets/fourthedition/PhantasmalForces.java
new file mode 100644
index 0000000000..11f365ceae
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fourthedition/PhantasmalForces.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.sets.fourthedition;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class PhantasmalForces extends CardImpl {
+
+ public PhantasmalForces(UUID ownerId) {
+ super(ownerId, 88, "Phantasmal Forces", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{U}");
+ this.expansionSetCode = "4ED";
+ this.subtype.add("Illusion");
+ this.power = new MageInt(4);
+ this.toughness = new MageInt(1);
+
+ // Flying
+ this.addAbility(FlyingAbility.getInstance());
+ // At the beginning of your upkeep, sacrifice Phantasmal Forces unless you pay {U}.
+ this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{U}")), TargetController.YOU, false));
+ }
+
+ public PhantasmalForces(final PhantasmalForces card) {
+ super(card);
+ }
+
+ @Override
+ public PhantasmalForces copy() {
+ return new PhantasmalForces(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/PathToExile.java b/Mage.Sets/src/mage/sets/fridaynightmagic/PathToExile.java
new file mode 100644
index 0000000000..5a5e9dbe4e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/PathToExile.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.fridaynightmagic;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class PathToExile extends mage.sets.conflux.PathToExile {
+
+ public PathToExile(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 182;
+ this.expansionSetCode = "FNMP";
+ }
+
+ public PathToExile(final PathToExile card) {
+ super(card);
+ }
+
+ @Override
+ public PathToExile copy() {
+ return new PathToExile(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SerumVisions.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SerumVisions.java
new file mode 100644
index 0000000000..4a98857ee0
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SerumVisions.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.fridaynightmagic;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class SerumVisions extends mage.sets.fifthdawn.SerumVisions {
+
+ public SerumVisions(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 183;
+ this.expansionSetCode = "FNMP";
+ }
+
+ public SerumVisions(final SerumVisions card) {
+ super(card);
+ }
+
+ @Override
+ public SerumVisions copy() {
+ return new SerumVisions(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/futuresight/UnblinkingBleb.java b/Mage.Sets/src/mage/sets/futuresight/UnblinkingBleb.java
new file mode 100644
index 0000000000..75cd4c35bf
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/futuresight/UnblinkingBleb.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.sets.futuresight;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.TurnedFaceUpAllTriggeredAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.keyword.ScryEffect;
+import mage.abilities.keyword.MorphAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.FilterPermanent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class UnblinkingBleb extends CardImpl {
+
+ public UnblinkingBleb(UUID ownerId) {
+ super(ownerId, 45, "Unblinking Bleb", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}");
+ this.expansionSetCode = "FUT";
+ this.subtype.add("Illusion");
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(3);
+
+ // Morph {2}{U}
+ this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}")));
+
+ // Whenever Unblinking Bleb or another permanent is turned face up, you may scry 2.
+ this.addAbility(new TurnedFaceUpAllTriggeredAbility(new ScryEffect(2), new FilterPermanent("{this} or another permanent"), true));
+ }
+
+ public UnblinkingBleb(final UnblinkingBleb card) {
+ super(card);
+ }
+
+ @Override
+ public UnblinkingBleb copy() {
+ return new UnblinkingBleb(this);
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java b/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java
index 25086caf89..3e5c8e6f90 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java
@@ -127,7 +127,7 @@ class NightveilSpecterExileEffect extends OneShotEffect {
class NightveilSpecterEffect extends AsThoughEffectImpl {
public NightveilSpecterEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
staticText = "You may play cards exiled with {this}";
}
diff --git a/Mage.Sets/src/mage/sets/guildpact/GoblinFlectomancer.java b/Mage.Sets/src/mage/sets/guildpact/GoblinFlectomancer.java
new file mode 100644
index 0000000000..dbfc606904
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/guildpact/GoblinFlectomancer.java
@@ -0,0 +1,73 @@
+/*
+ * 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.sets.guildpact;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.SacrificeSourceCost;
+import mage.abilities.effects.common.ChooseNewTargetsTargetEffect;
+import mage.abilities.effects.common.ChooseNewTargetsTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterInstantOrSorcerySpell;
+import mage.target.TargetSpell;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class GoblinFlectomancer extends CardImpl {
+
+ public GoblinFlectomancer(UUID ownerId) {
+ super(ownerId, 116, "Goblin Flectomancer", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{U}{R}{R}");
+ this.expansionSetCode = "GPT";
+ this.subtype.add("Goblin");
+ this.subtype.add("Wizard");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(2);
+
+ // Sacrifice Goblin Flectomancer: You may change the targets of target instant or sorcery spell.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ChooseNewTargetsTargetEffect(), new SacrificeSourceCost());
+ ability.addTarget(new TargetSpell(new FilterInstantOrSorcerySpell()));
+ this.addAbility(ability);
+ }
+
+ public GoblinFlectomancer(final GoblinFlectomancer card) {
+ super(card);
+ }
+
+ @Override
+ public GoblinFlectomancer copy() {
+ return new GoblinFlectomancer(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/guildpact/RevenantPatriarch.java b/Mage.Sets/src/mage/sets/guildpact/RevenantPatriarch.java
new file mode 100644
index 0000000000..9ad228ec56
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/guildpact/RevenantPatriarch.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.guildpact;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class RevenantPatriarch extends mage.sets.sorinvstibalt.RevenantPatriarch {
+
+ public RevenantPatriarch(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 59;
+ this.expansionSetCode = "GPT";
+ }
+
+ public RevenantPatriarch(final RevenantPatriarch card) {
+ super(card);
+ }
+
+ @Override
+ public RevenantPatriarch copy() {
+ return new RevenantPatriarch(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/homelands/SerraAviary.java b/Mage.Sets/src/mage/sets/homelands/SerraAviary.java
new file mode 100644
index 0000000000..121b481e67
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/homelands/SerraAviary.java
@@ -0,0 +1,71 @@
+/*
+ * 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.sets.homelands;
+
+import java.util.UUID;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.continuous.BoostAllEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.AbilityPredicate;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class SerraAviary extends CardImpl {
+
+ private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("Creatures with flying");
+
+ static {
+ filter1.add(new AbilityPredicate(FlyingAbility.class));
+ }
+
+ public SerraAviary(UUID ownerId) {
+ super(ownerId, 118, "Serra Aviary", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}");
+ this.expansionSetCode = "HML";
+ this.supertype.add("World");
+
+ // Creatures with flying get +1/+1.
+ this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, false)));
+ }
+
+ public SerraAviary(final SerraAviary card) {
+ super(card);
+ }
+
+ @Override
+ public SerraAviary copy() {
+ return new SerraAviary(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/iceage/ZursWeirding.java b/Mage.Sets/src/mage/sets/iceage/ZursWeirding.java
index 96b514713e..cfc246e3fe 100644
--- a/Mage.Sets/src/mage/sets/iceage/ZursWeirding.java
+++ b/Mage.Sets/src/mage/sets/iceage/ZursWeirding.java
@@ -31,18 +31,20 @@ import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.effects.ReplacementEffectImpl;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.CardsImpl;
import mage.constants.CardType;
import mage.constants.Duration;
+import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
+import mage.constants.SubLayer;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
-import mage.game.events.GameEvent.EventType;
import mage.players.Player;
import mage.players.PlayerList;
@@ -56,8 +58,8 @@ public class ZursWeirding extends CardImpl {
super(ownerId, 112, "Zur's Weirding", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}");
this.expansionSetCode = "ICE";
-
// Players play with their hands revealed.
+ this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayerRevealHandCardsEffect()));
// If a player would draw a card, he or she reveals it instead. Then any other player may pay 2 life. If a player does, put that card into its owner's graveyard. Otherwise, that player draws a card.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ZursWeirdingReplacementEffect()));
@@ -97,32 +99,32 @@ class ZursWeirdingReplacementEffect extends ReplacementEffectImpl {
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
Player player = game.getPlayer(event.getTargetId());
- MageObject sourceObject = game.getObject(source.getSourceId());
- if (player != null) {
+ MageObject sourceObject = source.getSourceObject(game);
+ if (player != null && sourceObject != null) {
Card card = player.getLibrary().getFromTop(game);
if (card != null) {
// reveals it instead
- player.revealCards(sourceObject != null ? sourceObject.getName() : null, new CardsImpl(card), game);
+ player.revealCards(sourceObject.getIdName() + " next draw of " + player.getName() + " (" + game.getTurnNum()+"|"+game.getPhase().getType() +")", new CardsImpl(card), game);
// Then any other player may pay 2 life. If a player does, put that card into its owner's graveyard
PlayerList playerList = game.getPlayerList().copy();
playerList.setCurrent(player.getId());
Player currentPlayer = playerList.getNext(game);
- String message = new StringBuilder("Pay 2 life to put ").append(card.getName()).append(" into graveyard?").toString();
+ String message = new StringBuilder("Pay 2 life to put ").append(card.getLogName()).append(" into graveyard?").toString();
while (!currentPlayer.getId().equals(player.getId())) {
if (currentPlayer.canPayLifeCost() &&
currentPlayer.getLife() >= 2 &&
currentPlayer.chooseUse(Outcome.Benefit, message, game)) {
currentPlayer.loseLife(2, game);
player.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
- game.getState().getRevealed().reset();
+// game.getState().getRevealed().reset();
return true;
}
currentPlayer = playerList.getNext(game);
}
- game.getState().getRevealed().reset();
+// game.getState().getRevealed().reset();
}
}
return false;
@@ -138,3 +140,35 @@ class ZursWeirdingReplacementEffect extends ReplacementEffectImpl {
}
}
+class PlayerRevealHandCardsEffect extends ContinuousEffectImpl {
+
+ public PlayerRevealHandCardsEffect() {
+ super(Duration.WhileOnBattlefield, Layer.PlayerEffects, SubLayer.NA, Outcome.Detriment);
+ staticText = "Players play with their hands revealed";
+ }
+
+ public PlayerRevealHandCardsEffect(final PlayerRevealHandCardsEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Player controller = game.getPlayer(source.getControllerId());
+ if (controller != null) {
+ for (UUID playerID : controller.getInRange()) {
+ Player player = game.getPlayer(playerID);
+ if (player != null) {
+ player.revealCards(player.getName() + "'s hand cards", player.getHand(), game, false);
+ }
+ }
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public PlayerRevealHandCardsEffect copy() {
+ return new PlayerRevealHandCardsEffect(this);
+ }
+
+}
diff --git a/Mage.Sets/src/mage/sets/innistrad/MaskOfAvacyn.java b/Mage.Sets/src/mage/sets/innistrad/MaskOfAvacyn.java
index cfb3ed4a2c..298f51a555 100644
--- a/Mage.Sets/src/mage/sets/innistrad/MaskOfAvacyn.java
+++ b/Mage.Sets/src/mage/sets/innistrad/MaskOfAvacyn.java
@@ -37,6 +37,8 @@ import mage.abilities.keyword.HexproofAbility;
import mage.cards.CardImpl;
import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.effects.Effect;
/**
* @author nantuko
@@ -52,8 +54,11 @@ public class MaskOfAvacyn extends CardImpl {
this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3)));
// Equipped creature gets +1/+2 and has hexproof.
- this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.EQUIPMENT)));
- this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2)));
+ Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.EQUIPMENT));
+ Effect effect = new BoostEquippedEffect(1, 2);
+ effect.setText("and has hexproof");
+ ability.addEffect(effect);
+ this.addAbility(ability);
}
public MaskOfAvacyn(final MaskOfAvacyn card) {
diff --git a/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java b/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java
index d49ad5e7ed..067d091f72 100644
--- a/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java
+++ b/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java
@@ -85,7 +85,7 @@ public class SkaabRuinator extends CardImpl {
class SkaabRuinatorPlayEffect extends AsThoughEffectImpl {
public SkaabRuinatorPlayEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfGame, Outcome.PutCreatureInPlay);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.PutCreatureInPlay);
staticText = "You may cast {this} from your graveyard";
}
diff --git a/Mage.Sets/src/mage/sets/invasion/Liberate.java b/Mage.Sets/src/mage/sets/invasion/Liberate.java
new file mode 100644
index 0000000000..9543953f2d
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/invasion/Liberate.java
@@ -0,0 +1,103 @@
+/*
+ * 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.sets.invasion;
+
+import java.util.UUID;
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.ReturnFromExileEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.common.TargetControlledCreaturePermanent;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class Liberate extends CardImpl {
+
+ public Liberate(UUID ownerId) {
+ super(ownerId, 21, "Liberate", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}");
+ this.expansionSetCode = "INV";
+
+ // Exile target creature you control. Return that card to the battlefield under its owner's control at the beginning of the next end step.
+ this.getSpellAbility().addEffect(new LiberateEffect());
+ this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent());
+ }
+
+ public Liberate(final Liberate card) {
+ super(card);
+ }
+
+ @Override
+ public Liberate copy() {
+ return new Liberate(this);
+ }
+}
+
+class LiberateEffect extends OneShotEffect {
+
+ public LiberateEffect() {
+ super(Outcome.Detriment);
+ staticText = "exile target creature you control. Return that card to the battlefield under its owner's control at the beginning of the next end step";
+ }
+
+ public LiberateEffect(final LiberateEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Permanent permanent = game.getPermanent(source.getFirstTarget());
+ MageObject sourceObject = game.getObject(source.getSourceId());
+ if(permanent != null && sourceObject != null) {
+ if(permanent.moveToExile(source.getSourceId(), sourceObject.getIdName(), source.getSourceId(), game)) {
+ AtTheBeginOfNextEndStepDelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnFromExileEffect(source.getSourceId(), Zone.BATTLEFIELD, false));
+ delayedAbility.setSourceId(source.getSourceId());
+ delayedAbility.setControllerId(source.getControllerId());
+ delayedAbility.setSourceObject(source.getSourceObject(game), game);
+ game.addDelayedTriggeredAbility(delayedAbility);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public LiberateEffect copy() {
+ return new LiberateEffect(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/invasion/SleepersRobe.java b/Mage.Sets/src/mage/sets/invasion/SleepersRobe.java
new file mode 100644
index 0000000000..4efa36bc20
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/invasion/SleepersRobe.java
@@ -0,0 +1,82 @@
+/*
+ * 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.sets.invasion;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.DealsDamageToAPlayerAttachedTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.abilities.keyword.FearAbility;
+import mage.cards.CardImpl;
+import mage.constants.AttachmentType;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class SleepersRobe extends CardImpl {
+
+ public SleepersRobe(UUID ownerId) {
+ super(ownerId, 273, "Sleeper's Robe", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{U}{B}");
+ this.expansionSetCode = "INV";
+ this.subtype.add("Aura");
+
+ // Enchant creature
+ TargetPermanent auraTarget = new TargetCreaturePermanent();
+ this.getSpellAbility().addTarget(auraTarget);
+ this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
+ Ability ability = new EnchantAbility(auraTarget.getTargetName());
+ this.addAbility(ability);
+
+ // Enchanted creature has fear.
+ this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA)));
+
+ // Whenever enchanted creature deals combat damage to an opponent, you may draw a card.
+ this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new DrawCardSourceControllerEffect(1), "enchanted creature", true, false, false, TargetController.OPPONENT));
+ }
+
+ public SleepersRobe(final SleepersRobe card) {
+ super(card);
+ }
+
+ @Override
+ public SleepersRobe copy() {
+ return new SleepersRobe(this);
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/PropheticFlamespeaker.java b/Mage.Sets/src/mage/sets/journeyintonyx/PropheticFlamespeaker.java
index 9d4da3d5a3..8a6a8ef222 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/PropheticFlamespeaker.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/PropheticFlamespeaker.java
@@ -122,7 +122,7 @@ class PropheticFlamespeakerExileEffect extends OneShotEffect {
class PropheticFlamespeakerCastFromExileEffect extends AsThoughEffectImpl {
public PropheticFlamespeakerCastFromExileEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
staticText = "You may play the card from exile";
}
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Starfall.java b/Mage.Sets/src/mage/sets/journeyintonyx/Starfall.java
index 6bd88fd895..59a2497194 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/Starfall.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/Starfall.java
@@ -30,7 +30,6 @@ package mage.sets.journeyintonyx;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
-import mage.abilities.keyword.InfectAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Damnation.java b/Mage.Sets/src/mage/sets/judgepromo/Damnation.java
new file mode 100644
index 0000000000..b52992b4a0
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/judgepromo/Damnation.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.judgepromo;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class Damnation extends mage.sets.planarchaos.Damnation {
+
+ public Damnation(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 94;
+ this.expansionSetCode = "JR";
+ }
+
+ public Damnation(final Damnation card) {
+ super(card);
+ }
+
+ @Override
+ public Damnation copy() {
+ return new Damnation(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/judgepromo/DualcasterMage.java b/Mage.Sets/src/mage/sets/judgepromo/DualcasterMage.java
new file mode 100644
index 0000000000..3b3b3502ca
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/judgepromo/DualcasterMage.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.judgepromo;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class DualcasterMage extends mage.sets.commander2014.DualcasterMage {
+
+ public DualcasterMage(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 95;
+ this.expansionSetCode = "JR";
+ }
+
+ public DualcasterMage(final DualcasterMage card) {
+ super(card);
+ }
+
+ @Override
+ public DualcasterMage copy() {
+ return new DualcasterMage(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/judgepromo/FeldonOfTheThirdPath.java b/Mage.Sets/src/mage/sets/judgepromo/FeldonOfTheThirdPath.java
new file mode 100644
index 0000000000..624e723230
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/judgepromo/FeldonOfTheThirdPath.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.judgepromo;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class FeldonOfTheThirdPath extends mage.sets.commander2014.FeldonOfTheThirdPath {
+
+ public FeldonOfTheThirdPath(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 96;
+ this.expansionSetCode = "JR";
+ }
+
+ public FeldonOfTheThirdPath(final FeldonOfTheThirdPath card) {
+ super(card);
+ }
+
+ @Override
+ public FeldonOfTheThirdPath copy() {
+ return new FeldonOfTheThirdPath(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/judgepromo/RavagesOfWar.java b/Mage.Sets/src/mage/sets/judgepromo/RavagesOfWar.java
new file mode 100644
index 0000000000..9287aef52e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/judgepromo/RavagesOfWar.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.judgepromo;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class RavagesOfWar extends mage.sets.portalthreekingdoms.RavagesOfWar {
+
+ public RavagesOfWar(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 97;
+ this.expansionSetCode = "JR";
+ }
+
+ public RavagesOfWar(final RavagesOfWar card) {
+ super(card);
+ }
+
+ @Override
+ public RavagesOfWar copy() {
+ return new RavagesOfWar(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Wasteland.java b/Mage.Sets/src/mage/sets/judgepromo/Wasteland1.java
similarity index 89%
rename from Mage.Sets/src/mage/sets/judgepromo/Wasteland.java
rename to Mage.Sets/src/mage/sets/judgepromo/Wasteland1.java
index 51b136604e..4b0cf0a571 100644
--- a/Mage.Sets/src/mage/sets/judgepromo/Wasteland.java
+++ b/Mage.Sets/src/mage/sets/judgepromo/Wasteland1.java
@@ -33,20 +33,20 @@ import java.util.UUID;
*
* @author fireshoes
*/
-public class Wasteland extends mage.sets.tempest.Wasteland {
+public class Wasteland1 extends mage.sets.tempest.Wasteland {
- public Wasteland(UUID ownerId) {
+ public Wasteland1(UUID ownerId) {
super(ownerId);
this.cardNumber = 55;
this.expansionSetCode = "JR";
}
- public Wasteland(final Wasteland card) {
+ public Wasteland1(final Wasteland1 card) {
super(card);
}
@Override
- public Wasteland copy() {
- return new Wasteland(this);
+ public Wasteland1 copy() {
+ return new Wasteland1(this);
}
-}
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/judgepromo/Wasteland2.java b/Mage.Sets/src/mage/sets/judgepromo/Wasteland2.java
new file mode 100644
index 0000000000..3f62f4a673
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/judgepromo/Wasteland2.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.judgepromo;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class Wasteland2 extends mage.sets.tempest.Wasteland {
+
+ public Wasteland2(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 98;
+ this.expansionSetCode = "JR";
+ this.rarity = Rarity.RARE;
+ }
+
+ public Wasteland2(final Wasteland2 card) {
+ super(card);
+ }
+
+ @Override
+ public Wasteland2 copy() {
+ return new Wasteland2(this);
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/judgment/BreakingPoint.java b/Mage.Sets/src/mage/sets/judgment/BreakingPoint.java
new file mode 100644
index 0000000000..9dbac26535
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/judgment/BreakingPoint.java
@@ -0,0 +1,111 @@
+/*
+ * 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.sets.judgment;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.game.stack.Spell;
+import mage.game.stack.StackObject;
+import mage.players.Player;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class BreakingPoint extends CardImpl {
+
+ public BreakingPoint(UUID ownerId) {
+ super(ownerId, 81, "Breaking Point", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{R}{R}");
+ this.expansionSetCode = "JUD";
+
+ // Any player may have Breaking Point deal 6 damage to him or her. If no one does, destroy all creatures. Creatures destroyed this way can't be regenerated.
+ this.getSpellAbility().addEffect(new BreakingPointDestroyEffect());
+ }
+
+ public BreakingPoint(final BreakingPoint card) {
+ super(card);
+ }
+
+ @Override
+ public BreakingPoint copy() {
+ return new BreakingPoint(this);
+ }
+}
+
+class BreakingPointDestroyEffect extends OneShotEffect {
+
+ public BreakingPointDestroyEffect() {
+ super(Outcome.Benefit);
+ this.staticText = "Any player may have Breaking Point deal 6 damage to him or her. If no one does, destroy all creatures. Creatures destroyed this way can't be regenerated.";
+ }
+
+ public BreakingPointDestroyEffect(final BreakingPointDestroyEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public BreakingPointDestroyEffect copy() {
+ return new BreakingPointDestroyEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ StackObject spell = null;
+ for(StackObject object : game.getStack()){
+ if(object instanceof Spell && object.getSourceId().equals(source.getSourceId())){
+ spell = object;
+ }
+ }
+ if(spell != null){
+ boolean destroyCreatures = true;
+ for(UUID uuid : game.getPlayerList()){
+ Player player = game.getPlayer(uuid);
+ if(player != null && player.chooseUse(Outcome.Detriment, "Have " + spell.getName() + " deal 6 damage to you?", game)){
+ destroyCreatures = false;
+ player.damage(6, source.getSourceId(), game, false, true);
+ game.informPlayers(player.getLogName() + " has " + spell.getName() + " deal 6 to him or her");
+ }
+ }
+ if (destroyCreatures) {
+ for (Permanent permanent : game.getBattlefield().getActivePermanents(new FilterCreaturePermanent("creatures"), source.getControllerId(), source.getSourceId(), game)) {
+ permanent.destroy(source.getSourceId(), game, true);
+ }
+ }
+ return destroyCreatures;
+ }
+ return false;
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/judgment/Browbeat.java b/Mage.Sets/src/mage/sets/judgment/Browbeat.java
index 7884cf7a6e..fb71c3674c 100644
--- a/Mage.Sets/src/mage/sets/judgment/Browbeat.java
+++ b/Mage.Sets/src/mage/sets/judgment/Browbeat.java
@@ -28,22 +28,17 @@
package mage.sets.judgment;
import java.util.UUID;
-
import mage.abilities.Ability;
-import mage.abilities.Mode;
-import mage.abilities.costs.common.DiscardTargetCost;
import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
-import mage.filter.FilterCard;
import mage.game.Game;
import mage.game.stack.Spell;
import mage.game.stack.StackObject;
import mage.players.Player;
import mage.target.TargetPlayer;
-import mage.target.common.TargetCardInHand;
/**
*
@@ -55,7 +50,6 @@ public class Browbeat extends CardImpl {
super(ownerId, 82, "Browbeat", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}");
this.expansionSetCode = "JUD";
-
// Any player may have Browbeat deal 5 damage to him or her. If no one does, target player draws three cards.
this.getSpellAbility().addEffect(new BrowbeatDrawEffect());
this.getSpellAbility().addTarget(new TargetPlayer());
@@ -75,6 +69,7 @@ class BrowbeatDrawEffect extends OneShotEffect {
public BrowbeatDrawEffect() {
super(Outcome.DrawCard);
+ staticText = "Any player may have {source} deal 5 damage to him or her. If no one does, target player draws three cards.";
}
public BrowbeatDrawEffect(final BrowbeatDrawEffect effect) {
@@ -88,6 +83,10 @@ class BrowbeatDrawEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
+ Player controller = game.getPlayer(source.getControllerId());
+ if (controller == null) {
+ return false;
+ }
StackObject spell = null;
for(StackObject object : game.getStack()){
if(object instanceof Spell && object.getSourceId().equals(source.getSourceId())){
@@ -96,12 +95,12 @@ class BrowbeatDrawEffect extends OneShotEffect {
}
if(spell != null){
boolean drawCards = true;
- for(UUID uuid : game.getPlayerList()){
- Player player = game.getPlayer(uuid);
- if(player != null && player.chooseUse(Outcome.Detriment, "Have " + spell.getName() + " deal 5 damage to you?", game)){
+ for(UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)){
+ Player player = game.getPlayer(playerId);
+ if (player != null && player.chooseUse(Outcome.Detriment, "Have " + spell.getLogName() + " deal 5 damage to you?", game)){
drawCards = false;
player.damage(5, source.getSourceId(), game, false, true);
- game.informPlayers(player.getLogName() + " has " + spell.getName() + " deal 5 to him or her");
+ game.informPlayers(player.getLogName() + " has " + spell.getLogName() + " deal 5 to him or her");
}
}
if (drawCards) {
@@ -116,11 +115,4 @@ class BrowbeatDrawEffect extends OneShotEffect {
return false;
}
- @Override
- public String getText(Mode mode) {
- if (staticText != null && !staticText.isEmpty()) {
- return staticText;
- }
- return "Any player may have {source} deal 5 damage to him or her. If no one does, target player draws three cards.";
- }
}
diff --git a/Mage.Sets/src/mage/sets/judgment/Spelljack.java b/Mage.Sets/src/mage/sets/judgment/Spelljack.java
index 69b3746899..4c5f862cbe 100644
--- a/Mage.Sets/src/mage/sets/judgment/Spelljack.java
+++ b/Mage.Sets/src/mage/sets/judgment/Spelljack.java
@@ -118,7 +118,7 @@ class SpelljackEffect extends OneShotEffect {
class SpelljackCastFromExileEffect extends AsThoughEffectImpl {
SpelljackCastFromExileEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.Custom, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.Custom, Outcome.Benefit);
staticText = "You may cast that card without paying its mana cost as long as it remains exiled";
}
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/KheruSpellsnatcher.java b/Mage.Sets/src/mage/sets/khansoftarkir/KheruSpellsnatcher.java
index c0f15ac9e3..19cced0b3a 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/KheruSpellsnatcher.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/KheruSpellsnatcher.java
@@ -131,7 +131,7 @@ class KheruSpellsnatcherEffect extends OneShotEffect {
class KheruSpellsnatcherCastFromExileEffect extends AsThoughEffectImpl {
KheruSpellsnatcherCastFromExileEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.Custom, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.Custom, Outcome.Benefit);
staticText = "You may cast that card without paying its mana cost as long as it remains exiled";
}
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/NarsetEnlightenedMaster.java b/Mage.Sets/src/mage/sets/khansoftarkir/NarsetEnlightenedMaster.java
index cd3ee2eee1..70d9517368 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/NarsetEnlightenedMaster.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/NarsetEnlightenedMaster.java
@@ -127,7 +127,7 @@ class NarsetEnlightenedMasterExileEffect extends OneShotEffect {
class NarsetEnlightenedMasterCastFromExileEffect extends AsThoughEffectImpl {
public NarsetEnlightenedMasterCastFromExileEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
staticText = "Until end of turn, you may cast noncreature cards exiled with {this} this turn without paying their mana costs";
}
diff --git a/Mage.Sets/src/mage/sets/legends/AcidRain.java b/Mage.Sets/src/mage/sets/legends/AcidRain.java
new file mode 100644
index 0000000000..209e5fe181
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/legends/AcidRain.java
@@ -0,0 +1,65 @@
+/*
+ * 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.sets.legends;
+
+import java.util.UUID;
+import mage.abilities.effects.common.DestroyAllEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class AcidRain extends CardImpl {
+
+ private static final FilterPermanent filter = new FilterPermanent("Forests");
+ static {
+ filter.add(new SubtypePredicate("Forest"));
+ }
+
+ public AcidRain(UUID ownerId) {
+ super(ownerId, 44, "Acid Rain", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}");
+ this.expansionSetCode = "LEG";
+
+ // Destroy all Forests.
+ this.getSpellAbility().addEffect(new DestroyAllEffect(filter));
+ }
+
+ public AcidRain(final AcidRain card) {
+ super(card);
+ }
+
+ @Override
+ public AcidRain copy() {
+ return new AcidRain(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/legends/ConcordantCrossroads.java b/Mage.Sets/src/mage/sets/legends/ConcordantCrossroads.java
new file mode 100644
index 0000000000..421d353dfb
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/legends/ConcordantCrossroads.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.legends;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ConcordantCrossroads extends mage.sets.masterseditioniii.ConcordantCrossroads {
+
+ public ConcordantCrossroads(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 93;
+ this.expansionSetCode = "LEG";
+ }
+
+ public ConcordantCrossroads(final ConcordantCrossroads card) {
+ super(card);
+ }
+
+ @Override
+ public ConcordantCrossroads copy() {
+ return new ConcordantCrossroads(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/legends/HornOfDeafening.java b/Mage.Sets/src/mage/sets/legends/HornOfDeafening.java
new file mode 100644
index 0000000000..53950cdd4c
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/legends/HornOfDeafening.java
@@ -0,0 +1,72 @@
+/*
+ * 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.sets.legends;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.PreventDamageByTargetEffect;
+import mage.abilities.effects.common.PreventDamageToTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class HornOfDeafening extends CardImpl {
+
+ public HornOfDeafening(UUID ownerId) {
+ super(ownerId, 224, "Horn of Deafening", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}");
+ this.expansionSetCode = "LEG";
+
+ // {2}, {tap}: Prevent all combat damage that would be dealt by target creature this turn.
+ Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true);
+ effect.setText("Prevent all combat damage that would be dealt by target creature this turn.");
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}"));
+ ability.addCost(new TapSourceCost());
+ ability.addTarget(new TargetCreaturePermanent());
+ this.addAbility(ability);
+ }
+
+ public HornOfDeafening(final HornOfDeafening card) {
+ super(card);
+ }
+
+ @Override
+ public HornOfDeafening copy() {
+ return new HornOfDeafening(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/legions/ChromeshellCrab.java b/Mage.Sets/src/mage/sets/legions/ChromeshellCrab.java
new file mode 100644
index 0000000000..89d6e431aa
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/legions/ChromeshellCrab.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.legions;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ChromeshellCrab extends mage.sets.commander.ChromeshellCrab {
+
+ public ChromeshellCrab(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 32;
+ this.expansionSetCode = "LGN";
+ }
+
+ public ChromeshellCrab(final ChromeshellCrab card) {
+ super(card);
+ }
+
+ @Override
+ public ChromeshellCrab copy() {
+ return new ChromeshellCrab(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/legions/LavabornMuse.java b/Mage.Sets/src/mage/sets/legions/LavabornMuse.java
new file mode 100644
index 0000000000..20948d6ccc
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/legions/LavabornMuse.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.legions;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class LavabornMuse extends mage.sets.sorinvstibalt.LavabornMuse {
+
+ public LavabornMuse(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 105;
+ this.expansionSetCode = "LGN";
+ }
+
+ public LavabornMuse(final LavabornMuse card) {
+ super(card);
+ }
+
+ @Override
+ public LavabornMuse copy() {
+ return new LavabornMuse(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/PhantasmalForces.java b/Mage.Sets/src/mage/sets/limitedalpha/PhantasmalForces.java
new file mode 100644
index 0000000000..2dd9eabf26
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/limitedalpha/PhantasmalForces.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.limitedalpha;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces {
+
+ public PhantasmalForces(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 68;
+ this.expansionSetCode = "LEA";
+ }
+
+ public PhantasmalForces(final PhantasmalForces card) {
+ super(card);
+ }
+
+ @Override
+ public PhantasmalForces copy() {
+ return new PhantasmalForces(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SedgeTroll.java b/Mage.Sets/src/mage/sets/limitedalpha/SedgeTroll.java
new file mode 100644
index 0000000000..07ae33e3dd
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/limitedalpha/SedgeTroll.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.limitedalpha;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class SedgeTroll extends mage.sets.masterseditioniv.SedgeTroll {
+
+ public SedgeTroll(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 173;
+ this.expansionSetCode = "LEA";
+ }
+
+ public SedgeTroll(final SedgeTroll card) {
+ super(card);
+ }
+
+ @Override
+ public SedgeTroll copy() {
+ return new SedgeTroll(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalForces.java b/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalForces.java
new file mode 100644
index 0000000000..a70fbdb3a8
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalForces.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.limitedbeta;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces {
+
+ public PhantasmalForces(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 68;
+ this.expansionSetCode = "LEB";
+ }
+
+ public PhantasmalForces(final PhantasmalForces card) {
+ super(card);
+ }
+
+ @Override
+ public PhantasmalForces copy() {
+ return new PhantasmalForces(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SedgeTroll.java b/Mage.Sets/src/mage/sets/limitedbeta/SedgeTroll.java
new file mode 100644
index 0000000000..52f81ffef8
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/limitedbeta/SedgeTroll.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.limitedbeta;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class SedgeTroll extends mage.sets.masterseditioniv.SedgeTroll {
+
+ public SedgeTroll(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 174;
+ this.expansionSetCode = "LEB";
+ }
+
+ public SedgeTroll(final SedgeTroll card) {
+ super(card);
+ }
+
+ @Override
+ public SedgeTroll copy() {
+ return new SedgeTroll(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/lorwyn/AmoeboidChangeling.java b/Mage.Sets/src/mage/sets/lorwyn/AmoeboidChangeling.java
new file mode 100644
index 0000000000..5141b2e47a
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/lorwyn/AmoeboidChangeling.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.sets.lorwyn;
+
+import java.util.UUID;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
+import mage.abilities.effects.common.continuous.LoseAllCreatureTypesTargetEffect;
+import mage.abilities.keyword.ChangelingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author EvilGeek
+ */
+public class AmoeboidChangeling extends CardImpl {
+
+ public AmoeboidChangeling(UUID ownerId) {
+ super(ownerId, 51, "Amoeboid Changeling", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}");
+ this.expansionSetCode = "LRW";
+ this.subtype.add("Shapeshifter");
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(1);
+
+ // Changeling
+ this.addAbility(ChangelingAbility.getInstance());
+
+ // {tap}: Target creature gains all creature types until end of turn.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ChangelingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost());
+ ability.addTarget(new TargetCreaturePermanent());
+
+ this.addAbility(ability);
+
+ // {tap}: Target creature loses all creature types until end of turn.
+ ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAllCreatureTypesTargetEffect(Duration.EndOfTurn), new TapSourceCost());
+ ability.addTarget(new TargetCreaturePermanent());
+
+ this.addAbility(ability);
+ }
+
+ public AmoeboidChangeling(final AmoeboidChangeling card) {
+ super(card);
+ }
+
+ @Override
+ public AmoeboidChangeling copy() {
+ return new AmoeboidChangeling(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java b/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java
index 2f1de4dda3..bf454890b0 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Benthicore.java
@@ -1,88 +1,90 @@
-/*
- * 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.sets.lorwyn;
-
-import mage.constants.CardType;
-import mage.constants.Rarity;
-import mage.MageInt;
-import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldTriggeredAbility;
-import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.costs.common.TapTargetCost;
-import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.effects.common.UntapSourceEffect;
-import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
-import mage.abilities.keyword.ShroudAbility;
-import mage.cards.CardImpl;
-import mage.constants.Duration;
-import mage.constants.Zone;
-import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.SubtypePredicate;
-import mage.filter.predicate.permanent.TappedPredicate;
-import mage.game.permanent.token.MerfolkToken;
-import mage.target.common.TargetControlledPermanent;
-
-import java.util.UUID;
-
-/**
- *
- * @author Loki
- */
-public class Benthicore extends CardImpl {
-
- private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control");
-
- static {
- filter.add(Predicates.not(new TappedPredicate()));
- filter.add(new SubtypePredicate("Merfolk"));
- }
-
- public Benthicore(UUID ownerId) {
- super(ownerId, 53, "Benthicore", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{6}{U}");
- this.expansionSetCode = "LRW";
- this.subtype.add("Elemental");
-
- this.power = new MageInt(5);
- this.toughness = new MageInt(5);
- this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new MerfolkToken(), 2), false));
- Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, false)));
- ability.addEffect(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn));
- this.addAbility(ability);
- }
-
- public Benthicore(final Benthicore card) {
- super(card);
- }
-
- @Override
- public Benthicore copy() {
- return new Benthicore(this);
- }
-}
-
+/*
+ * 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.sets.lorwyn;
+
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapTargetCost;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.UntapSourceEffect;
+import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
+import mage.abilities.keyword.ShroudAbility;
+import mage.cards.CardImpl;
+import mage.constants.Duration;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.permanent.TappedPredicate;
+import mage.game.permanent.token.MerfolkWizardToken;
+import mage.target.common.TargetControlledPermanent;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author Loki
+ */
+public class Benthicore extends CardImpl {
+
+ private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control");
+
+ static {
+ filter.add(Predicates.not(new TappedPredicate()));
+ filter.add(new SubtypePredicate("Merfolk"));
+ }
+
+ public Benthicore(UUID ownerId) {
+ super(ownerId, 53, "Benthicore", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{6}{U}");
+ this.expansionSetCode = "LRW";
+ this.subtype.add("Elemental");
+ this.power = new MageInt(5);
+ this.toughness = new MageInt(5);
+
+ // When Benthicore enters the battlefield, put two 1/1 blue Merfolk Wizard creature tokens onto the battlefield.
+ this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new MerfolkWizardToken(), 2), false));
+
+ // Tap two untapped Merfolk you control: Untap Benthicore. It gains shroud until end of turn.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, false)));
+ ability.addEffect(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn));
+ this.addAbility(ability);
+ }
+
+ public Benthicore(final Benthicore card) {
+ super(card);
+ }
+
+ @Override
+ public Benthicore copy() {
+ return new Benthicore(this);
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/lorwyn/BogStriderAsh.java b/Mage.Sets/src/mage/sets/lorwyn/BogStriderAsh.java
new file mode 100644
index 0000000000..b6d5ee01e1
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/lorwyn/BogStriderAsh.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.sets.lorwyn;
+
+import java.util.UUID;
+
+import mage.MageInt;
+import mage.abilities.common.SpellCastAllTriggeredAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DoIfCostPaid;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.abilities.keyword.SwampwalkAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.FilterSpell;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+
+/**
+ *
+ * @author EvilGeek
+ */
+public class BogStriderAsh extends CardImpl {
+
+ private static final FilterSpell filter = new FilterSpell("a Goblin spell");
+
+ static {
+ filter.add(new SubtypePredicate("Goblin"));
+ }
+
+ public BogStriderAsh(UUID ownerId) {
+ super(ownerId, 198, "Bog-Strider Ash", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}");
+ this.expansionSetCode = "LRW";
+ this.subtype.add("Treefolk");
+ this.subtype.add("Shaman");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(4);
+
+ // Swampwalk
+ this.addAbility(new SwampwalkAbility());
+
+ // Whenever a player casts a Goblin spell, you may pay {G}. If you do, you gain 2 life.
+ this.addAbility(new SpellCastAllTriggeredAbility(new DoIfCostPaid(new GainLifeEffect(2), new ManaCostsImpl("{G}")), filter, true));
+ }
+
+ public BogStriderAsh(final BogStriderAsh card) {
+ super(card);
+ }
+
+ @Override
+ public BogStriderAsh copy() {
+ return new BogStriderAsh(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/lorwyn/BoggartMob.java b/Mage.Sets/src/mage/sets/lorwyn/BoggartMob.java
new file mode 100644
index 0000000000..0bfee0cd16
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/lorwyn/BoggartMob.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.sets.lorwyn;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.DealsDamageToAPlayerAllTriggeredAbility;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.keyword.ChampionAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.SetTargetPointer;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.game.permanent.token.Token;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class BoggartMob extends CardImpl {
+
+ private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Goblin you control");
+
+ static {
+ filter.add(new SubtypePredicate("Goblin"));
+ }
+
+ public BoggartMob(UUID ownerId) {
+ super(ownerId, 104, "Boggart Mob", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{B}");
+ this.expansionSetCode = "LRW";
+ this.subtype.add("Goblin");
+ this.subtype.add("Warrior");
+ this.power = new MageInt(5);
+ this.toughness = new MageInt(5);
+
+ // Champion a Goblin
+ this.addAbility(new ChampionAbility(this, "Goblin"));
+
+ // Whenever a Goblin you control deals combat damage to a player, you may put a 1/1 black Goblin Rogue creature token onto the battlefield.
+ this.addAbility(new DealsDamageToAPlayerAllTriggeredAbility(
+ new CreateTokenEffect(new BlackGoblinRogueToken()),
+ filter, true, SetTargetPointer.NONE, true));
+ }
+
+ public BoggartMob(final BoggartMob card) {
+ super(card);
+ }
+
+ @Override
+ public BoggartMob copy() {
+ return new BoggartMob(this);
+ }
+}
+
+class BlackGoblinRogueToken extends Token {
+ BlackGoblinRogueToken() {
+ super("Goblin Rogue", "1/1 black Goblin Rogue creature token");
+ cardType.add(CardType.CREATURE);
+ color.setBlack(true);
+ subtype.add("Goblin");
+ subtype.add("Rogue");
+ power = new MageInt(1);
+ toughness = new MageInt(1);
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/lorwyn/HowltoothHollow.java b/Mage.Sets/src/mage/sets/lorwyn/HowltoothHollow.java
index 94b1f779ed..81a296af4c 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/HowltoothHollow.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/HowltoothHollow.java
@@ -53,7 +53,7 @@ public class HowltoothHollow extends CardImpl {
this.expansionSetCode = "LRW";
// Hideaway
- this.addAbility(new HideawayAbility(this));
+ this.addAbility(new HideawayAbility());
// {tap}: Add {B} to your mana pool.
this.addAbility(new BlackManaAbility());
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Shapesharer.java b/Mage.Sets/src/mage/sets/lorwyn/Shapesharer.java
new file mode 100644
index 0000000000..8cd1d57057
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/lorwyn/Shapesharer.java
@@ -0,0 +1,115 @@
+/*
+ * 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.sets.lorwyn;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.keyword.ChangelingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetCreaturePermanent;
+import mage.util.functions.EmptyApplyToPermanent;
+
+
+/**
+ * @author duncant
+ */
+public class Shapesharer extends CardImpl {
+
+ private static final FilterPermanent filterShapeshifter = new FilterPermanent("Shapeshifter");
+
+ static {
+ filterShapeshifter.add(new SubtypePredicate("Shapeshifter"));
+ }
+
+ public Shapesharer(UUID ownerId) {
+ super(ownerId, 85, "Shapesharer", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{U}");
+ this.expansionSetCode = "LRW";
+ this.subtype.add("Shapeshifter");
+
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(1);
+ this.addAbility(ChangelingAbility.getInstance());
+
+ // {2}{U}: Target Shapeshifter becomes a copy of target creature until your next turn.
+ Ability copyAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD,
+ new ShapesharerEffect(),
+ new ManaCostsImpl("{2}{U}"));
+ copyAbility.addTarget(new TargetPermanent(filterShapeshifter));
+ copyAbility.addTarget(new TargetCreaturePermanent());
+ this.addAbility(copyAbility);
+ }
+
+ public Shapesharer(final Shapesharer card) {
+ super(card);
+ }
+
+ @Override
+ public Shapesharer copy() {
+ return new Shapesharer(this);
+ }
+}
+
+class ShapesharerEffect extends OneShotEffect {
+ public ShapesharerEffect() {
+ super(Outcome.Copy);
+ this.staticText = "Target Shapeshifter becomes a copy of target creature until your next turn.";
+ }
+
+ public ShapesharerEffect(final ShapesharerEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public ShapesharerEffect copy() {
+ return new ShapesharerEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability ability) {
+ Permanent copyTo = game.getPermanent(ability.getFirstTarget());
+ if (copyTo != null) {
+ Permanent copyFrom = game.getPermanentOrLKIBattlefield(ability.getTargets().get(1).getFirstTarget());
+ game.copyPermanent(Duration.EndOfTurn, copyFrom, copyTo, ability, new EmptyApplyToPermanent());
+ }
+ return true;
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/lorwyn/ShelldockIsle.java b/Mage.Sets/src/mage/sets/lorwyn/ShelldockIsle.java
index cb3936feca..38128358b2 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/ShelldockIsle.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/ShelldockIsle.java
@@ -53,7 +53,7 @@ public class ShelldockIsle extends CardImpl {
this.expansionSetCode = "LRW";
// Hideaway
- this.addAbility(new HideawayAbility(this));
+ this.addAbility(new HideawayAbility());
// {tap}: Add {U} to your mana pool.
this.addAbility(new BlueManaAbility());
// {U}, {tap}: You may play the exiled card without paying its mana cost if a library has twenty or fewer cards in it.
diff --git a/Mage.Sets/src/mage/sets/lorwyn/SpinerockKnoll.java b/Mage.Sets/src/mage/sets/lorwyn/SpinerockKnoll.java
index b457916279..f7a2d91975 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/SpinerockKnoll.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/SpinerockKnoll.java
@@ -61,7 +61,7 @@ public class SpinerockKnoll extends CardImpl {
this.expansionSetCode = "LRW";
// Hideaway
- this.addAbility(new HideawayAbility(this));
+ this.addAbility(new HideawayAbility());
// {tap}: Add {R} to your mana pool.
this.addAbility(new RedManaAbility());
diff --git a/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java b/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java
index f69a60c2ca..a06e49f902 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java
@@ -1,79 +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.sets.lorwyn;
-
-import mage.constants.CardType;
-import mage.constants.Rarity;
-import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.costs.common.TapTargetCost;
-import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.effects.common.ReturnToHandSourceEffect;
-import mage.cards.CardImpl;
-import mage.constants.Zone;
-import mage.filter.common.FilterControlledPermanent;
-import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.SubtypePredicate;
-import mage.filter.predicate.permanent.TappedPredicate;
-import mage.game.permanent.token.MerfolkToken;
-import mage.target.common.TargetControlledPermanent;
-
-import java.util.UUID;
-
-/**
- *
- * @author Loki
- */
-public class SummonTheSchool extends CardImpl {
-
- private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control");
-
- static {
- filter.add(Predicates.not(new TappedPredicate()));
- filter.add(new SubtypePredicate("Merfolk"));
- }
-
- public SummonTheSchool(UUID ownerId) {
- super(ownerId, 42, "Summon the School", Rarity.UNCOMMON, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{3}{W}");
- this.expansionSetCode = "LRW";
- this.subtype.add("Merfolk");
-
- // Put two 1/1 blue Merfolk Wizard creature tokens onto the battlefield.
- this.getSpellAbility().addEffect(new CreateTokenEffect(new MerfolkToken(), 2));
- // Tap four untapped Merfolk you control: Return Summon the School from your graveyard to your hand.
- this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnToHandSourceEffect(), new TapTargetCost(new TargetControlledPermanent(4, 4, filter, false))));
- }
-
- public SummonTheSchool(final SummonTheSchool card) {
- super(card);
- }
-
- @Override
- public SummonTheSchool copy() {
- return new SummonTheSchool(this);
- }
-}
+/*
+ * 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.sets.lorwyn;
+
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapTargetCost;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.ReturnToHandSourceEffect;
+import mage.cards.CardImpl;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.permanent.TappedPredicate;
+import mage.game.permanent.token.MerfolkWizardToken;
+import mage.target.common.TargetControlledPermanent;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author Loki
+ */
+public class SummonTheSchool extends CardImpl {
+
+ private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control");
+
+ static {
+ filter.add(Predicates.not(new TappedPredicate()));
+ filter.add(new SubtypePredicate("Merfolk"));
+ }
+
+ public SummonTheSchool(UUID ownerId) {
+ super(ownerId, 42, "Summon the School", Rarity.UNCOMMON, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{3}{W}");
+ this.expansionSetCode = "LRW";
+ this.subtype.add("Merfolk");
+
+ // Put two 1/1 blue Merfolk Wizard creature tokens onto the battlefield.
+ this.getSpellAbility().addEffect(new CreateTokenEffect(new MerfolkWizardToken(), 2));
+ // Tap four untapped Merfolk you control: Return Summon the School from your graveyard to your hand.
+ this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnToHandSourceEffect(), new TapTargetCost(new TargetControlledPermanent(4, 4, filter, false))));
+ }
+
+ public SummonTheSchool(final SummonTheSchool card) {
+ super(card);
+ }
+
+ @Override
+ public SummonTheSchool copy() {
+ return new SummonTheSchool(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/lorwyn/WindbriskHeights.java b/Mage.Sets/src/mage/sets/lorwyn/WindbriskHeights.java
index da4e1a83b5..3fa54c3295 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/WindbriskHeights.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/WindbriskHeights.java
@@ -54,7 +54,7 @@ public class WindbriskHeights extends CardImpl {
this.expansionSetCode = "LRW";
// Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)
- this.addAbility(new HideawayAbility(this));
+ this.addAbility(new HideawayAbility());
// {tap}: Add {W} to your mana pool.
this.addAbility(new WhiteManaAbility());
// {W}, {tap}: You may play the exiled card without paying its mana cost if you attacked with three or more creatures this turn.
diff --git a/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java b/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java
index a631cbf839..6249ea6ee6 100644
--- a/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java
+++ b/Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java
@@ -62,7 +62,10 @@ public class SerraAscendant extends CardImpl {
this.power = new MageInt(1);
this.toughness = new MageInt(1);
+ // Lifelink (Damage dealt by this creature also causes you to gain that much life.)
this.addAbility(LifelinkAbility.getInstance());
+
+ // As long as you have 30 or more life, Serra Ascendant gets +5/+5 and has flying.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SerraAscendantEffect()));
}
diff --git a/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java b/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java
index 24c54246ef..61e118d124 100644
--- a/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java
+++ b/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java
@@ -31,13 +31,13 @@ import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
-import mage.abilities.Ability;
-import mage.abilities.effects.RestrictionEffect;
import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.abilities.effects.common.combat.CantBlockAllEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.AbilityPredicate;
import mage.target.common.TargetLandPermanent;
/**
@@ -45,15 +45,22 @@ import mage.target.common.TargetLandPermanent;
* @author North
*/
public class TectonicRift extends CardImpl {
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures without flying");
+ static {
+ filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class)));
+ }
+
public TectonicRift(UUID ownerId) {
super(ownerId, 157, "Tectonic Rift", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}");
this.expansionSetCode = "M12";
-
+ // Destroy target land.
this.getSpellAbility().addEffect(new DestroyTargetEffect());
this.getSpellAbility().addTarget(new TargetLandPermanent());
- this.getSpellAbility().addEffect(new TectonicRiftEffect());
+ // Creatures without flying can't block this turn.
+ this.getSpellAbility().addEffect(new CantBlockAllEffect(filter, Duration.EndOfTurn));
}
public TectonicRift(final TectonicRift card) {
@@ -65,34 +72,3 @@ public class TectonicRift extends CardImpl {
return new TectonicRift(this);
}
}
-
-class TectonicRiftEffect extends RestrictionEffect {
-
- TectonicRiftEffect() {
- super(Duration.EndOfTurn);
- staticText = "Creatures without flying can't block this turn";
- }
-
- TectonicRiftEffect(final TectonicRiftEffect effect) {
- super(effect);
- }
-
- @Override
- public boolean applies(Permanent permanent, Ability source, Game game) {
- if (!permanent.getAbilities().contains(FlyingAbility.getInstance())) {
- return true;
- }
- return false;
- }
-
- @Override
- public TectonicRiftEffect copy() {
- return new TectonicRiftEffect(this);
- }
-
- @Override
- public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) {
- return false;
- }
-
-}
diff --git a/Mage.Sets/src/mage/sets/magic2013/RingOfThune.java b/Mage.Sets/src/mage/sets/magic2013/RingOfThune.java
index 637c8521d8..08c01e41a5 100644
--- a/Mage.Sets/src/mage/sets/magic2013/RingOfThune.java
+++ b/Mage.Sets/src/mage/sets/magic2013/RingOfThune.java
@@ -67,7 +67,7 @@ public class RingOfThune extends CardImpl {
// At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's white.
TriggeredAbility triggeredAbility = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(1), TargetController.YOU, false);
- ConditionalTriggeredAbility ability = new ConditionalTriggeredAbility(triggeredAbility, new EquippedMatchesFilterCondition(filter), "At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's white");
+ ConditionalTriggeredAbility ability = new ConditionalTriggeredAbility(triggeredAbility, new EquippedMatchesFilterCondition(filter), "At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's white.");
this.addAbility(ability);
// Equip {1}
diff --git a/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java b/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java
index 0323d02555..a9f736fb55 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java
@@ -228,7 +228,7 @@ class ChandraPyromasterEffect2 extends OneShotEffect {
class ChandraPyromasterCastFromExileEffect extends AsThoughEffectImpl {
public ChandraPyromasterCastFromExileEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
staticText = "You may play the card from exile this turn";
}
diff --git a/Mage.Sets/src/mage/sets/magic2014/ScourgeOfValkas.java b/Mage.Sets/src/mage/sets/magic2014/ScourgeOfValkas.java
index 509aebbab1..a164346158 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ScourgeOfValkas.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ScourgeOfValkas.java
@@ -30,7 +30,7 @@ package mage.sets.magic2014;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.dynamicvalue.DynamicValue;
@@ -78,7 +78,7 @@ public class ScourgeOfValkas extends CardImpl {
// Whenever Scourge of Valkas or another Dragon enters the battlefield under your control, it deals X damage to target creature or player, where X is the number of Dragons you control.
DynamicValue dragons = new PermanentsOnBattlefieldCount(filter2);
- Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(dragons), filter, false, rule);
+ Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(dragons), filter, false, rule);
ability.addTarget(new TargetCreatureOrPlayer());
this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/magic2014/SeismicStomp.java b/Mage.Sets/src/mage/sets/magic2014/SeismicStomp.java
index a8d57175e1..a35907ae63 100644
--- a/Mage.Sets/src/mage/sets/magic2014/SeismicStomp.java
+++ b/Mage.Sets/src/mage/sets/magic2014/SeismicStomp.java
@@ -28,29 +28,34 @@
package mage.sets.magic2014;
import java.util.UUID;
-import mage.abilities.Ability;
-import mage.abilities.effects.RestrictionEffect;
+import mage.abilities.effects.common.combat.CantBlockAllEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.AbilityPredicate;
/**
*
* @author jeffwadsworth
*/
public class SeismicStomp extends CardImpl {
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures without flying");
+ static {
+ filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class)));
+ }
+
public SeismicStomp(UUID ownerId) {
super(ownerId, 152, "Seismic Stomp", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{R}");
this.expansionSetCode = "M14";
-
// Creatures without flying can't block this turn.
- this.getSpellAbility().addEffect(new SeismicStompEffect());
+ this.getSpellAbility().addEffect(new CantBlockAllEffect(filter, Duration.EndOfTurn));
}
public SeismicStomp(final SeismicStomp card) {
@@ -62,34 +67,3 @@ public class SeismicStomp extends CardImpl {
return new SeismicStomp(this);
}
}
-
-class SeismicStompEffect extends RestrictionEffect {
-
- SeismicStompEffect() {
- super(Duration.EndOfTurn);
- staticText = "Creatures without flying can't block this turn";
- }
-
- SeismicStompEffect(final SeismicStompEffect effect) {
- super(effect);
- }
-
- @Override
- public boolean applies(Permanent permanent, Ability source, Game game) {
- if (!permanent.getAbilities().contains(FlyingAbility.getInstance())) {
- return true;
- }
- return false;
- }
-
- @Override
- public SeismicStompEffect copy() {
- return new SeismicStompEffect(this);
- }
-
- @Override
- public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) {
- return false;
- }
-
-}
diff --git a/Mage.Sets/src/mage/sets/magic2015/ActOnImpulse.java b/Mage.Sets/src/mage/sets/magic2015/ActOnImpulse.java
index 7779ef4b83..3034e346a4 100644
--- a/Mage.Sets/src/mage/sets/magic2015/ActOnImpulse.java
+++ b/Mage.Sets/src/mage/sets/magic2015/ActOnImpulse.java
@@ -119,7 +119,7 @@ class ActOnImpulseMayPlayExiledEffect extends AsThoughEffectImpl {
public List<UUID> cards = new ArrayList<>();
public ActOnImpulseMayPlayExiledEffect(List<UUID> cards) {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
this.cards.addAll(cards);
}
diff --git a/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java b/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java
index 98442e2a75..9d23e6719a 100644
--- a/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java
+++ b/Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java
@@ -46,7 +46,6 @@ import mage.constants.Rarity;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.AttackingPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
diff --git a/Mage.Sets/src/mage/sets/magicorigins/BlazingHellhound.java b/Mage.Sets/src/mage/sets/magicorigins/BlazingHellhound.java
new file mode 100644
index 0000000000..c8dd7b764a
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/BlazingHellhound.java
@@ -0,0 +1,82 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.SacrificeTargetCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.permanent.AnotherPredicate;
+import mage.target.common.TargetControlledPermanent;
+import mage.target.common.TargetCreatureOrPlayer;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class BlazingHellhound extends CardImpl {
+
+ private static final FilterControlledPermanent filter = new FilterControlledCreaturePermanent("another creature");
+
+ static {
+ filter.add(new AnotherPredicate());
+ }
+
+ public BlazingHellhound(UUID ownerId) {
+ super(ownerId, 210, "Blazing Hellhound", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}{R}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Elemental");
+ this.subtype.add("Hound");
+ this.power = new MageInt(4);
+ this.toughness = new MageInt(3);
+
+ // {1}, Sacrifice another creature: Blazing Hellhound deals 1 damage to target creature or player.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}"));
+ ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter)));
+ ability.addTarget(new TargetCreatureOrPlayer());
+ this.addAbility(ability);
+ }
+
+ public BlazingHellhound(final BlazingHellhound card) {
+ super(card);
+ }
+
+ @Override
+ public BlazingHellhound copy() {
+ return new BlazingHellhound(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/BlessedSpirits.java b/Mage.Sets/src/mage/sets/magicorigins/BlessedSpirits.java
new file mode 100644
index 0000000000..2564e3ab3b
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/BlessedSpirits.java
@@ -0,0 +1,75 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SpellCastControllerTriggeredAbility;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.counters.CounterType;
+import mage.filter.FilterSpell;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class BlessedSpirits extends CardImpl {
+
+ private static final FilterSpell filter = new FilterSpell("an enchantment spell");
+ static {
+ filter.add(new CardTypePredicate(CardType.ENCHANTMENT));
+ }
+
+ public BlessedSpirits(UUID ownerId) {
+ super(ownerId, 7, "Blessed Spirits", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{W}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Spirit");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(2);
+
+ // Flying
+ this.addAbility(FlyingAbility.getInstance());
+
+ // Whenever you cast an enchantment spell, put a +1/+1 counter on Blessed Spirits.
+ this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filter, false));
+ }
+
+ public BlessedSpirits(final BlessedSpirits card) {
+ super(card);
+ }
+
+ @Override
+ public BlessedSpirits copy() {
+ return new BlessedSpirits(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/BoggartBrute.java b/Mage.Sets/src/mage/sets/magicorigins/BoggartBrute.java
new file mode 100644
index 0000000000..e4778a4b55
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/BoggartBrute.java
@@ -0,0 +1,63 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.keyword.MenaceAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class BoggartBrute extends CardImpl {
+
+ public BoggartBrute(UUID ownerId) {
+ super(ownerId, 133, "Boggart Brute", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Goblin");
+ this.subtype.add("Warrior");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(2);
+
+ // Menace
+ this.addAbility(new MenaceAbility());
+ }
+
+ public BoggartBrute(final BoggartBrute card) {
+ super(card);
+ }
+
+ @Override
+ public BoggartBrute copy() {
+ return new BoggartBrute(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ChandraFireOfKaladesh.java b/Mage.Sets/src/mage/sets/magicorigins/ChandraFireOfKaladesh.java
new file mode 100644
index 0000000000..a81cf2576b
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/ChandraFireOfKaladesh.java
@@ -0,0 +1,96 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.common.SpellCastControllerTriggeredAbility;
+import mage.abilities.condition.common.SourceDealtDamageCondition;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.decorator.ConditionalOneShotEffect;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.effects.common.ExileAndReturnTransformedSourceEffect;
+import mage.abilities.effects.common.ExileAndReturnTransformedSourceEffect.Gender;
+import mage.abilities.effects.common.UntapSourceEffect;
+import mage.abilities.keyword.TransformAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.FilterSpell;
+import mage.filter.predicate.mageobject.ColorPredicate;
+import mage.target.TargetPlayer;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class ChandraFireOfKaladesh extends CardImpl {
+
+ private static final FilterSpell filter = new FilterSpell("a red spell");
+
+ static {
+ filter.add(new ColorPredicate(ObjectColor.RED));
+ }
+
+ public ChandraFireOfKaladesh(UUID ownerId) {
+ super(ownerId, 135, "Chandra, Fire of Kaladesh", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{1}{R}{R}");
+ this.expansionSetCode = "ORI";
+ this.supertype.add("Legendary");
+ this.subtype.add("Human");
+ this.subtype.add("Shaman");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(2);
+
+ this.canTransform = true;
+ this.secondSideCard = new ChandraRoaringFlame(ownerId);
+
+ // Whenever you cast a red spell, untap Chandra, Fire of Kaladesh.
+ this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, false));
+
+ // {T}: Chandra, Fire of Kaladesh deals 1 damage to target player. If Chandra has dealt 3 or more damage this turn, exile her, then return her to the battlefield transformed under her owner's control.
+ this.addAbility(new TransformAbility());
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost());
+ ability.addEffect(new ConditionalOneShotEffect(new ExileAndReturnTransformedSourceEffect(Gender.FEMAL), new SourceDealtDamageCondition(3)));
+ ability.addTarget(new TargetPlayer());
+ this.addAbility(ability);
+
+ }
+
+ public ChandraFireOfKaladesh(final ChandraFireOfKaladesh card) {
+ super(card);
+ }
+
+ @Override
+ public ChandraFireOfKaladesh copy() {
+ return new ChandraFireOfKaladesh(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ChandraRoaringFlame.java b/Mage.Sets/src/mage/sets/magicorigins/ChandraRoaringFlame.java
new file mode 100644
index 0000000000..a12cfc19dd
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/ChandraRoaringFlame.java
@@ -0,0 +1,146 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.LoyaltyAbility;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.DamageSelfEffect;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.counters.CounterType;
+import mage.game.Game;
+import mage.game.command.Emblem;
+import mage.players.Player;
+import mage.target.TargetPlayer;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class ChandraRoaringFlame extends CardImpl {
+
+ public ChandraRoaringFlame(UUID ownerId) {
+ super(ownerId, 135, "Chandra, Roaring Flame", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Chandra");
+ this.color.setRed(true);
+
+ this.nightCard = true;
+ this.canTransform = true;
+
+ this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)), false));
+
+ // +1: Chandra, Roaring Flame deals 2 damage to target player.
+ LoyaltyAbility loyaltyAbility = new LoyaltyAbility(new DamageTargetEffect(2), 1);
+ loyaltyAbility.addTarget(new TargetPlayer());
+ this.addAbility(loyaltyAbility);
+
+ //-2: Chandra, Roaring Flame deals 2 damage to target creature.
+ loyaltyAbility = new LoyaltyAbility(new DamageTargetEffect(2), -2);
+ loyaltyAbility.addTarget(new TargetCreaturePermanent());
+ this.addAbility(loyaltyAbility);
+
+ //-7: Chandra, Roaring Flame deals 6 damage to each opponent. Each player dealt damage this way gets an emblem with "At the beginning of your upkeep, this emblem deals 3 damage to you."
+ this.addAbility(new LoyaltyAbility(new ChandraRoaringFlameEmblemEffect(), -7));
+
+
+ }
+
+ public ChandraRoaringFlame(final ChandraRoaringFlame card) {
+ super(card);
+ }
+
+ @Override
+ public ChandraRoaringFlame copy() {
+ return new ChandraRoaringFlame(this);
+ }
+}
+
+class ChandraRoaringFlameEmblemEffect extends OneShotEffect {
+
+ public ChandraRoaringFlameEmblemEffect() {
+ super(Outcome.Damage);
+ this.staticText = "{this} deals 6 damage to each opponent. Each player dealt damage this way gets an emblem with \"At the beginning of your upkeep, this emblem deals 3 damage to you.\"";
+ }
+
+ public ChandraRoaringFlameEmblemEffect(final ChandraRoaringFlameEmblemEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public ChandraRoaringFlameEmblemEffect copy() {
+ return new ChandraRoaringFlameEmblemEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Player controller = game.getPlayer(source.getControllerId());
+ if (controller != null) {
+ List<Player> opponentsEmblem = new ArrayList<>();
+ for(UUID playerId: game.getOpponents(controller.getId())) {
+ Player opponent = game.getPlayer(playerId);
+ if (opponent != null) {
+ if (opponent.damage(6, source.getSourceId(), game, false, true) > 0) {
+ opponentsEmblem.add(opponent);
+ }
+ }
+ }
+ for (Player opponent : opponentsEmblem) {
+ game.addEmblem(new ChandraRoaringFlameEmblem(), source, opponent.getId());
+ }
+ }
+ return false;
+ }
+}
+
+/**
+ * Emblem with "At the beginning of your upkeep, this emblem deals 3 damage to you."
+ */
+class ChandraRoaringFlameEmblem extends Emblem {
+
+ public ChandraRoaringFlameEmblem() {
+ setName("EMBLEM: Chandra, Roaring Flame");
+ Effect effect = new DamageTargetEffect(3);
+ effect.setText("this emblem deals 3 damage to you");
+ this.getAbilities().add(new BeginningOfUpkeepTriggeredAbility(Zone.COMMAND, effect, TargetController.YOU, false, true));
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/magicorigins/DeadbridgeShaman.java b/Mage.Sets/src/mage/sets/magicorigins/DeadbridgeShaman.java
new file mode 100644
index 0000000000..1acfb3132e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/DeadbridgeShaman.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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.DiesTriggeredAbility;
+import mage.abilities.effects.common.discard.DiscardTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.target.common.TargetOpponent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class DeadbridgeShaman extends CardImpl {
+
+ public DeadbridgeShaman(UUID ownerId) {
+ super(ownerId, 91, "Deadbridge Shaman", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Elf");
+ this.subtype.add("Shaman");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(1);
+
+ // When Deadbridge Shaman dies, target opponent discards a card.
+ Ability ability = new DiesTriggeredAbility(new DiscardTargetEffect(1));
+ ability.addTarget(new TargetOpponent());
+ this.addAbility(ability);
+ }
+
+ public DeadbridgeShaman(final DeadbridgeShaman card) {
+ super(card);
+ }
+
+ @Override
+ public DeadbridgeShaman copy() {
+ return new DeadbridgeShaman(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/DwynenGiltLeafDaen.java b/Mage.Sets/src/mage/sets/magicorigins/DwynenGiltLeafDaen.java
new file mode 100644
index 0000000000..6dbf311ece
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/DwynenGiltLeafDaen.java
@@ -0,0 +1,85 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.AttacksTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.abilities.effects.common.continuous.BoostControlledEffect;
+import mage.abilities.keyword.ReachAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.AttackingPredicate;
+
+/**
+ *
+ * @author emerald000
+ */
+public class DwynenGiltLeafDaen extends CardImpl {
+
+ private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Elf", "attacking Elf you control");
+ static {
+ filter.add(new AttackingPredicate());
+ }
+
+ public DwynenGiltLeafDaen(UUID ownerId) {
+ super(ownerId, 172, "Dwynen, Gilt-Leaf Daen", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}");
+ this.expansionSetCode = "ORI";
+ this.supertype.add("Legendary");
+ this.subtype.add("Elf");
+ this.subtype.add("Warrior");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(4);
+
+ // Reach
+ this.addAbility(ReachAbility.getInstance());
+
+ // Other Elf creatures you control get +1/+1.
+ this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent("Elf", "Elf creatures"), true)));
+
+ // Whenever Dwynen, Gilt-Leaf Daen attacks, you gain 1 life for each attacking Elf you control.
+ this.addAbility(new AttacksTriggeredAbility(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter)), false));
+ }
+
+ public DwynenGiltLeafDaen(final DwynenGiltLeafDaen card) {
+ super(card);
+ }
+
+ @Override
+ public DwynenGiltLeafDaen copy() {
+ return new DwynenGiltLeafDaen(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ElementalBond.java b/Mage.Sets/src/mage/sets/magicorigins/ElementalBond.java
new file mode 100644
index 0000000000..4c0b67a0c3
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/ElementalBond.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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.Filter.ComparisonType;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.predicate.mageobject.PowerPredicate;
+
+/**
+ *
+ * @author emerald000
+ */
+public class ElementalBond extends CardImpl {
+
+ private static final FilterPermanent filter = new FilterControlledCreaturePermanent("creature with power 3 or greater");
+ static {
+ filter.add(new PowerPredicate(ComparisonType.GreaterThan, 2));
+ }
+
+ public ElementalBond(UUID ownerId) {
+ super(ownerId, 174, "Elemental Bond", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}");
+ this.expansionSetCode = "ORI";
+
+ // Whenever a creature with power 3 or greater enters the battlefield under your control, draw a card.
+ this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new DrawCardSourceControllerEffect(1), filter));
+ }
+
+ public ElementalBond(final ElementalBond card) {
+ super(card);
+ }
+
+ @Override
+ public ElementalBond copy() {
+ return new ElementalBond(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/EnthrallingVictor.java b/Mage.Sets/src/mage/sets/magicorigins/EnthrallingVictor.java
new file mode 100644
index 0000000000..231b0d9ac5
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/EnthrallingVictor.java
@@ -0,0 +1,90 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.UntapTargetEffect;
+import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
+import mage.abilities.effects.common.continuous.GainControlTargetEffect;
+import mage.abilities.keyword.HasteAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.filter.Filter;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.PowerPredicate;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.target.common.TargetCreaturePermanent;
+
+
+/**
+ *
+ * @author LevelX2
+ */
+public class EnthrallingVictor extends CardImpl {
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls with power 2 or less");
+
+ static {
+ filter.add(new PowerPredicate(Filter.ComparisonType.LessThan, 3));
+ filter.add(new ControllerPredicate(TargetController.OPPONENT));
+ }
+
+ public EnthrallingVictor(UUID ownerId) {
+ super(ownerId, 142, "Enthralling Victor", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Human");
+ this.subtype.add("Warrior");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(2);
+
+ // When Enthralling Victor enters the battlefield, gain control of target creature an opponent controls with power 2 or less until end of turn. Untap that creature. It gains haste until end of turn.
+ Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn, true), false);
+ Effect effect = new UntapTargetEffect();
+ effect.setText("untap that creature");
+ ability.addEffect(effect);
+ ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn, "it gains haste until end of turn"));
+ ability.addTarget(new TargetCreaturePermanent(filter));
+ this.addAbility(ability);
+ }
+
+ public EnthrallingVictor(final EnthrallingVictor card) {
+ super(card);
+ }
+
+ @Override
+ public EnthrallingVictor copy() {
+ return new EnthrallingVictor(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/EyeblightAssassin.java b/Mage.Sets/src/mage/sets/magicorigins/EyeblightAssassin.java
new file mode 100644
index 0000000000..39512764c9
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/EyeblightAssassin.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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class EyeblightAssassin extends CardImpl {
+
+ private static final FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls");
+
+ static {
+ filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT));
+ }
+
+ public EyeblightAssassin(UUID ownerId) {
+ super(ownerId, 95, "Eyeblight Assassin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Elf");
+ this.subtype.add("Assassin");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(2);
+
+ // When Eyeblight Assassin enters the battlefield, target creature an opponent controls gets -1/-1 until end of turn.
+ Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(-1,-1, Duration.EndOfTurn));
+ ability.addTarget(new TargetCreaturePermanent(filterOpponentCreature));
+ this.addAbility(ability);
+ }
+
+ public EyeblightAssassin(final EyeblightAssassin card) {
+ super(card);
+ }
+
+ @Override
+ public EyeblightAssassin copy() {
+ return new EyeblightAssassin(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/HixusPrisonWarden.java b/Mage.Sets/src/mage/sets/magicorigins/HixusPrisonWarden.java
index bc5db55e56..43db2e99f1 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/HixusPrisonWarden.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/HixusPrisonWarden.java
@@ -63,7 +63,7 @@ public class HixusPrisonWarden extends CardImpl {
this.subtype.add("Human");
this.subtype.add("Soldier");
this.power = new MageInt(4);
- this.toughness = new MageInt(44);
+ this.toughness = new MageInt(4);
// Flash
this.addAbility(FlashAbility.getInstance());
diff --git a/Mage.Sets/src/mage/sets/magicorigins/JhessianThief.java b/Mage.Sets/src/mage/sets/magicorigins/JhessianThief.java
new file mode 100644
index 0000000000..c92a125cee
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/JhessianThief.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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.keyword.ProwessAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class JhessianThief extends CardImpl {
+
+ public JhessianThief(UUID ownerId) {
+ super(ownerId, 62, "Jhessian Thief", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{U}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Human");
+ this.subtype.add("Rogue");
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(3);
+
+ // Prowess
+ this.addAbility(new ProwessAbility());
+
+ // Whenever Jhessian Thief deals combat damage to a player, draw a card.
+ this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DrawCardSourceControllerEffect(1), false));
+ }
+
+ public JhessianThief(final JhessianThief card) {
+ super(card);
+ }
+
+ @Override
+ public JhessianThief copy() {
+ return new JhessianThief(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/Languish.java b/Mage.Sets/src/mage/sets/magicorigins/Languish.java
new file mode 100644
index 0000000000..d97d157cd9
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/Languish.java
@@ -0,0 +1,59 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.abilities.effects.common.continuous.BoostAllEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class Languish extends CardImpl {
+
+ public Languish(UUID ownerId) {
+ super(ownerId, 105, "Languish", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{B}{B}");
+ this.expansionSetCode = "ORI";
+
+ // All creatures get -4/-4 until end of turn.
+ this.getSpellAbility().addEffect(new BoostAllEffect(-4, -4, Duration.EndOfTurn));
+ }
+
+ public Languish(final Languish card) {
+ super(card);
+ }
+
+ @Override
+ public Languish copy() {
+ return new Languish(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/LightningJavelin.java b/Mage.Sets/src/mage/sets/magicorigins/LightningJavelin.java
new file mode 100644
index 0000000000..f81246bc81
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/LightningJavelin.java
@@ -0,0 +1,63 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.effects.keyword.ScryEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.target.common.TargetCreatureOrPlayer;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class LightningJavelin extends CardImpl {
+
+ public LightningJavelin(UUID ownerId) {
+ super(ownerId, 153, "Lightning Javelin", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}");
+ this.expansionSetCode = "ORI";
+
+ // Lightning Javelin deals 3 damage to target creature or player.
+ this.getSpellAbility().addEffect(new DamageTargetEffect(3));
+ this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
+ // Scry 1.
+ this.getSpellAbility().addEffect(new ScryEffect(1));
+ }
+
+ public LightningJavelin(final LightningJavelin card) {
+ super(card);
+ }
+
+ @Override
+ public LightningJavelin copy() {
+ return new LightningJavelin(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/MalakirCullblade.java b/Mage.Sets/src/mage/sets/magicorigins/MalakirCullblade.java
new file mode 100644
index 0000000000..cff4821e9d
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/MalakirCullblade.java
@@ -0,0 +1,74 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.DiesCreatureTriggeredAbility;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.counters.CounterType;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class MalakirCullblade extends CardImpl {
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature an opponent controls");
+
+ static {
+ filter.add(new ControllerPredicate(TargetController.OPPONENT));
+ }
+
+ public MalakirCullblade(UUID ownerId) {
+ super(ownerId, 108, "Malakir Cullblade", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{B}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Vampire");
+ this.subtype.add("Warrior");
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(1);
+
+ // Whenever a creature an opponent controls dies, put a +1/+1 counter on Malakir Cullblade.
+ this.addAbility(new DiesCreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, filter));
+ }
+
+ public MalakirCullblade(final MalakirCullblade card) {
+ super(card);
+ }
+
+ @Override
+ public MalakirCullblade copy() {
+ return new MalakirCullblade(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/MizziumMeddler.java b/Mage.Sets/src/mage/sets/magicorigins/MizziumMeddler.java
new file mode 100644
index 0000000000..9521c64b23
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/MizziumMeddler.java
@@ -0,0 +1,170 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.keyword.FlashAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.game.Game;
+import mage.game.stack.Spell;
+import mage.game.stack.StackAbility;
+import mage.game.stack.StackObject;
+import mage.players.Player;
+import mage.target.Target;
+import mage.target.TargetStackObject;
+import mage.target.Targets;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class MizziumMeddler extends CardImpl {
+
+ public MizziumMeddler(UUID ownerId) {
+ super(ownerId, 64, "Mizzium Meddler", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{U}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Vedalken");
+ this.subtype.add("Wizard");
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(4);
+
+ // Flash
+ this.addAbility(FlashAbility.getInstance());
+
+ // When Mizzium Meddler enters the battlefield, change a target of target spell or ability to Mizzium Meddler.
+ Ability ability = new EntersBattlefieldTriggeredAbility(new MizziumMeddlerEffect());
+ ability.addTarget(new TargetStackObject());
+ this.addAbility(ability);
+ }
+
+ public MizziumMeddler(final MizziumMeddler card) {
+ super(card);
+ }
+
+ @Override
+ public MizziumMeddler copy() {
+ return new MizziumMeddler(this);
+ }
+}
+
+class MizziumMeddlerEffect extends OneShotEffect {
+
+ public MizziumMeddlerEffect() {
+ super(Outcome.Neutral);
+ staticText = "Change a target of target spell or ability to {this}";
+ }
+
+ public MizziumMeddlerEffect(final MizziumMeddlerEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ StackObject stackObject = game.getStack().getStackObject(source.getFirstTarget());
+ MageObject sourceObject = game.getObject(source.getSourceId());
+ if (stackObject != null && sourceObject != null) {
+ Targets targets;
+ Ability sourceAbility;
+ MageObject oldTarget = null;
+ if (stackObject instanceof Spell) {
+ Spell spell = (Spell)stackObject;
+ sourceAbility = spell.getSpellAbility();
+ targets = spell.getSpellAbility().getTargets();
+ } else if (stackObject instanceof StackAbility) {
+ StackAbility stackAbility = (StackAbility)stackObject;
+ sourceAbility = stackAbility;
+ targets = stackAbility.getTargets();
+ } else {
+ return false;
+ }
+ boolean twoTimesTarget = false;
+ if (targets.size() == 1 && targets.get(0).getTargets().size() == 1) {
+ Target target = targets.get(0);
+ if (target.canTarget(stackObject.getControllerId(), source.getSourceId(), sourceAbility, game)) {
+ oldTarget = game.getObject(targets.getFirstTarget());
+ target.clearChosen();
+ // The source is still the spell on the stack
+ target.addTarget(source.getSourceId(), stackObject.getStackAbility(), game);
+ }
+ } else {
+ Player player = game.getPlayer(source.getControllerId());
+ for (Target target: targets) {
+ for (UUID targetId: target.getTargets()) {
+ MageObject object = game.getObject(targetId);
+ String name;
+ if (object == null) {
+ Player targetPlayer = game.getPlayer(targetId);
+ name = targetPlayer.getLogName();
+ } else {
+ name = object.getName();
+ }
+ if (!targetId.equals(source.getSourceId()) && target.getTargets().contains(source.getSourceId())) {
+ // you can't change this target to MizziumMeddler because MizziumMeddler is already another targetId of that target.
+ twoTimesTarget = true;
+ continue;
+ }
+ if (name != null && player.chooseUse(Outcome.Neutral, new StringBuilder("Change target from ").append(name).append(" to ").append(sourceObject.getName()).append("?").toString(), game)) {
+ if (target.canTarget(stackObject.getControllerId(), source.getSourceId(), sourceAbility, game)) {
+ oldTarget = game.getObject(targets.getFirstTarget());
+ target.remove(targetId);
+ // The source is still the spell on the stack
+ target.addTarget(source.getSourceId(), stackObject.getStackAbility(), game);
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (oldTarget != null) {
+ game.informPlayers(sourceObject.getLogName() + ": Changed target of " +stackObject.getLogName() + " from " + oldTarget.getLogName() + " to " + sourceObject.getLogName());
+ } else {
+ if (twoTimesTarget) {
+ game.informPlayers(sourceObject.getLogName() + ": Target not changed to " + sourceObject.getLogName() + " because its not valid to target it twice for " + stackObject.getName());
+ } else {
+ game.informPlayers(sourceObject.getLogName() + ": Target not changed to " + sourceObject.getLogName() + " because its no valid target for " + stackObject.getName());
+ }
+ }
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public MizziumMeddlerEffect copy() {
+ return new MizziumMeddlerEffect(this);
+ }
+
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/magicorigins/PatronOfTheValiant.java b/Mage.Sets/src/mage/sets/magicorigins/PatronOfTheValiant.java
new file mode 100644
index 0000000000..33ad7ae926
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/PatronOfTheValiant.java
@@ -0,0 +1,112 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.counters.CounterType;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.CounterPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class PatronOfTheValiant extends CardImpl {
+
+ public PatronOfTheValiant(UUID ownerId) {
+ super(ownerId, 28, "Patron of the Valiant", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}{W}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Angel");
+ this.power = new MageInt(4);
+ this.toughness = new MageInt(4);
+
+ // Flying
+ this.addAbility(FlyingAbility.getInstance());
+
+ // When Patron of the Valiant enters the battlefield, put a +1/+1 counter on each creature you control with a +1/+1 counter on it.
+ this.addAbility(new EntersBattlefieldTriggeredAbility(new PatronOfTheValiantEffect()));
+ }
+
+ public PatronOfTheValiant(final PatronOfTheValiant card) {
+ super(card);
+ }
+
+ @Override
+ public PatronOfTheValiant copy() {
+ return new PatronOfTheValiant(this);
+ }
+}
+
+class PatronOfTheValiantEffect extends OneShotEffect {
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
+
+ static {
+ filter.add(new CounterPredicate(CounterType.P1P1));
+ }
+
+ public PatronOfTheValiantEffect() {
+ super(Outcome.Benefit);
+ this.staticText = "put a +1/+1 counter on each creature you control with a +1/+1 counter on it.";
+ }
+
+ public PatronOfTheValiantEffect(final PatronOfTheValiantEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public PatronOfTheValiantEffect copy() {
+ return new PatronOfTheValiantEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Player controller = game.getPlayer(source.getControllerId());
+ MageObject sourceObject = source.getSourceObject(game);
+ if (controller != null && sourceObject != null) {
+ for(Permanent permanent: game.getState().getBattlefield().getAllActivePermanents(filter , controller.getId(), game)) {
+ permanent.addCounters(CounterType.P1P1.createInstance(), game);
+ game.informPlayers(sourceObject.getName() + ": Put a +1/+1 counter on " + permanent.getLogName());
+ }
+ }
+ return true;
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/PiaAndKiranNalaar.java b/Mage.Sets/src/mage/sets/magicorigins/PiaAndKiranNalaar.java
new file mode 100644
index 0000000000..62aa3fc788
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/PiaAndKiranNalaar.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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.SacrificeTargetCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledArtifactPermanent;
+import mage.game.permanent.token.Token;
+import mage.target.common.TargetControlledPermanent;
+import mage.target.common.TargetCreatureOrPlayer;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class PiaAndKiranNalaar extends CardImpl {
+
+ public PiaAndKiranNalaar(UUID ownerId) {
+ super(ownerId, 157, "Pia and Kiran Nalaar", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}{R}");
+ this.expansionSetCode = "ORI";
+ this.supertype.add("Legendary");
+ this.subtype.add("Human");
+ this.subtype.add("Artificer");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(2);
+
+ // When Pia and Kiran Nalaar enters the battlefield put 2 1/1 colorless Thopter artifact creature tokens with flying onto the battlefield.
+ this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PiaAndKiranNalaarThopterToken(), 2)));
+
+ // {2}{R}, Sacrifice an artifact: Pia and Kiran Nalaar deals 2 damage to target creature or player.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}"));
+ ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(1,1, new FilterControlledArtifactPermanent("an artifact"),true)));
+ ability.addTarget(new TargetCreatureOrPlayer());
+ this.addAbility(ability);
+ }
+
+ public PiaAndKiranNalaar(final PiaAndKiranNalaar card) {
+ super(card);
+ }
+
+ @Override
+ public PiaAndKiranNalaar copy() {
+ return new PiaAndKiranNalaar(this);
+ }
+}
+
+
+class PiaAndKiranNalaarThopterToken extends Token {
+ PiaAndKiranNalaarThopterToken() {
+ super("Thopter", "a 1/1 colorless Thopter artifact creature token with flying");
+ cardType.add(CardType.CREATURE);
+ cardType.add(CardType.ARTIFACT);
+ subtype.add("Thopter");
+ power = new MageInt(1);
+ toughness = new MageInt(1);
+ this.addAbility(FlyingAbility.getInstance());
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/magicorigins/RabidBloodsucker.java b/Mage.Sets/src/mage/sets/magicorigins/RabidBloodsucker.java
new file mode 100644
index 0000000000..41d8ed865f
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/RabidBloodsucker.java
@@ -0,0 +1,67 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.LoseLifeAllPlayersEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class RabidBloodsucker extends CardImpl {
+
+ public RabidBloodsucker(UUID ownerId) {
+ super(ownerId, 113, "Rabid Bloodsucker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{B}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Vampire");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(2);
+
+ // Flying
+ this.addAbility(FlyingAbility.getInstance());
+
+ // When Rabid Bloodsucker enters the battlefield, each player loses 2 life.
+ this.addAbility(new EntersBattlefieldTriggeredAbility(new LoseLifeAllPlayersEffect(2), false));
+ }
+
+ public RabidBloodsucker(final RabidBloodsucker card) {
+ super(card);
+ }
+
+ @Override
+ public RabidBloodsucker copy() {
+ return new RabidBloodsucker(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/RavagingBlaze.java b/Mage.Sets/src/mage/sets/magicorigins/RavagingBlaze.java
new file mode 100644
index 0000000000..15d9672c16
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/RavagingBlaze.java
@@ -0,0 +1,105 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.condition.common.SpellMasteryCondition;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class RavagingBlaze extends CardImpl {
+
+ public RavagingBlaze(UUID ownerId) {
+ super(ownerId, 159, "Ravaging Blaze", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{R}{R}");
+ this.expansionSetCode = "ORI";
+
+ // Ravaging Blaze deals X damage to target creature.
+ // <i>Spell mastery</i> — If there are two or more instant and/or sorcery cards in your graveyard, Ravaging Blaze also deals X damage to that creature's controller.
+ this.getSpellAbility().addEffect(new RavagingBlazeEffect());
+ this.getSpellAbility().addTarget(new TargetCreaturePermanent());
+ }
+
+ public RavagingBlaze(final RavagingBlaze card) {
+ super(card);
+ }
+
+ @Override
+ public RavagingBlaze copy() {
+ return new RavagingBlaze(this);
+ }
+}
+
+class RavagingBlazeEffect extends OneShotEffect {
+
+ public RavagingBlazeEffect() {
+ super(Outcome.Damage);
+ staticText = "{this} deals X damage to target creature.<br>"
+ + "<i>Spell mastery</i> — If there are two or more instant and/or sorcery cards in your graveyard, {this} also deals X damage to that creature's controller.";
+ }
+
+ public RavagingBlazeEffect(final RavagingBlazeEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public RavagingBlazeEffect copy() {
+ return new RavagingBlazeEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
+ if (permanent != null) {
+ int xValue = source.getManaCostsToPay().getX();
+ if (xValue > 0) {
+ permanent.damage(xValue, source.getSourceId(), game, false, true);
+ if (SpellMasteryCondition.getInstance().apply(game, source)) {
+ Player targetController = game.getPlayer(permanent.getControllerId());
+ if (targetController != null) {
+ targetController.damage(xValue, source.getSourceId(), game, false, true);
+ }
+ }
+ }
+ return true;
+ }
+ return false;
+ }
+
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ReaveSoul.java b/Mage.Sets/src/mage/sets/magicorigins/ReaveSoul.java
new file mode 100644
index 0000000000..8a55934f72
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/ReaveSoul.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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.Filter;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.PowerPredicate;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ReaveSoul extends CardImpl {
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 3 or less");
+
+ static {
+ filter.add(new PowerPredicate(Filter.ComparisonType.LessThan, 4));
+ }
+
+ public ReaveSoul(UUID ownerId) {
+ super(ownerId, 115, "Reave Soul", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}");
+ this.expansionSetCode = "ORI";
+
+ // Destroy target creature with power 3 or less.
+ this.getSpellAbility().addEffect(new DestroyTargetEffect());
+ this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+ }
+
+ public ReaveSoul(final ReaveSoul card) {
+ super(card);
+ }
+
+ @Override
+ public ReaveSoul copy() {
+ return new ReaveSoul(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/SeismicElemental.java b/Mage.Sets/src/mage/sets/magicorigins/SeismicElemental.java
new file mode 100644
index 0000000000..3f67be9e03
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/SeismicElemental.java
@@ -0,0 +1,74 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.combat.CantBlockAllEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.AbilityPredicate;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class SeismicElemental extends CardImpl {
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures without flying");
+
+ static {
+ filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class)));
+ }
+
+ public SeismicElemental(UUID ownerId) {
+ super(ownerId, 161, "Seismic Elemental", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{R}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Elemental");
+ this.power = new MageInt(4);
+ this.toughness = new MageInt(4);
+
+ // When Seismic Elemental enters the battlefield, creatures without flying can't block this turn.
+ this.addAbility(new EntersBattlefieldTriggeredAbility(new CantBlockAllEffect(filter, Duration.EndOfTurn), false));
+ }
+
+ public SeismicElemental(final SeismicElemental card) {
+ super(card);
+ }
+
+ @Override
+ public SeismicElemental copy() {
+ return new SeismicElemental(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ShamblingGhoul.java b/Mage.Sets/src/mage/sets/magicorigins/ShamblingGhoul.java
new file mode 100644
index 0000000000..b13d42776d
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/ShamblingGhoul.java
@@ -0,0 +1,65 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.effects.common.TapSourceEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ShamblingGhoul extends CardImpl {
+
+ private static final String staticText = "{this} enters the battlefield tapped";
+
+ public ShamblingGhoul(UUID ownerId) {
+ super(ownerId, 119, "Shambling Ghoul", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Zombie");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(3);
+
+ // Shambling Ghoul enters the battlefield tapped.
+ this.addAbility(new EntersBattlefieldAbility(new TapSourceEffect(), staticText));
+ }
+
+ public ShamblingGhoul(final ShamblingGhoul card) {
+ super(card);
+ }
+
+ @Override
+ public ShamblingGhoul copy() {
+ return new ShamblingGhoul(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/SubterraneanScout.java b/Mage.Sets/src/mage/sets/magicorigins/SubterraneanScout.java
new file mode 100644
index 0000000000..9604a67346
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/SubterraneanScout.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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.Filter;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.PowerPredicate;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class SubterraneanScout extends CardImpl {
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 2 or less");
+
+ static {
+ filter.add(new PowerPredicate(Filter.ComparisonType.LessThan, 3));
+ }
+
+ public SubterraneanScout(UUID ownerId) {
+ super(ownerId, 164, "Subterranean Scout", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Goblin");
+ this.subtype.add("Scout");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(1);
+
+ // When Subterranean Scout enters the battlefield, target creature with power 2 or less can't be blocked this turn.
+ Ability ability = new EntersBattlefieldTriggeredAbility(new CantBeBlockedTargetEffect(), false);
+ ability.addTarget(new TargetCreaturePermanent(filter));
+ this.addAbility(ability);
+
+ }
+
+ public SubterraneanScout(final SubterraneanScout card) {
+ super(card);
+ }
+
+ @Override
+ public SubterraneanScout copy() {
+ return new SubterraneanScout(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/VolcanicRambler.java b/Mage.Sets/src/mage/sets/magicorigins/VolcanicRambler.java
new file mode 100644
index 0000000000..17361c9fc8
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/VolcanicRambler.java
@@ -0,0 +1,71 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.target.TargetPlayer;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class VolcanicRambler extends CardImpl {
+
+ public VolcanicRambler(UUID ownerId) {
+ super(ownerId, 167, "Volcanic Rambler", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{R}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Elemental");
+ this.power = new MageInt(6);
+ this.toughness = new MageInt(4);
+
+ // {2}{R}: Volcanic Rambler deals 1 damage to target player.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{2}{R}"));
+ ability.addCost(new TapSourceCost());
+ ability.addTarget(new TargetPlayer());
+ this.addAbility(ability);
+ }
+
+ public VolcanicRambler(final VolcanicRambler card) {
+ super(card);
+ }
+
+ @Override
+ public VolcanicRambler copy() {
+ return new VolcanicRambler(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/magicorigins/ZendikarIncarnate.java b/Mage.Sets/src/mage/sets/magicorigins/ZendikarIncarnate.java
new file mode 100644
index 0000000000..d5d9a205d0
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/magicorigins/ZendikarIncarnate.java
@@ -0,0 +1,73 @@
+/*
+ * 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.sets.magicorigins;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
+import mage.abilities.effects.common.continuous.SetPowerSourceEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledLandPermanent;
+import mage.filter.common.FilterControlledPermanent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ZendikarIncarnate extends CardImpl {
+
+ private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("lands you control");
+
+ public ZendikarIncarnate(UUID ownerId) {
+ super(ownerId, 219, "Zendikar Incarnate", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}{G}");
+ this.expansionSetCode = "ORI";
+ this.subtype.add("Elemental");
+ this.power = new MageInt(0);
+ this.toughness = new MageInt(4);
+
+ DynamicValue controlledLands = new PermanentsOnBattlefieldCount(filter);
+
+ // Zendikar Incarnate's power is equal to the amount of lands you control.
+ this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerSourceEffect(controlledLands, Duration.EndOfGame)));
+ }
+
+ public ZendikarIncarnate(final ZendikarIncarnate card) {
+ super(card);
+ }
+
+ @Override
+ public ZendikarIncarnate copy() {
+ return new ZendikarIncarnate(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/mastersedition/ApprenticeWizard.java b/Mage.Sets/src/mage/sets/mastersedition/ApprenticeWizard.java
new file mode 100644
index 0000000000..7269e5fe27
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/mastersedition/ApprenticeWizard.java
@@ -0,0 +1,70 @@
+/*
+ * 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.sets.mastersedition;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.Mana;
+import mage.abilities.Ability;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.mana.SimpleManaAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ApprenticeWizard extends CardImpl {
+
+ public ApprenticeWizard(UUID ownerId) {
+ super(ownerId, 30, "Apprentice Wizard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}");
+ this.expansionSetCode = "MED";
+ this.subtype.add("Human");
+ this.subtype.add("Wizard");
+ this.power = new MageInt(0);
+ this.toughness = new MageInt(1);
+
+ // {U}, {tap}: Add {3} to your mana pool.
+ Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(3), new ManaCostsImpl("{U}"));
+ ability.addCost(new TapSourceCost());
+ this.addAbility(ability);
+ }
+
+ public ApprenticeWizard(final ApprenticeWizard card) {
+ super(card);
+ }
+
+ @Override
+ public ApprenticeWizard copy() {
+ return new ApprenticeWizard(this);
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/mastersedition/CuombajjWitches.java b/Mage.Sets/src/mage/sets/mastersedition/CuombajjWitches.java
new file mode 100644
index 0000000000..88ec79f8ee
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/mastersedition/CuombajjWitches.java
@@ -0,0 +1,108 @@
+/*
+ * 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.sets.mastersedition;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.Cost;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.players.Player;
+import mage.target.Target;
+import mage.target.common.TargetCreatureOrPlayer;
+import mage.target.common.TargetOpponent;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class CuombajjWitches extends CardImpl {
+
+ private final UUID originalId;
+
+ public CuombajjWitches(UUID ownerId) {
+ super(ownerId, 65, "Cuombajj Witches", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}{B}");
+ this.expansionSetCode = "MED";
+ this.subtype.add("Human");
+ this.subtype.add("Wizard");
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(3);
+
+ // {T}: Cuombajj Witches deals 1 damage to target creature or player and 1 damage to target creature or player of an opponent's choice.
+ Effect effect = new DamageTargetEffect(1);
+ effect.setText("{this} deals 1 damage to target creature or player and 1 damage to target creature or player of an opponent's choice");
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost());
+ ability.addTarget(new TargetCreatureOrPlayer());
+ ability.addTarget(new TargetCreatureOrPlayer());
+ this.addAbility(ability);
+ originalId = ability.getOriginalId();
+ }
+
+ @Override
+ public void adjustTargets(Ability ability, Game game) {
+ if(ability.getOriginalId().equals(originalId)) {
+ Player controller = game.getPlayer(ability.getControllerId());
+ if(controller != null) {
+ UUID opponentId = null;
+ if(game.getOpponents(controller.getId()).size() > 1) {
+ Target target = new TargetOpponent(true);
+ if(controller.chooseTarget(Outcome.Neutral, target, ability, game)) {
+ opponentId = target.getFirstTarget();
+ }
+ }
+ else {
+ opponentId = game.getOpponents(controller.getId()).iterator().next();
+ }
+
+ if(opponentId != null) {
+ ability.getTargets().get(1).setTargetController(opponentId);
+ }
+ }
+ }
+ }
+
+ public CuombajjWitches(final CuombajjWitches card) {
+ super(card);
+ this.originalId = card.originalId;
+ }
+
+ @Override
+ public CuombajjWitches copy() {
+ return new CuombajjWitches(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Forcefield.java b/Mage.Sets/src/mage/sets/mastersedition/Forcefield.java
index cc7ebcd252..dd707a170d 100644
--- a/Mage.Sets/src/mage/sets/mastersedition/Forcefield.java
+++ b/Mage.Sets/src/mage/sets/mastersedition/Forcefield.java
@@ -28,6 +28,7 @@
package mage.sets.mastersedition;
import java.util.UUID;
+import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.GenericManaCost;
@@ -45,6 +46,7 @@ import mage.filter.predicate.permanent.UnblockedPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
+import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.Target;
import mage.target.common.TargetCreaturePermanent;
@@ -98,9 +100,14 @@ class ForcefieldEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
- if (controller != null) {
+ MageObject sourceObject = source.getSourceObject(game);
+ if (controller != null && sourceObject != null) {
Target target = new TargetCreaturePermanent(1, 1, filter, true);
if (controller.choose(Outcome.PreventDamage, target, source.getSourceId(), game)) {
+ Permanent creature = game.getPermanent(target.getFirstTarget());
+ if (creature != null) {
+ game.informPlayers(sourceObject.getLogName() + ": " + controller.getLogName() + " has chosen " + creature.getLogName());
+ }
ContinuousEffect effect = new ForcefieldPreventionEffect();
effect.setTargetPointer(new FixedTarget(target.getFirstTarget()));
game.addEffect(effect, source);
diff --git a/Mage.Sets/src/mage/sets/mastersedition/IvoryTower.java b/Mage.Sets/src/mage/sets/mastersedition/IvoryTower.java
new file mode 100644
index 0000000000..02ee9f8193
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/mastersedition/IvoryTower.java
@@ -0,0 +1,55 @@
+/*
+ * 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.sets.mastersedition;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class IvoryTower extends mage.sets.antiquities.IvoryTower {
+
+ public IvoryTower(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 158;
+ this.expansionSetCode = "MED";
+ this.rarity = Rarity.RARE;
+ }
+
+ public IvoryTower(final IvoryTower card) {
+ super(card);
+ }
+
+ @Override
+ public IvoryTower copy() {
+ return new IvoryTower(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/mastersedition/Onulet.java b/Mage.Sets/src/mage/sets/mastersedition/Onulet.java
new file mode 100644
index 0000000000..95231f592f
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/mastersedition/Onulet.java
@@ -0,0 +1,63 @@
+/*
+ * 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.sets.mastersedition;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.DiesTriggeredAbility;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class Onulet extends CardImpl {
+
+ public Onulet(UUID ownerId) {
+ super(ownerId, 161, "Onulet", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}");
+ this.expansionSetCode = "MED";
+ this.subtype.add("Construct");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(2);
+
+ // When Onulet dies, you gain 2 life.
+ this.addAbility(new DiesTriggeredAbility(new GainLifeEffect(2)));
+ }
+
+ public Onulet(final Onulet card) {
+ super(card);
+ }
+
+ @Override
+ public Onulet copy() {
+ return new Onulet(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/mastersedition/SuChi.java b/Mage.Sets/src/mage/sets/mastersedition/SuChi.java
new file mode 100644
index 0000000000..5a7c9a2f0c
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/mastersedition/SuChi.java
@@ -0,0 +1,55 @@
+/*
+ * 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.sets.mastersedition;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class SuChi extends mage.sets.vintagemasters.SuChi {
+
+ public SuChi(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 168;
+ this.expansionSetCode = "MED";
+ this.rarity = Rarity.RARE;
+ }
+
+ public SuChi(final SuChi card) {
+ super(card);
+ }
+
+ @Override
+ public SuChi copy() {
+ return new SuChi(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditionii/ElvishHunter.java b/Mage.Sets/src/mage/sets/masterseditionii/ElvishHunter.java
new file mode 100644
index 0000000000..8fc917f695
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditionii/ElvishHunter.java
@@ -0,0 +1,74 @@
+/*
+ * 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.sets.masterseditionii;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class ElvishHunter extends CardImpl {
+
+ public ElvishHunter(UUID ownerId) {
+ super(ownerId, 157, "Elvish Hunter", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}");
+ this.expansionSetCode = "ME2";
+ this.subtype.add("Elf");
+ this.subtype.add("Archer");
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(1);
+
+ // {1}{G}, {tap}: Target creature doesn't untap during its controller's next untap step.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DontUntapInControllersNextUntapStepTargetEffect("Target creature"),
+ new ManaCostsImpl("{1}{G}"));
+ ability.addCost(new TapSourceCost());
+ ability.addTarget(new TargetCreaturePermanent());
+ this.addAbility(ability);
+ }
+
+ public ElvishHunter(final ElvishHunter card) {
+ super(card);
+ }
+
+ @Override
+ public ElvishHunter copy() {
+ return new ElvishHunter(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniii/ConcordantCrossroads.java b/Mage.Sets/src/mage/sets/masterseditioniii/ConcordantCrossroads.java
new file mode 100644
index 0000000000..8a0a0ed3b7
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniii/ConcordantCrossroads.java
@@ -0,0 +1,65 @@
+/*
+ * 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.sets.masterseditioniii;
+
+import java.util.UUID;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.continuous.GainAbilityAllEffect;
+import mage.abilities.keyword.HasteAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ConcordantCrossroads extends CardImpl {
+
+ public ConcordantCrossroads(UUID ownerId) {
+ super(ownerId, 114, "Concordant Crossroads", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}");
+ this.expansionSetCode = "ME3";
+ this.supertype.add("World");
+
+ // All creatures have haste.
+ this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
+ new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent("Creatures"))));
+ }
+
+ public ConcordantCrossroads(final ConcordantCrossroads card) {
+ super(card);
+ }
+
+ @Override
+ public ConcordantCrossroads copy() {
+ return new ConcordantCrossroads(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/AcidRain.java b/Mage.Sets/src/mage/sets/masterseditioniv/AcidRain.java
new file mode 100644
index 0000000000..7a67797042
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/AcidRain.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.masterseditioniv;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class AcidRain extends mage.sets.legends.AcidRain {
+
+ public AcidRain(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 36;
+ this.expansionSetCode = "ME4";
+ }
+
+ public AcidRain(final AcidRain card) {
+ super(card);
+ }
+
+ @Override
+ public AcidRain copy() {
+ return new AcidRain(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/AlluringScent.java b/Mage.Sets/src/mage/sets/masterseditioniv/AlluringScent.java
new file mode 100644
index 0000000000..2053b9ea44
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/AlluringScent.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.masterseditioniv;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class AlluringScent extends mage.sets.portal.AlluringScent {
+
+ public AlluringScent(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 141;
+ this.expansionSetCode = "ME4";
+ this.rarity = Rarity.COMMON;
+ }
+
+ public AlluringScent(final AlluringScent card) {
+ super(card);
+ }
+
+ @Override
+ public AlluringScent copy() {
+ return new AlluringScent(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/BeeSting.java b/Mage.Sets/src/mage/sets/masterseditioniv/BeeSting.java
new file mode 100644
index 0000000000..262aa8869d
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/BeeSting.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.masterseditioniv;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class BeeSting extends mage.sets.portal.BeeSting {
+
+ public BeeSting(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 144;
+ this.expansionSetCode = "ME4";
+ }
+
+ public BeeSting(final BeeSting card) {
+ super(card);
+ }
+
+ @Override
+ public BeeSting copy() {
+ return new BeeSting(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/CitanulDruid.java b/Mage.Sets/src/mage/sets/masterseditioniv/CitanulDruid.java
new file mode 100644
index 0000000000..8db6b13cd7
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/CitanulDruid.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.masterseditioniv;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class CitanulDruid extends mage.sets.antiquities.CitanulDruid {
+
+ public CitanulDruid(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 146;
+ this.expansionSetCode = "ME4";
+ this.rarity = Rarity.COMMON;
+ }
+
+ public CitanulDruid(final CitanulDruid card) {
+ super(card);
+ }
+
+ @Override
+ public CitanulDruid copy() {
+ return new CitanulDruid(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/CloudDragon.java b/Mage.Sets/src/mage/sets/masterseditioniv/CloudDragon.java
new file mode 100644
index 0000000000..b46cadad06
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/CloudDragon.java
@@ -0,0 +1,66 @@
+/*
+ * 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.sets.masterseditioniv;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.CanBlockOnlyFlyingAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class CloudDragon extends CardImpl {
+
+ public CloudDragon(UUID ownerId) {
+ super(ownerId, 41, "Cloud Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{U}");
+ this.expansionSetCode = "ME4";
+ this.subtype.add("Illusion");
+ this.subtype.add("Dragon");
+ this.power = new MageInt(5);
+ this.toughness = new MageInt(4);
+
+ // Flying
+ this.addAbility(FlyingAbility.getInstance());
+ // Cloud Dragon can block only creatures with flying.
+ this.addAbility(new CanBlockOnlyFlyingAbility());
+ }
+
+ public CloudDragon(final CloudDragon card) {
+ super(card);
+ }
+
+ @Override
+ public CloudDragon copy() {
+ return new CloudDragon(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/FireTempest.java b/Mage.Sets/src/mage/sets/masterseditioniv/FireTempest.java
new file mode 100644
index 0000000000..8e2e2697e5
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/FireTempest.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.masterseditioniv;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class FireTempest extends mage.sets.portal.FireTempest {
+
+ public FireTempest(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 114;
+ this.expansionSetCode = "ME4";
+ }
+
+ public FireTempest(final FireTempest card) {
+ super(card);
+ }
+
+ @Override
+ public FireTempest copy() {
+ return new FireTempest(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/HornOfDeafening.java b/Mage.Sets/src/mage/sets/masterseditioniv/HornOfDeafening.java
new file mode 100644
index 0000000000..6b16f5612e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/HornOfDeafening.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.masterseditioniv;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class HornOfDeafening extends mage.sets.legends.HornOfDeafening {
+
+ public HornOfDeafening(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 205;
+ this.expansionSetCode = "ME4";
+ this.rarity = Rarity.UNCOMMON;
+ }
+
+ public HornOfDeafening(final HornOfDeafening card) {
+ super(card);
+ }
+
+ @Override
+ public HornOfDeafening copy() {
+ return new HornOfDeafening(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/IronhoofOx.java b/Mage.Sets/src/mage/sets/masterseditioniv/IronhoofOx.java
new file mode 100644
index 0000000000..29324fa3a0
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/IronhoofOx.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.masterseditioniv;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class IronhoofOx extends mage.sets.portalsecondage.IronhoofOx {
+
+ public IronhoofOx(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 158;
+ this.expansionSetCode = "ME4";
+ this.rarity = Rarity.COMMON;
+ }
+
+ public IronhoofOx(final IronhoofOx card) {
+ super(card);
+ }
+
+ @Override
+ public IronhoofOx copy() {
+ return new IronhoofOx(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/LavaFlow.java b/Mage.Sets/src/mage/sets/masterseditioniv/LavaFlow.java
new file mode 100644
index 0000000000..031f2f567b
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/LavaFlow.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.masterseditioniv;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class LavaFlow extends mage.sets.portal.LavaFlow {
+
+ public LavaFlow(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 126;
+ this.expansionSetCode = "ME4";
+ this.rarity = Rarity.COMMON;
+ }
+
+ public LavaFlow(final LavaFlow card) {
+ super(card);
+ }
+
+ @Override
+ public LavaFlow copy() {
+ return new LavaFlow(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Onulet.java b/Mage.Sets/src/mage/sets/masterseditioniv/Onulet.java
new file mode 100644
index 0000000000..32b52d24d5
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/Onulet.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.masterseditioniv;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class Onulet extends mage.sets.mastersedition.Onulet {
+
+ public Onulet(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 219;
+ this.expansionSetCode = "ME4";
+ }
+
+ public Onulet(final Onulet card) {
+ super(card);
+ }
+
+ @Override
+ public Onulet copy() {
+ return new Onulet(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalForces.java b/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalForces.java
new file mode 100644
index 0000000000..57aa8ede81
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalForces.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.masterseditioniv;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces {
+
+ public PhantasmalForces(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 55;
+ this.expansionSetCode = "ME4";
+ this.rarity = Rarity.COMMON;
+ }
+
+ public PhantasmalForces(final PhantasmalForces card) {
+ super(card);
+ }
+
+ @Override
+ public PhantasmalForces copy() {
+ return new PhantasmalForces(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SedgeTroll.java b/Mage.Sets/src/mage/sets/masterseditioniv/SedgeTroll.java
new file mode 100644
index 0000000000..777d8b153e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SedgeTroll.java
@@ -0,0 +1,77 @@
+/*
+ * 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.sets.masterseditioniv;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.RegenerateSourceEffect;
+import mage.abilities.effects.common.continuous.BoostSourceWhileControlsEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class SedgeTroll extends CardImpl {
+
+ private static final FilterPermanent filter = new FilterPermanent("Swamp");
+
+ static {
+ filter.add(new SubtypePredicate("Swamp"));
+ }
+
+ public SedgeTroll(UUID ownerId) {
+ super(ownerId, 135, "Sedge Troll", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}");
+ this.expansionSetCode = "ME4";
+ this.subtype.add("Troll");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(2);
+
+ // Sedge Troll gets +1/+1 as long as you control a Swamp.
+ this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1)));
+ // {B}: Regenerate Sedge Troll.
+ this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")));
+ }
+
+ public SedgeTroll(final SedgeTroll card) {
+ super(card);
+ }
+
+ @Override
+ public SedgeTroll copy() {
+ return new SedgeTroll(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SerraAviary.java b/Mage.Sets/src/mage/sets/masterseditioniv/SerraAviary.java
new file mode 100644
index 0000000000..1822f4bd11
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/SerraAviary.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.masterseditioniv;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class SerraAviary extends mage.sets.homelands.SerraAviary {
+
+ public SerraAviary(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 26;
+ this.expansionSetCode = "ME4";
+ this.rarity = Rarity.UNCOMMON;
+ }
+
+ public SerraAviary(final SerraAviary card) {
+ super(card);
+ }
+
+ @Override
+ public SerraAviary copy() {
+ return new SerraAviary(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/StaffOfZegon.java b/Mage.Sets/src/mage/sets/masterseditioniv/StaffOfZegon.java
new file mode 100644
index 0000000000..62d35af6fe
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/masterseditioniv/StaffOfZegon.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.sets.masterseditioniv;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class StaffOfZegon extends CardImpl {
+
+ public StaffOfZegon(UUID ownerId) {
+ super(ownerId, 229, "Staff of Zegon", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{4}");
+ this.expansionSetCode = "ME4";
+
+ // {3}, {tap}: Target creature gets -2/-0 until end of turn.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl("{3}"));
+ ability.addCost(new TapSourceCost());
+ ability.addTarget(new TargetCreaturePermanent());
+ this.addAbility(ability);
+ }
+
+ public StaffOfZegon(final StaffOfZegon card) {
+ super(card);
+ }
+
+ @Override
+ public StaffOfZegon copy() {
+ return new StaffOfZegon(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/DiplomaticImmunity.java b/Mage.Sets/src/mage/sets/mercadianmasques/DiplomaticImmunity.java
new file mode 100644
index 0000000000..b8bcda5eff
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/DiplomaticImmunity.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.sets.mercadianmasques;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.abilities.keyword.ShroudAbility;
+import mage.cards.CardImpl;
+import mage.constants.AttachmentType;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class DiplomaticImmunity extends CardImpl {
+
+ public DiplomaticImmunity(UUID ownerId) {
+ super(ownerId, 75, "Diplomatic Immunity", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}");
+ this.expansionSetCode = "MMQ";
+ this.subtype.add("Aura");
+
+ // Enchant creature
+ TargetPermanent auraTarget = new TargetCreaturePermanent();
+ this.getSpellAbility().addTarget(auraTarget);
+ this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
+ Ability ability = new EnchantAbility(auraTarget.getTargetName());
+ this.addAbility(ability);
+
+ // Shroud
+ this.addAbility(ShroudAbility.getInstance());
+
+ // Enchanted creature has shroud.
+ this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA)));
+ }
+
+ public DiplomaticImmunity(final DiplomaticImmunity card) {
+ super(card);
+ }
+
+ @Override
+ public DiplomaticImmunity copy() {
+ return new DiplomaticImmunity(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/FalseDemise.java b/Mage.Sets/src/mage/sets/mercadianmasques/FalseDemise.java
new file mode 100644
index 0000000000..045f899846
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/FalseDemise.java
@@ -0,0 +1,74 @@
+/*
+ * 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.sets.mercadianmasques;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.DiesAttachedTriggeredAbility;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlAttachedEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class FalseDemise extends CardImpl {
+
+ public FalseDemise(UUID ownerId) {
+ super(ownerId, 80, "False Demise", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}");
+ this.expansionSetCode = "MMQ";
+ this.subtype.add("Aura");
+
+ // Enchant creature
+ TargetPermanent auraTarget = new TargetCreaturePermanent();
+ this.getSpellAbility().addTarget(auraTarget);
+ this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
+ Ability ability = new EnchantAbility(auraTarget.getTargetName());
+ this.addAbility(ability);
+
+ // When enchanted creature dies, return that card to the battlefield under your control.
+ this.addAbility(new DiesAttachedTriggeredAbility(new ReturnToBattlefieldUnderYourControlAttachedEffect(), "enchanted creature"));
+ }
+
+ public FalseDemise(final FalseDemise card) {
+ super(card);
+ }
+
+ @Override
+ public FalseDemise copy() {
+ return new FalseDemise(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/mirage/ChokingSands.java b/Mage.Sets/src/mage/sets/mirage/ChokingSands.java
new file mode 100644
index 0000000000..5ecbfc820c
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/mirage/ChokingSands.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.mirage;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ChokingSands extends mage.sets.vintagemasters.ChokingSands {
+
+ public ChokingSands(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 11;
+ this.expansionSetCode = "MIR";
+ }
+
+ public ChokingSands(final ChokingSands card) {
+ super(card);
+ }
+
+ @Override
+ public ChokingSands copy() {
+ return new ChokingSands(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ArcSlogger.java b/Mage.Sets/src/mage/sets/mirrodin/ArcSlogger.java
new file mode 100644
index 0000000000..5566992025
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/mirrodin/ArcSlogger.java
@@ -0,0 +1,72 @@
+/*
+ * 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.sets.mirrodin;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.ExileFromTopOfLibraryCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.target.common.TargetCreatureOrPlayer;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class ArcSlogger extends CardImpl {
+
+ public ArcSlogger(UUID ownerId) {
+ super(ownerId, 85, "Arc-Slogger", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}{R}");
+ this.expansionSetCode = "MRD";
+ this.subtype.add("Beast");
+ this.power = new MageInt(4);
+ this.toughness = new MageInt(5);
+
+ // {R}, Exile the top ten cards of your library: Arc-Slogger deals 2 damage to target creature or player.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}"));
+ ability.addCost(new ExileFromTopOfLibraryCost(10));
+ ability.addTarget(new TargetCreatureOrPlayer());
+ this.addAbility(ability);
+ }
+
+ public ArcSlogger(final ArcSlogger card) {
+ super(card);
+ }
+
+ @Override
+ public ArcSlogger copy() {
+ return new ArcSlogger(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/mirrodin/BetrayalOfFlesh.java b/Mage.Sets/src/mage/sets/mirrodin/BetrayalOfFlesh.java
index b947a3451f..50d0a33d43 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/BetrayalOfFlesh.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/BetrayalOfFlesh.java
@@ -66,7 +66,7 @@ public class BetrayalOfFlesh extends CardImpl {
mode.getTargets().add(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
this.getSpellAbility().getModes().addMode(mode);
// Entwine-Sacrifice three lands.
- this.addAbility(new EntwineAbility(new SacrificeTargetCost(new TargetControlledPermanent(3, 3, new FilterControlledLandPermanent(), true))));
+ this.addAbility(new EntwineAbility(new SacrificeTargetCost(new TargetControlledPermanent(3, 3, new FilterControlledLandPermanent("three lands"), true))));
}
public BetrayalOfFlesh(final BetrayalOfFlesh card) {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java b/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
index f90d0a851a..6000151549 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
@@ -113,11 +113,10 @@ class ScytheOfTheWretchedTriggeredAbility extends TriggeredAbilityImpl {
ZoneChangeEvent zoneChange = (ZoneChangeEvent) event;
if (zoneChange.isDiesEvent() && zoneChange.getTarget().getCardType().contains(CardType.CREATURE)) {
Permanent equippedCreature = getEquippedCreature(game);
- if (equippedCreature == null) {
- return false;
- }
for (MageObjectReference mor : zoneChange.getTarget().getDealtDamageByThisTurn()) {
- if (mor.refersTo(equippedCreature, game)) {
+ Permanent permanent = (Permanent) game.getLastKnownInformation(mor.getSourceId(), Zone.BATTLEFIELD);
+ if((equippedCreature != null && mor.refersTo(equippedCreature, game))
+ || (permanent != null && permanent.getAttachments().contains(getSourceId()))) {
setTarget(new FixedTarget(event.getTargetId()));
return true;
}
diff --git a/Mage.Sets/src/mage/sets/modernmasters2015/WorldheartPhoenix.java b/Mage.Sets/src/mage/sets/modernmasters2015/WorldheartPhoenix.java
index b5053cf16b..b9ca13546a 100644
--- a/Mage.Sets/src/mage/sets/modernmasters2015/WorldheartPhoenix.java
+++ b/Mage.Sets/src/mage/sets/modernmasters2015/WorldheartPhoenix.java
@@ -86,7 +86,7 @@ public class WorldheartPhoenix extends CardImpl {
class WorldheartPhoenixPlayEffect extends AsThoughEffectImpl {
public WorldheartPhoenixPlayEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
staticText = "You may cast {this} from your graveyard by paying {W}{U}{B}{R}{G} rather than paying its mana cost";
}
diff --git a/Mage.Sets/src/mage/sets/morningtide/StonybrookSchoolmaster.java b/Mage.Sets/src/mage/sets/morningtide/StonybrookSchoolmaster.java
new file mode 100644
index 0000000000..691d5c6c07
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/morningtide/StonybrookSchoolmaster.java
@@ -0,0 +1,65 @@
+/*
+ * 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.sets.morningtide;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.BecomesTappedTriggeredAbility;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.game.permanent.token.MerfolkWizardToken;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class StonybrookSchoolmaster extends CardImpl {
+
+ public StonybrookSchoolmaster(UUID ownerId) {
+ super(ownerId, 25, "Stonybrook Schoolmaster", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}");
+ this.expansionSetCode = "MOR";
+ this.subtype.add("Merfolk");
+ this.subtype.add("Wizard");
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(2);
+
+ // Whenever Stonybrook Schoolmaster becomes tapped, you may put a 1/1 blue Merfolk Wizard creature token onto the battlefield.
+ this.addAbility(new BecomesTappedTriggeredAbility(new CreateTokenEffect(new MerfolkWizardToken()), true));
+ }
+
+ public StonybrookSchoolmaster(final StonybrookSchoolmaster card) {
+ super(card);
+ }
+
+ @Override
+ public StonybrookSchoolmaster copy() {
+ return new StonybrookSchoolmaster(this);
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/morningtide/SupremeExemplar.java b/Mage.Sets/src/mage/sets/morningtide/SupremeExemplar.java
new file mode 100644
index 0000000000..77b80554c8
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/morningtide/SupremeExemplar.java
@@ -0,0 +1,74 @@
+/*
+ * 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.sets.morningtide;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.keyword.ChampionAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class SupremeExemplar extends CardImpl {
+
+ private static final FilterControlledPermanent filter = new FilterControlledPermanent("Elemental");
+
+ static {
+ filter.add(new SubtypePredicate("Elemental"));
+ }
+
+ public SupremeExemplar(UUID ownerId) {
+ super(ownerId, 53, "Supreme Exemplar", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{6}{U}");
+ this.expansionSetCode = "MOR";
+ this.subtype.add("Elemental");
+ this.power = new MageInt(10);
+ this.toughness = new MageInt(10);
+
+ // Flying
+ this.addAbility(FlyingAbility.getInstance());
+
+ // Champion an Elemental
+ this.addAbility(new ChampionAbility(this, "Elemental"));
+ }
+
+ public SupremeExemplar(final SupremeExemplar card) {
+ super(card);
+ }
+
+ @Override
+ public SupremeExemplar copy() {
+ return new SupremeExemplar(this);
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java
index 6948b40a29..681c7882c4 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java
@@ -30,7 +30,6 @@ package mage.sets.newphyrexia;
import java.util.UUID;
import mage.constants.CardType;
-import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.MageInt;
@@ -38,7 +37,6 @@ import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.EntersBattlefieldEffect;
-import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.CopyPermanentEffect;
import mage.cards.CardImpl;
import mage.filter.FilterPermanent;
@@ -46,9 +44,6 @@ import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
-import mage.players.Player;
-import mage.target.Target;
-import mage.target.TargetPermanent;
import mage.util.functions.ApplyToPermanent;
/**
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java b/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java
index 82ea8bc081..79671b6128 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java
@@ -121,7 +121,7 @@ class PraetorsGraspPlayEffect extends AsThoughEffectImpl {
private UUID cardId;
public PraetorsGraspPlayEffect(UUID cardId) {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit);
this.cardId = cardId;
staticText = "You may look at and play that card for as long as it remains exiled";
}
diff --git a/Mage.Sets/src/mage/sets/odyssey/Decompose.java b/Mage.Sets/src/mage/sets/odyssey/Decompose.java
new file mode 100644
index 0000000000..739a078133
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/odyssey/Decompose.java
@@ -0,0 +1,61 @@
+/*
+ * 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.sets.odyssey;
+
+import java.util.UUID;
+import mage.abilities.effects.common.ExileTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.FilterCard;
+import mage.target.common.TargetCardInASingleGraveyard;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class Decompose extends CardImpl {
+
+ public Decompose(UUID ownerId) {
+ super(ownerId, 128, "Decompose", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{B}");
+ this.expansionSetCode = "ODY";
+
+ // Exile up to three target cards from a single graveyard.
+ this.getSpellAbility().addEffect(new ExileTargetEffect());
+ this.getSpellAbility().addTarget(new TargetCardInASingleGraveyard(0, 3, new FilterCard("cards")));
+ }
+
+ public Decompose(final Decompose card) {
+ super(card);
+ }
+
+ @Override
+ public Decompose copy() {
+ return new Decompose(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/onslaught/AphettoAlchemist.java b/Mage.Sets/src/mage/sets/onslaught/AphettoAlchemist.java
new file mode 100644
index 0000000000..de5eaff598
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/onslaught/AphettoAlchemist.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.sets.onslaught;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.UntapTargetEffect;
+import mage.abilities.keyword.MorphAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.target.TargetPermanent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class AphettoAlchemist extends CardImpl {
+
+ private static final FilterPermanent filter = new FilterPermanent("artifact or creature");
+
+ static {
+ filter.add(Predicates.or(
+ new CardTypePredicate(CardType.ARTIFACT),
+ new CardTypePredicate(CardType.CREATURE)));
+ }
+
+ public AphettoAlchemist(UUID ownerId) {
+ super(ownerId, 64, "Aphetto Alchemist", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}");
+ this.expansionSetCode = "ONS";
+ this.subtype.add("Human");
+ this.subtype.add("Wizard");
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(2);
+
+ // {tap}: Untap target artifact or creature.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost());
+ ability.addTarget(new TargetPermanent(filter));
+ this.addAbility(ability);
+
+ // Morph {U}
+ this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}")));
+ }
+
+ public AphettoAlchemist(final AphettoAlchemist card) {
+ super(card);
+ }
+
+ @Override
+ public AphettoAlchemist copy() {
+ return new AphettoAlchemist(this);
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/onslaught/AvenSoulgazer.java b/Mage.Sets/src/mage/sets/onslaught/AvenSoulgazer.java
new file mode 100644
index 0000000000..10cdf3ad74
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/onslaught/AvenSoulgazer.java
@@ -0,0 +1,126 @@
+/*
+ * 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.sets.onslaught;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.Cards;
+import mage.cards.CardsImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.other.FaceDownPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class AvenSoulgazer extends CardImpl {
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("face down creature");
+
+ static {
+ filter.add(new FaceDownPredicate());
+ }
+
+ public AvenSoulgazer(UUID ownerId) {
+ super(ownerId, 8, "Aven Soulgazer", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}{W}");
+ this.expansionSetCode = "ONS";
+ this.subtype.add("Bird");
+ this.subtype.add("Cleric");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(3);
+
+ // Flying
+ this.addAbility(FlyingAbility.getInstance());
+
+ // {2}{W}: Look at target face-down creature.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AvenSoulgazerLookFaceDownEffect(), new ManaCostsImpl("{2}{W}"));
+ ability.addTarget(new TargetCreaturePermanent(filter));
+ this.addAbility(ability);
+ }
+
+ public AvenSoulgazer(final AvenSoulgazer card) {
+ super(card);
+ }
+
+ @Override
+ public AvenSoulgazer copy() {
+ return new AvenSoulgazer(this);
+ }
+}
+
+class AvenSoulgazerLookFaceDownEffect extends OneShotEffect {
+
+ public AvenSoulgazerLookFaceDownEffect() {
+ super(Outcome.Benefit);
+ this.staticText = "Look at target face-down creature";
+ }
+
+ public AvenSoulgazerLookFaceDownEffect(final AvenSoulgazerLookFaceDownEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public AvenSoulgazerLookFaceDownEffect copy() {
+ return new AvenSoulgazerLookFaceDownEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Player player = game.getPlayer(source.getControllerId());
+ MageObject mageObject = game.getObject(source.getSourceId());
+ if (player == null || mageObject == null) {
+ return false;
+ }
+ Permanent faceDownCreature = game.getPermanent(getTargetPointer().getFirst(game, source));
+ if (faceDownCreature != null) {
+ Permanent copyFaceDown = faceDownCreature.copy();
+ copyFaceDown.setFaceDown(false, game);
+ Cards cards = new CardsImpl();
+ cards.add(copyFaceDown);
+ player.lookAtCards("face down card - " + mageObject.getName(), cards, game);
+ } else {
+ return false;
+ }
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/onslaught/DisruptivePitmage.java b/Mage.Sets/src/mage/sets/onslaught/DisruptivePitmage.java
new file mode 100644
index 0000000000..471f920adf
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/onslaught/DisruptivePitmage.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.sets.onslaught;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.CounterUnlessPaysEffect;
+import mage.abilities.keyword.MorphAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.target.TargetSpell;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class DisruptivePitmage extends CardImpl {
+
+ public DisruptivePitmage(UUID ownerId) {
+ super(ownerId, 81, "Disruptive Pitmage", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}");
+ this.expansionSetCode = "ONS";
+ this.subtype.add("Human");
+ this.subtype.add("Wizard");
+ this.power = new MageInt(1);
+ this.toughness = new MageInt(1);
+
+ // {tap}: Counter target spell unless its controller pays {1}.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(1)), new TapSourceCost());
+ ability.addTarget(new TargetSpell());
+ this.addAbility(ability);
+
+ // Morph {U}
+ this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}")));
+ }
+
+ public DisruptivePitmage(final DisruptivePitmage card) {
+ super(card);
+ }
+
+ @Override
+ public DisruptivePitmage copy() {
+ return new DisruptivePitmage(this);
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/onslaught/NosyGoblin.java b/Mage.Sets/src/mage/sets/onslaught/NosyGoblin.java
new file mode 100644
index 0000000000..b82adb5110
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/onslaught/NosyGoblin.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.sets.onslaught;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.SacrificeSourceCost;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.other.FaceDownPredicate;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class NosyGoblin extends CardImpl {
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("face down creature");
+
+ static {
+ filter.add(new FaceDownPredicate());
+ }
+
+ public NosyGoblin(UUID ownerId) {
+ super(ownerId, 220, "Nosy Goblin", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}");
+ this.expansionSetCode = "ONS";
+ this.subtype.add("Goblin");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(1);
+
+ // {tap}, Sacrifice Nosy Goblin: Destroy target face-down creature.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
+ ability.addCost(new SacrificeSourceCost());
+ ability.addTarget(new TargetCreaturePermanent(filter));
+ this.addAbility(ability);
+ }
+
+ public NosyGoblin(final NosyGoblin card) {
+ super(card);
+ }
+
+ @Override
+ public NosyGoblin copy() {
+ return new NosyGoblin(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/onslaught/PatriarchsBidding.java b/Mage.Sets/src/mage/sets/onslaught/PatriarchsBidding.java
new file mode 100644
index 0000000000..e5a030662c
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/onslaught/PatriarchsBidding.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.sets.onslaught;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.repository.CardRepository;
+import mage.choices.Choice;
+import mage.choices.ChoiceImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.FilterCard;
+import mage.filter.common.FilterCreatureCard;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.game.Game;
+import mage.players.Player;
+
+/**
+ * @author duncant
+ */
+public class PatriarchsBidding extends CardImpl {
+
+ public PatriarchsBidding(UUID ownerId) {
+ super(ownerId, 161, "Patriarch's Bidding", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}{B}");
+ this.expansionSetCode = "ONS";
+
+ // Each player chooses a creature type. Each player returns all creature cards of a type chosen this way from his or her graveyard to the battlefield.
+ this.getSpellAbility().addEffect(new PatriarchsBiddingEffect());
+ }
+
+ public PatriarchsBidding(final PatriarchsBidding card) {
+ super(card);
+ }
+
+ @Override
+ public PatriarchsBidding copy() {
+ return new PatriarchsBidding(this);
+ }
+}
+
+class PatriarchsBiddingEffect extends OneShotEffect {
+
+ public PatriarchsBiddingEffect() {
+ super(Outcome.PutCreatureInPlay);
+ this.staticText = "Each player chooses a creature type. Each player returns all creature cards of a type chosen this way from his or her graveyard to the battlefield.";
+ }
+
+ public PatriarchsBiddingEffect(final PatriarchsBiddingEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public PatriarchsBiddingEffect copy() {
+ return new PatriarchsBiddingEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability ability) {
+ Player controller = game.getPlayer(ability.getControllerId());
+ MageObject sourceObject = game.getObject(ability.getSourceId());
+ if (controller != null) {
+ Set<String> chosenTypes = new HashSet<>();
+ for (UUID playerId : controller.getInRange()) {
+ Player player = game.getPlayer(playerId);
+ Choice typeChoice = new ChoiceImpl(true);
+ typeChoice.setMessage("Choose a creature type");
+ typeChoice.setChoices(CardRepository.instance.getCreatureTypes());
+ while (!player.choose(Outcome.PutCreatureInPlay, typeChoice, game)) {
+ if (!player.isInGame()) {
+ break;
+ }
+ }
+ String chosenType = typeChoice.getChoice();
+ if (chosenType != null) {
+ game.informPlayers(sourceObject.getName() + ": " + player.getLogName() + " has chosen " + chosenType);
+ chosenTypes.add(chosenType);
+ }
+ }
+
+ List<SubtypePredicate> predicates = new ArrayList<>();
+ for (String type : chosenTypes) {
+ predicates.add(new SubtypePredicate(type));
+ }
+ FilterCard filter = new FilterCreatureCard();
+ filter.add(Predicates.or(predicates));
+
+ for (UUID playerId : controller.getInRange()) {
+ Player player = game.getPlayer(playerId);
+ if (player != null) {
+ for (Card card : player.getGraveyard().getCards(filter, game)) {
+ player.putOntoBattlefieldWithInfo(card, game, Zone.GRAVEYARD, ability.getSourceId());
+ }
+ }
+ }
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/planarchaos/IntetTheDreamer.java b/Mage.Sets/src/mage/sets/planarchaos/IntetTheDreamer.java
index f286cdf5b9..ea9a46de99 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/IntetTheDreamer.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/IntetTheDreamer.java
@@ -121,7 +121,7 @@ class IntetTheDreamerExileEffect extends OneShotEffect {
class IntetTheDreamerEffect extends AsThoughEffectImpl {
public IntetTheDreamerEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit);
staticText = "You may play the card from exile without paying its mana cost for as long as {this} remains on the battlefield";
}
diff --git a/Mage.Sets/src/mage/sets/planeshift/ShiftingSky.java b/Mage.Sets/src/mage/sets/planeshift/ShiftingSky.java
index cf386bea42..571b76aae4 100644
--- a/Mage.Sets/src/mage/sets/planeshift/ShiftingSky.java
+++ b/Mage.Sets/src/mage/sets/planeshift/ShiftingSky.java
@@ -32,12 +32,15 @@ import mage.ObjectColor;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.effects.common.ChooseColorEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
+import mage.constants.SubLayer;
import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates;
@@ -48,7 +51,7 @@ import mage.players.Player;
/**
*
- * @author anonymous
+ * @author Luna Skyrise
*/
public class ShiftingSky extends CardImpl {
@@ -57,11 +60,10 @@ public class ShiftingSky extends CardImpl {
this.expansionSetCode = "PLS";
// As Shifting Sky enters the battlefield, choose a color.
- Ability ability = new EntersBattlefieldTriggeredAbility(new ChooseColorEffect(Outcome.Benefit));
- this.addAbility(ability);
- // All nonland permanents are the chosen color.
- Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new ShiftingSkyEffect());
- this.addAbility(ability2);
+ this.addAbility(new EntersBattlefieldTriggeredAbility(new ChooseColorEffect(Outcome.Detriment)));
+
+ // All nonland permanents are the chosen color.
+ this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ShiftingSkyEffect()));
}
public ShiftingSky(final ShiftingSky card) {
@@ -74,75 +76,42 @@ public class ShiftingSky extends CardImpl {
}
}
-class ShiftingSkyEffect extends OneShotEffect {
+class ShiftingSkyEffect extends ContinuousEffectImpl {
+
private static final FilterPermanent filter = new FilterPermanent("All nonland permanents");
static {
- filter.add(
- Predicates.not(
- new CardTypePredicate(CardType.LAND)
- )
- );
+ filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
}
-
+
public ShiftingSkyEffect() {
- super(Outcome.Benefit);
+ super(Duration.WhileOnBattlefield, Layer.ColorChangingEffects_5, SubLayer.NA, Outcome.Benefit);
staticText = "All nonland permanents are the chosen color";
}
- public ShiftingSkyEffect(final ShiftingSkyEffect effect) {
- super(effect);
- }
-
@Override
public boolean apply(Game game, Ability source) {
- Player player = game.getPlayer(source.getControllerId());
- Permanent permanent = game.getPermanent(source.getSourceId());
-
- if (player != null && permanent != null) {
+ Player controller = game.getPlayer(source.getControllerId());
+ if (controller != null) {
ObjectColor color = (ObjectColor) game.getState().getValue(source.getSourceId() + "_color");
-
if (color == null) {
return false;
}
-
- String colorString = color.toString();
-
- for (UUID playerId : player.getInRange()) {
- Player p = game.getPlayer(playerId);
- if (p != null) {
- for (Permanent chosen : game.getBattlefield().getAllActivePermanents(filter, playerId, game)) {
- setObject(chosen, colorString, game);
- }
- }
+ for (Permanent perm : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) {
+ perm.getColor(game).setColor(color);
}
return true;
}
return false;
}
-
+
@Override
public ShiftingSkyEffect copy() {
return new ShiftingSkyEffect(this);
}
- private void setObject(Permanent chosen, String colorString, Game game) {
- switch (colorString) {
- case "W":
- chosen.getColor(game).setWhite(true);
- break;
- case "B":
- chosen.getColor(game).setBlack(true);
- break;
- case "U":
- chosen.getColor(game).setBlue(true);
- break;
- case "G":
- chosen.getColor(game).setGreen(true);
- break;
- case "R":
- chosen.getColor(game).setRed(true);
- break;
- }
+ private ShiftingSkyEffect(ShiftingSkyEffect effect) {
+ super(effect);
}
+
}
diff --git a/Mage.Sets/src/mage/sets/portal/AlluringScent.java b/Mage.Sets/src/mage/sets/portal/AlluringScent.java
new file mode 100644
index 0000000000..fcd20fda21
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/portal/AlluringScent.java
@@ -0,0 +1,61 @@
+/*
+ * 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.sets.portal;
+
+import java.util.UUID;
+import mage.abilities.effects.common.combat.MustBeBlockedByAllTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class AlluringScent extends CardImpl {
+
+ public AlluringScent(UUID ownerId) {
+ super(ownerId, 61, "Alluring Scent", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{G}{G}");
+ this.expansionSetCode = "POR";
+
+ // All creatures able to block target creature this turn do so.
+ this.getSpellAbility().addEffect(new MustBeBlockedByAllTargetEffect(Duration.EndOfTurn));
+ this.getSpellAbility().addTarget(new TargetCreaturePermanent());
+ }
+
+ public AlluringScent(final AlluringScent card) {
+ super(card);
+ }
+
+ @Override
+ public AlluringScent copy() {
+ return new AlluringScent(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/portal/BeeSting.java b/Mage.Sets/src/mage/sets/portal/BeeSting.java
new file mode 100644
index 0000000000..fca843e4ec
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/portal/BeeSting.java
@@ -0,0 +1,60 @@
+/*
+ * 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.sets.portal;
+
+import java.util.UUID;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.target.common.TargetCreatureOrPlayer;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class BeeSting extends CardImpl {
+
+ public BeeSting(UUID ownerId) {
+ super(ownerId, 83, "Bee Sting", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}");
+ this.expansionSetCode = "POR";
+
+ // Bee Sting deals 2 damage to target creature or player.
+ this.getSpellAbility().addEffect(new DamageTargetEffect(2));
+ this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
+ }
+
+ public BeeSting(final BeeSting card) {
+ super(card);
+ }
+
+ @Override
+ public BeeSting copy() {
+ return new BeeSting(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/portal/CloudDragon.java b/Mage.Sets/src/mage/sets/portal/CloudDragon.java
new file mode 100644
index 0000000000..aeda4e3679
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/portal/CloudDragon.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.portal;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class CloudDragon extends mage.sets.masterseditioniv.CloudDragon {
+
+ public CloudDragon(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 46;
+ this.expansionSetCode = "POR";
+ }
+
+ public CloudDragon(final CloudDragon card) {
+ super(card);
+ }
+
+ @Override
+ public CloudDragon copy() {
+ return new CloudDragon(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/portal/FireTempest.java b/Mage.Sets/src/mage/sets/portal/FireTempest.java
new file mode 100644
index 0000000000..ba3f8471c5
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/portal/FireTempest.java
@@ -0,0 +1,58 @@
+/*
+ * 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.sets.portal;
+
+import java.util.UUID;
+import mage.abilities.effects.common.DamageEverythingEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class FireTempest extends CardImpl {
+
+ public FireTempest(UUID ownerId) {
+ super(ownerId, 133, "Fire Tempest", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{R}{R}");
+ this.expansionSetCode = "POR";
+
+ // Fire Tempest deals 6 damage to each creature and each player.
+ this.getSpellAbility().addEffect(new DamageEverythingEffect(6));
+ }
+
+ public FireTempest(final FireTempest card) {
+ super(card);
+ }
+
+ @Override
+ public FireTempest copy() {
+ return new FireTempest(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/portal/LavaFlow.java b/Mage.Sets/src/mage/sets/portal/LavaFlow.java
new file mode 100644
index 0000000000..c1b7c9ec38
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/portal/LavaFlow.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.sets.portal;
+
+import java.util.UUID;
+import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.target.Target;
+import mage.target.TargetPermanent;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class LavaFlow extends CardImpl {
+ private static final FilterPermanent filter = new FilterPermanent("creature or land");
+ static {
+ filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.LAND)));
+ }
+
+ public LavaFlow(UUID ownerId) {
+ super(ownerId, 143, "Lava Flow", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{R}");
+ this.expansionSetCode = "POR";
+
+ // Destroy target creature or land.
+ this.getSpellAbility().addEffect(new DestroyTargetEffect());
+ Target target = new TargetPermanent(filter);
+ this.getSpellAbility().addTarget(target);
+ }
+
+ public LavaFlow(final LavaFlow card) {
+ super(card);
+ }
+
+ @Override
+ public LavaFlow copy() {
+ return new LavaFlow(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java b/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java
new file mode 100644
index 0000000000..22d9aa4eb0
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.portalsecondage;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class AlluringScent extends mage.sets.portal.AlluringScent {
+
+ public AlluringScent(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 61;
+ this.expansionSetCode = "PO2";
+ }
+
+ public AlluringScent(final AlluringScent card) {
+ super(card);
+ }
+
+ @Override
+ public AlluringScent copy() {
+ return new AlluringScent(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java b/Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java
new file mode 100644
index 0000000000..4dc2cbf056
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.portalsecondage;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class AncientCraving extends mage.sets.starter1999.AncientCraving {
+
+ public AncientCraving(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 2;
+ this.expansionSetCode = "PO2";
+ }
+
+ public AncientCraving(final AncientCraving card) {
+ super(card);
+ }
+
+ @Override
+ public AncientCraving copy() {
+ return new AncientCraving(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java b/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java
new file mode 100644
index 0000000000..2a92ef4411
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.portalsecondage;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class BeeSting extends mage.sets.portal.BeeSting {
+
+ public BeeSting(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 64;
+ this.expansionSetCode = "PO2";
+ }
+
+ public BeeSting(final BeeSting card) {
+ super(card);
+ }
+
+ @Override
+ public BeeSting copy() {
+ return new BeeSting(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/portalsecondage/IronhoofOx.java b/Mage.Sets/src/mage/sets/portalsecondage/IronhoofOx.java
new file mode 100644
index 0000000000..d03926604c
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/portalsecondage/IronhoofOx.java
@@ -0,0 +1,64 @@
+/*
+ * 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.sets.portalsecondage;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.combat.CantBeBlockedByMoreThanOneSourceEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class IronhoofOx extends CardImpl {
+
+ public IronhoofOx(UUID ownerId) {
+ super(ownerId, 70, "Ironhoof Ox", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}");
+ this.expansionSetCode = "PO2";
+ this.subtype.add("Ox");
+ this.power = new MageInt(4);
+ this.toughness = new MageInt(4);
+
+ // Ironhoof Ox can't be blocked by more than one creature.
+ this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect()));
+ }
+
+ public IronhoofOx(final IronhoofOx card) {
+ super(card);
+ }
+
+ @Override
+ public IronhoofOx copy() {
+ return new IronhoofOx(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/ravnica/SinsOfThePast.java b/Mage.Sets/src/mage/sets/ravnica/SinsOfThePast.java
index f9863b55a7..01743f1db5 100644
--- a/Mage.Sets/src/mage/sets/ravnica/SinsOfThePast.java
+++ b/Mage.Sets/src/mage/sets/ravnica/SinsOfThePast.java
@@ -110,7 +110,7 @@ class SinsOfThePastEffect extends OneShotEffect {
class SinsOfThePastCastFromGraveyardEffect extends AsThoughEffectImpl {
SinsOfThePastCastFromGraveyardEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfTurn, Outcome.PlayForFree);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.PlayForFree);
}
SinsOfThePastCastFromGraveyardEffect(final SinsOfThePastCastFromGraveyardEffect effect) {
diff --git a/Mage.Sets/src/mage/sets/revisededition/IvoryTower.java b/Mage.Sets/src/mage/sets/revisededition/IvoryTower.java
new file mode 100644
index 0000000000..185dc401b6
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/revisededition/IvoryTower.java
@@ -0,0 +1,55 @@
+/*
+ * 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.sets.revisededition;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class IvoryTower extends mage.sets.antiquities.IvoryTower {
+
+ public IvoryTower(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 254;
+ this.expansionSetCode = "3ED";
+ this.rarity = Rarity.RARE;
+ }
+
+ public IvoryTower(final IvoryTower card) {
+ super(card);
+ }
+
+ @Override
+ public IvoryTower copy() {
+ return new IvoryTower(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/revisededition/Onulet.java b/Mage.Sets/src/mage/sets/revisededition/Onulet.java
new file mode 100644
index 0000000000..02813e1c91
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/revisededition/Onulet.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.revisededition;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class Onulet extends mage.sets.mastersedition.Onulet {
+
+ public Onulet(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 269;
+ this.expansionSetCode = "3ED";
+ this.rarity = Rarity.RARE;
+ }
+
+ public Onulet(final Onulet card) {
+ super(card);
+ }
+
+ @Override
+ public Onulet copy() {
+ return new Onulet(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/revisededition/PhantasmalForces.java b/Mage.Sets/src/mage/sets/revisededition/PhantasmalForces.java
new file mode 100644
index 0000000000..928fed59ac
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/revisededition/PhantasmalForces.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.revisededition;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces {
+
+ public PhantasmalForces(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 69;
+ this.expansionSetCode = "3ED";
+ }
+
+ public PhantasmalForces(final PhantasmalForces card) {
+ super(card);
+ }
+
+ @Override
+ public PhantasmalForces copy() {
+ return new PhantasmalForces(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/revisededition/SedgeTroll.java b/Mage.Sets/src/mage/sets/revisededition/SedgeTroll.java
new file mode 100644
index 0000000000..8822262f9a
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/revisededition/SedgeTroll.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.revisededition;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class SedgeTroll extends mage.sets.masterseditioniv.SedgeTroll {
+
+ public SedgeTroll(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 173;
+ this.expansionSetCode = "3ED";
+ }
+
+ public SedgeTroll(final SedgeTroll card) {
+ super(card);
+ }
+
+ @Override
+ public SedgeTroll copy() {
+ return new SedgeTroll(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarrionCall.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarrionCall.java
index b5df5712a3..6e230d5b0a 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CarrionCall.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CarrionCall.java
@@ -29,11 +29,13 @@
package mage.sets.scarsofmirrodin;
import java.util.UUID;
+import mage.MageInt;
import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.keyword.InfectAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
-import mage.game.permanent.token.InsectToken;
+import mage.game.permanent.token.Token;
/**
*
@@ -45,7 +47,8 @@ public class CarrionCall extends CardImpl {
super(ownerId, 115, "Carrion Call", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{G}");
this.expansionSetCode = "SOM";
- this.getSpellAbility().addEffect(new CreateTokenEffect(new InsectToken("SOM"), 2));
+ // Put two 1/1 green Insect creature tokens with infect onto the battlefield. (They deal damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
+ this.getSpellAbility().addEffect(new CreateTokenEffect(new CarrionCallInsectToken(), 2));
}
public CarrionCall (final CarrionCall card) {
@@ -57,3 +60,19 @@ public class CarrionCall extends CardImpl {
return new CarrionCall(this);
}
}
+
+class CarrionCallInsectToken extends Token {
+
+ public CarrionCallInsectToken() {
+ super("Insect", "1/1 green Insect creature tokens with infect");
+ setOriginalExpansionSetCode("SOM");
+ cardType.add(CardType.CREATURE);
+ color.setGreen(true);
+ subtype.add("Insect");
+ power = new MageInt(1);
+ toughness = new MageInt(1);
+
+ addAbility(InfectAbility.getInstance());
+ }
+}
+
diff --git a/Mage.Sets/src/mage/sets/scourge/AphettoRunecaster.java b/Mage.Sets/src/mage/sets/scourge/AphettoRunecaster.java
new file mode 100644
index 0000000000..ab5295e4c7
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/scourge/AphettoRunecaster.java
@@ -0,0 +1,66 @@
+/*
+ * 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.sets.scourge;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.TurnedFaceUpAllTriggeredAbility;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.FilterPermanent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class AphettoRunecaster extends CardImpl {
+
+ public AphettoRunecaster(UUID ownerId) {
+ super(ownerId, 28, "Aphetto Runecaster", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{U}");
+ this.expansionSetCode = "SCG";
+ this.subtype.add("Human");
+ this.subtype.add("Wizard");
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(3);
+
+ // Whenever a permanent is turned face up, you may draw a card.
+ this.addAbility(new TurnedFaceUpAllTriggeredAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new FilterPermanent("a permanent"), false, true));
+ }
+
+ public AphettoRunecaster(final AphettoRunecaster card) {
+ super(card);
+ }
+
+ @Override
+ public AphettoRunecaster copy() {
+ return new AphettoRunecaster(this);
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/scourge/MischievousQuanar.java b/Mage.Sets/src/mage/sets/scourge/MischievousQuanar.java
new file mode 100644
index 0000000000..8c26c18b5a
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/scourge/MischievousQuanar.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.sets.scourge;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.CopyTargetSpellEffect;
+import mage.abilities.effects.common.continuous.BecomesFaceDownCreatureEffect;
+import mage.abilities.keyword.MorphAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.FilterSpell;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.target.TargetSpell;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class MischievousQuanar extends CardImpl {
+
+ private static final FilterSpell filter = new FilterSpell("instant or sorcery spell");
+
+ static {
+ filter.add(Predicates.or(
+ new CardTypePredicate(CardType.INSTANT),
+ new CardTypePredicate(CardType.SORCERY)));
+ }
+
+ public MischievousQuanar(UUID ownerId) {
+ super(ownerId, 42, "Mischievous Quanar", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}");
+ this.expansionSetCode = "SCG";
+ this.subtype.add("Beast");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(3);
+
+ // {3}{U}{U}: Turn Mischievous Quanar face down.
+ Effect effect = new BecomesFaceDownCreatureEffect(Duration.Custom, BecomesFaceDownCreatureEffect.FaceDownType.MANUAL);
+ effect.setText("Turn Michievous Quanar face down. <i>(It becomes a 2/2 creature.)</i>");
+ this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{3}{U}{U}")));
+
+ // Morph {1}{U}{U}
+ this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{U}{U}")));
+
+ // When Mischievous Quanar is turned face up, copy target instant or sorcery spell. You may choose new targets for that copy.
+ Effect effect2 = new CopyTargetSpellEffect();
+ effect2.setText("copy target instant or sorcery spell. You may choose new targets for that copy");
+ Ability ability = new TurnedFaceUpSourceTriggeredAbility(effect2);
+ ability.addTarget(new TargetSpell(filter));
+ this.addAbility(ability);
+ }
+
+ public MischievousQuanar(final MischievousQuanar card) {
+ super(card);
+ }
+
+ @Override
+ public MischievousQuanar copy() {
+ return new MischievousQuanar(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/KnacksawClique.java b/Mage.Sets/src/mage/sets/shadowmoor/KnacksawClique.java
index 6679cc7a4a..24e5ea3e54 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/KnacksawClique.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/KnacksawClique.java
@@ -128,7 +128,7 @@ class KnacksawCliqueCastFromExileEffect extends AsThoughEffectImpl {
private final UUID exileId;
public KnacksawCliqueCastFromExileEffect(UUID cardId, UUID exileId) {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
staticText = "Until end of turn, you may play that card";
this.cardId = cardId;
this.exileId = exileId;
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MossbridgeTroll.java b/Mage.Sets/src/mage/sets/shadowmoor/MossbridgeTroll.java
index 9fa0b2ed6c..539b8f9d3d 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/MossbridgeTroll.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/MossbridgeTroll.java
@@ -105,7 +105,7 @@ class MossbridgeTrollReplacementEffect extends ReplacementEffectImpl {
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
Permanent mossbridgeTroll = game.getPermanent(event.getTargetId());
- if (mossbridgeTroll != null) {
+ if (mossbridgeTroll != null && event.getAmount() == 0) { // 1=noRegen
return mossbridgeTroll.regenerate(source.getSourceId(), game);
}
return false;
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/AncientCraving.java b/Mage.Sets/src/mage/sets/sorinvstibalt/AncientCraving.java
new file mode 100644
index 0000000000..be12502f97
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/AncientCraving.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.sorinvstibalt;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class AncientCraving extends mage.sets.starter1999.AncientCraving {
+
+ public AncientCraving(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 28;
+ this.expansionSetCode = "DDK";
+ }
+
+ public AncientCraving(final AncientCraving card) {
+ super(card);
+ }
+
+ @Override
+ public AncientCraving copy() {
+ return new AncientCraving(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/BreakingPoint.java b/Mage.Sets/src/mage/sets/sorinvstibalt/BreakingPoint.java
new file mode 100644
index 0000000000..8a375ed1fb
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/BreakingPoint.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.sorinvstibalt;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class BreakingPoint extends mage.sets.judgment.BreakingPoint {
+
+ public BreakingPoint(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 67;
+ this.expansionSetCode = "DDK";
+ }
+
+ public BreakingPoint(final BreakingPoint card) {
+ super(card);
+ }
+
+ @Override
+ public BreakingPoint copy() {
+ return new BreakingPoint(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/CoalStoker.java b/Mage.Sets/src/mage/sets/sorinvstibalt/CoalStoker.java
new file mode 100644
index 0000000000..90aebf995f
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/CoalStoker.java
@@ -0,0 +1,73 @@
+/*
+ * 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.sets.sorinvstibalt;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.Mana;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.condition.common.CastFromHandCondition;
+import mage.abilities.decorator.ConditionalOneShotEffect;
+import mage.abilities.effects.common.BasicManaEffect;
+import mage.abilities.effects.common.ExileAllEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.common.FilterAttackingCreature;
+import mage.watchers.common.CastFromHandWatcher;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class CoalStoker extends CardImpl {
+
+ public CoalStoker(UUID ownerId) {
+ super(ownerId, 49, "Coal Stoker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}");
+ this.expansionSetCode = "DDK";
+ this.subtype.add("Elemental");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(3);
+
+ // When Coal Stoker enters the battlefield, if you cast it from your hand, add {R}{R}{R} to your mana pool.
+ Ability ability = new EntersBattlefieldTriggeredAbility(
+ new ConditionalOneShotEffect(new BasicManaEffect(new Mana(3, 0, 0, 0, 0, 0, 0)), new CastFromHandCondition(),
+ " if you cast it from your hand, add {R}{R}{R} to your mana pool."));
+ this.addAbility(ability, new CastFromHandWatcher());
+ }
+
+ public CoalStoker(final CoalStoker card) {
+ super(card);
+ }
+
+ @Override
+ public CoalStoker copy() {
+ return new CoalStoker(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/Decompose.java b/Mage.Sets/src/mage/sets/sorinvstibalt/Decompose.java
new file mode 100644
index 0000000000..b7c56dd58c
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/Decompose.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.sorinvstibalt;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class Decompose extends mage.sets.odyssey.Decompose {
+
+ public Decompose(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 20;
+ this.expansionSetCode = "DDK";
+ }
+
+ public Decompose(final Decompose card) {
+ super(card);
+ }
+
+ @Override
+ public Decompose copy() {
+ return new Decompose(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/LavabornMuse.java b/Mage.Sets/src/mage/sets/sorinvstibalt/LavabornMuse.java
new file mode 100644
index 0000000000..03353d0dbf
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/LavabornMuse.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.sets.sorinvstibalt;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.condition.Condition;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.players.Player;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class LavabornMuse extends CardImpl {
+
+ public LavabornMuse(UUID ownerId) {
+ super(ownerId, 50, "Lavaborn Muse", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}");
+ this.expansionSetCode = "DDK";
+ this.subtype.add("Spirit");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(3);
+
+ // At the beginning of each opponent's upkeep, if that player has two or fewer cards in hand, Lavaborn Muse deals 3 damage to him or her.
+ this.addAbility(new ConditionalTriggeredAbility(
+ new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), TargetController.OPPONENT, false, true),
+ new CardsInActivePlayersHandCondition(),
+ "At the beginning of each opponent's upkeep, if that player has two or fewer cards in hand, {this} deals 3 damage to him or her.",
+ false));
+ }
+
+ public LavabornMuse(final LavabornMuse card) {
+ super(card);
+ }
+
+ @Override
+ public LavabornMuse copy() {
+ return new LavabornMuse(this);
+ }
+}
+
+// TODO: Figure out CardsInHandCondition parameters and use that instead of rewriting this
+// TODO: Update HellfireMongrel, ShriekingAffliction to use the CardsInHandCondition?
+class CardsInActivePlayersHandCondition implements Condition {
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Player player = game.getPlayer(game.getActivePlayerId());
+ return player != null && player.getHand().size() <= 2;
+ }
+}
+
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/RevenantPatriarch.java b/Mage.Sets/src/mage/sets/sorinvstibalt/RevenantPatriarch.java
new file mode 100644
index 0000000000..b8ea4b2fe3
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/RevenantPatriarch.java
@@ -0,0 +1,109 @@
+/*
+ * 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.sets.sorinvstibalt;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbility;
+import mage.abilities.common.CantBlockAbility;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.condition.common.ManaWasSpentCondition;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.ColoredManaSymbol;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.TurnPhase;
+import mage.game.Game;
+import mage.game.turn.TurnMod;
+import mage.players.Player;
+import mage.target.TargetPlayer;
+import mage.watchers.common.ManaSpentToCastWatcher;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class RevenantPatriarch extends CardImpl {
+
+ public RevenantPatriarch(UUID ownerId) {
+ super(ownerId, 16, "Revenant Patriarch", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{B}");
+ this.expansionSetCode = "DDK";
+ this.subtype.add("Spirit");
+ this.power = new MageInt(4);
+ this.toughness = new MageInt(3);
+
+ // When Revenant Patriarch enters the battlefield, if {W} was spent to cast it, target player skips his or her next combat phase.
+ TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new TargetPlayerSkipNextCombatEffect(), false);
+ ability.addTarget(new TargetPlayer());
+ this.addAbility(new ConditionalTriggeredAbility(ability, new ManaWasSpentCondition(ColoredManaSymbol.W),
+ "if {W} was spent to cast it, target player skips his or her next combat phase."), new ManaSpentToCastWatcher());
+ // Revenant Patriarch can't block.
+ this.addAbility(new CantBlockAbility());
+ }
+
+ public RevenantPatriarch(final RevenantPatriarch card) {
+ super(card);
+ }
+
+ @Override
+ public RevenantPatriarch copy() {
+ return new RevenantPatriarch(this);
+ }
+}
+
+class TargetPlayerSkipNextCombatEffect extends OneShotEffect {
+
+ public TargetPlayerSkipNextCombatEffect() {
+ super(Outcome.Detriment);
+ }
+
+ public TargetPlayerSkipNextCombatEffect(final TargetPlayerSkipNextCombatEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Player player = game.getPlayer(getTargetPointer().getFirst(game, source));
+
+ if (player != null) {
+ game.getState().getTurnMods().add(new TurnMod(player.getId(), TurnPhase.COMBAT, null, true));
+ return true;
+ }
+
+ return false;
+ }
+
+ @Override
+ public TargetPlayerSkipNextCombatEffect copy() {
+ return new TargetPlayerSkipNextCombatEffect(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/StranglingSoot.java b/Mage.Sets/src/mage/sets/sorinvstibalt/StranglingSoot.java
new file mode 100644
index 0000000000..11688e61a4
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/sorinvstibalt/StranglingSoot.java
@@ -0,0 +1,74 @@
+/*
+ * 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.sets.sorinvstibalt;
+
+import java.util.UUID;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.abilities.keyword.FlashbackAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.TimingRule;
+import mage.filter.Filter;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.ToughnessPredicate;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class StranglingSoot extends CardImpl {
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with toughess 3 or less");
+
+ static {
+ filter.add(new ToughnessPredicate(Filter.ComparisonType.LessThan, 4));
+ }
+
+ public StranglingSoot(UUID ownerId) {
+ super(ownerId, 65, "Strangling Soot", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}");
+ this.expansionSetCode = "DDK";
+
+ // Destroy target creature with toughness 3 or less.
+ this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+ this.getSpellAbility().addEffect(new DestroyTargetEffect());
+ // Flashback {5}{R}
+ this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{R}"), TimingRule.INSTANT));
+ }
+
+ public StranglingSoot(final StranglingSoot card) {
+ super(card);
+ }
+
+ @Override
+ public StranglingSoot copy() {
+ return new StranglingSoot(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/starter1999/AlluringScent.java b/Mage.Sets/src/mage/sets/starter1999/AlluringScent.java
new file mode 100644
index 0000000000..8bb298116c
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/starter1999/AlluringScent.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.starter1999;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class AlluringScent extends mage.sets.portal.AlluringScent {
+
+ public AlluringScent(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 124;
+ this.expansionSetCode = "S99";
+ }
+
+ public AlluringScent(final AlluringScent card) {
+ super(card);
+ }
+
+ @Override
+ public AlluringScent copy() {
+ return new AlluringScent(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/starter1999/AncientCraving.java b/Mage.Sets/src/mage/sets/starter1999/AncientCraving.java
new file mode 100644
index 0000000000..a0bd441c2e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/starter1999/AncientCraving.java
@@ -0,0 +1,60 @@
+/*
+ * 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.sets.starter1999;
+
+import java.util.UUID;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.LoseLifeSourceControllerEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class AncientCraving extends CardImpl {
+
+ public AncientCraving(UUID ownerId) {
+ super(ownerId, 64, "Ancient Craving", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}");
+ this.expansionSetCode = "S99";
+
+ // You draw three cards and you lose 3 life.
+ this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3));
+ this.getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(3));
+ }
+
+ public AncientCraving(final AncientCraving card) {
+ super(card);
+ }
+
+ @Override
+ public AncientCraving copy() {
+ return new AncientCraving(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/starter1999/FireTempest.java b/Mage.Sets/src/mage/sets/starter1999/FireTempest.java
new file mode 100644
index 0000000000..a68ba48a31
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/starter1999/FireTempest.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.starter1999;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class FireTempest extends mage.sets.portal.FireTempest {
+
+ public FireTempest(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 97;
+ this.expansionSetCode = "S99";
+ }
+
+ public FireTempest(final FireTempest card) {
+ super(card);
+ }
+
+ @Override
+ public FireTempest copy() {
+ return new FireTempest(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/stronghold/Burgeoning.java b/Mage.Sets/src/mage/sets/stronghold/Burgeoning.java
new file mode 100644
index 0000000000..2e005cfeb6
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/stronghold/Burgeoning.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.sets.stronghold;
+
+import java.util.UUID;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.common.PutLandFromHandOntoBattlefieldEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.permanent.Permanent;
+
+/**
+ * @author duncant
+ */
+public class Burgeoning extends CardImpl {
+
+ public Burgeoning(UUID ownerId) {
+ super(ownerId, 52, "Burgeoning", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{G}");
+ this.expansionSetCode = "STH";
+
+ // Whenever an opponent plays a land, you may put a land card from your hand onto the battlefield.
+ this.addAbility(new BurgeoningTriggeredAbility());
+ }
+
+ public Burgeoning(final Burgeoning card) {
+ super(card);
+ }
+
+ @Override
+ public Burgeoning copy() {
+ return new Burgeoning(this);
+ }
+}
+
+
+class BurgeoningTriggeredAbility extends TriggeredAbilityImpl {
+ BurgeoningTriggeredAbility() {
+ super(Zone.BATTLEFIELD, new PutLandFromHandOntoBattlefieldEffect());
+ }
+
+ BurgeoningTriggeredAbility(BurgeoningTriggeredAbility ability) {
+ super(ability);
+ }
+
+ @Override
+ public boolean checkEventType(GameEvent event, Game game) {
+ return event.getType() == EventType.LAND_PLAYED;
+ }
+
+ @Override
+ public boolean checkTrigger(GameEvent event, Game game) {
+ Permanent land = game.getPermanent(event.getTargetId());
+ return game.getOpponents(controllerId).contains(land.getControllerId());
+ }
+
+ @Override
+ public BurgeoningTriggeredAbility copy() {
+ return new BurgeoningTriggeredAbility(this);
+ }
+
+ @Override
+ public String getRule() {
+ return "Whenever an opponent plays a land, you may put a land card from your hand onto the battlefield.";
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/stronghold/ConstantMists.java b/Mage.Sets/src/mage/sets/stronghold/ConstantMists.java
new file mode 100644
index 0000000000..a35e1777b9
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/stronghold/ConstantMists.java
@@ -0,0 +1,66 @@
+/*
+ * 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.sets.stronghold;
+
+import java.util.UUID;
+import mage.abilities.costs.common.SacrificeTargetCost;
+import mage.abilities.effects.common.PreventAllDamageByAllEffect;
+import mage.abilities.keyword.BuybackAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.filter.common.FilterControlledLandPermanent;
+import mage.target.common.TargetControlledPermanent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ConstantMists extends CardImpl {
+
+ public ConstantMists(UUID ownerId) {
+ super(ownerId, 54, "Constant Mists", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{G}");
+ this.expansionSetCode = "STH";
+
+ // Buyback-Sacrifice a land.
+ this.addAbility(new BuybackAbility(new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent("a land")))));
+
+ // Prevent all combat damage that would be dealt this turn.
+ this.getSpellAbility().addEffect(new PreventAllDamageByAllEffect(Duration.EndOfTurn, true));
+ }
+
+ public ConstantMists(final ConstantMists card) {
+ super(card);
+ }
+
+ @Override
+ public ConstantMists copy() {
+ return new ConstantMists(this);
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/stronghold/MindPeel.java b/Mage.Sets/src/mage/sets/stronghold/MindPeel.java
new file mode 100644
index 0000000000..b4bc105d2d
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/stronghold/MindPeel.java
@@ -0,0 +1,65 @@
+/*
+ * 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.sets.stronghold;
+
+import java.util.UUID;
+
+import mage.abilities.effects.common.discard.DiscardTargetEffect;
+import mage.abilities.keyword.BuybackAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.target.TargetPlayer;
+
+/**
+ *
+ * @author EvilGeek
+ */
+public class MindPeel extends CardImpl {
+
+ public MindPeel(UUID ownerId) {
+ super(ownerId, 13, "Mind Peel", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}");
+ this.expansionSetCode = "STH";
+
+ // Buyback {2}{B}{B}
+ this.addAbility(new BuybackAbility("{2}{B}{B}"));
+
+ // Target player discards a card.
+ this.getSpellAbility().addTarget(new TargetPlayer());
+ this.getSpellAbility().addEffect(new DiscardTargetEffect(1));
+ }
+
+ public MindPeel(final MindPeel card) {
+ super(card);
+ }
+
+ @Override
+ public MindPeel copy() {
+ return new MindPeel(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/tenthedition/LavabornMuse.java b/Mage.Sets/src/mage/sets/tenthedition/LavabornMuse.java
new file mode 100644
index 0000000000..65bde3e149
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/tenthedition/LavabornMuse.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.tenthedition;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class LavabornMuse extends mage.sets.sorinvstibalt.LavabornMuse {
+
+ public LavabornMuse(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 216;
+ this.expansionSetCode = "10E";
+ }
+
+ public LavabornMuse(final LavabornMuse card) {
+ super(card);
+ }
+
+ @Override
+ public LavabornMuse copy() {
+ return new LavabornMuse(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/tenthedition/Peek.java b/Mage.Sets/src/mage/sets/tenthedition/Peek.java
index 7f60d71d82..b442810153 100644
--- a/Mage.Sets/src/mage/sets/tenthedition/Peek.java
+++ b/Mage.Sets/src/mage/sets/tenthedition/Peek.java
@@ -85,7 +85,7 @@ class PeekEffect extends OneShotEffect {
Player player = game.getPlayer(targetPointer.getFirst(game, source));
MageObject sourceObject = source.getSourceObject(game);
if (player != null && controller != null && sourceObject != null) {
- controller.lookAtCards(sourceObject.getIdName(), player.getHand(), game);
+ controller.lookAtCards(sourceObject.getIdName() + " " + player.getName() + " (" + game.getTurnNum()+"|"+game.getPhase().getType() +")", player.getHand(), game);
}
return true;
}
diff --git a/Mage.Sets/src/mage/sets/thedark/ApprenticeWizard.java b/Mage.Sets/src/mage/sets/thedark/ApprenticeWizard.java
new file mode 100644
index 0000000000..2c66993687
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/thedark/ApprenticeWizard.java
@@ -0,0 +1,54 @@
+/*
+ * 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.sets.thedark;
+
+import java.util.UUID;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ApprenticeWizard extends mage.sets.mastersedition.ApprenticeWizard {
+
+ public ApprenticeWizard(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 20;
+ this.expansionSetCode = "DRK";
+ this.rarity = Rarity.RARE;
+ }
+
+ public ApprenticeWizard(final ApprenticeWizard card) {
+ super(card);
+ }
+
+ @Override
+ public ApprenticeWizard copy() {
+ return new ApprenticeWizard(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/theros/DaxosOfMeletis.java b/Mage.Sets/src/mage/sets/theros/DaxosOfMeletis.java
index ee8929301d..f59829ce40 100644
--- a/Mage.Sets/src/mage/sets/theros/DaxosOfMeletis.java
+++ b/Mage.Sets/src/mage/sets/theros/DaxosOfMeletis.java
@@ -148,7 +148,7 @@ class DaxosOfMeletisCastFromExileEffect extends AsThoughEffectImpl {
private UUID exileId;
public DaxosOfMeletisCastFromExileEffect(UUID cardId, UUID exileId) {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
staticText = "Until end of turn, you may cast that card and you may spend mana as though it were mana of any color to cast it";
this.cardId = cardId;
this.exileId = exileId;
diff --git a/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java b/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java
index 3ca67cd231..d2ae49b8cc 100644
--- a/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java
+++ b/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java
@@ -155,7 +155,7 @@ class PsychicIntrusionExileEffect extends OneShotEffect {
class PsychicIntrusionCastFromExileEffect extends AsThoughEffectImpl {
public PsychicIntrusionCastFromExileEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.Custom, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.Custom, Outcome.Benefit);
staticText = "You may cast that card for as long as it remains exiled, and you may spend mana as though it were mana of any color to cast that spell";
}
diff --git a/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java b/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java
index e9f1a93b72..5ae1263948 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java
@@ -136,7 +136,7 @@ class GrinningTotemSearchAndExileEffect extends OneShotEffect {
class GrinningTotemMayPlayEffect extends AsThoughEffectImpl {
public GrinningTotemMayPlayEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.Custom, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.Custom, Outcome.Benefit);
this.staticText = "Until the beginning of your next upkeep, you may play that card.";
}
diff --git a/Mage.Sets/src/mage/sets/timespiral/CoalStoker.java b/Mage.Sets/src/mage/sets/timespiral/CoalStoker.java
new file mode 100644
index 0000000000..87e1290029
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/timespiral/CoalStoker.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.timespiral;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class CoalStoker extends mage.sets.sorinvstibalt.CoalStoker {
+
+ public CoalStoker(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 150;
+ this.expansionSetCode = "TSP";
+ }
+
+ public CoalStoker(final CoalStoker card) {
+ super(card);
+ }
+
+ @Override
+ public CoalStoker copy() {
+ return new CoalStoker(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/timespiral/ScionOfTheUrDragon.java b/Mage.Sets/src/mage/sets/timespiral/ScionOfTheUrDragon.java
new file mode 100644
index 0000000000..3112e6b86b
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/timespiral/ScionOfTheUrDragon.java
@@ -0,0 +1,127 @@
+/*
+ * 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.sets.timespiral;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.SearchEffect;
+import mage.abilities.effects.common.CopyEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.FilterCard;
+import mage.filter.common.FilterPermanentCard;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.common.TargetCardInLibrary;
+
+/**
+ * @author duncant
+ */
+
+public class ScionOfTheUrDragon extends CardImpl {
+
+ public ScionOfTheUrDragon(UUID ownerId) {
+ super(ownerId, 246, "Scion of the Ur-Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{W}{U}{B}{R}{G}");
+ this.expansionSetCode = "TSP";
+ this.supertype.add("Legendary");
+ this.subtype.add("Dragon");
+ this.subtype.add("Avatar");
+ this.power = new MageInt(4);
+ this.toughness = new MageInt(4);
+
+ this.addAbility(FlyingAbility.getInstance());
+
+ // {2}: Search your library for a Dragon permanent card and put it into your graveyard. If you do, Scion of the Ur-Dragon becomes a copy of that card until end of turn. Then shuffle your library.
+ this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
+ new ScionOfTheUrDragonEffect(),
+ new ManaCostsImpl("{2}")));
+ }
+
+ public ScionOfTheUrDragon(final ScionOfTheUrDragon card) {
+ super(card);
+ }
+
+ @Override
+ public ScionOfTheUrDragon copy() {
+ return new ScionOfTheUrDragon(this);
+ }
+}
+
+class ScionOfTheUrDragonEffect extends SearchEffect {
+ private static final FilterCard filter = new FilterPermanentCard("Dragon permanent card");
+
+ static {
+ filter.add(new SubtypePredicate("Dragon"));
+ }
+
+ public ScionOfTheUrDragonEffect() {
+ super(new TargetCardInLibrary(filter), Outcome.Copy);
+ staticText = "Search your library for a Dragon permanent card and put it into your graveyard. If you do, Scion of the Ur-Dragon becomes a copy of that card until end of turn. Then shuffle your library.";
+ }
+
+ ScionOfTheUrDragonEffect(final ScionOfTheUrDragonEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public ScionOfTheUrDragonEffect copy() {
+ return new ScionOfTheUrDragonEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability ability) {
+ Player player = game.getPlayer(ability.getControllerId());
+ Permanent sourcePermanent = game.getPermanent(ability.getSourceId());
+ if (player != null && sourcePermanent != null) {
+ if (player.searchLibrary(target, game)) {
+ for (UUID cardId : target.getTargets()) {
+ Card card = player.getLibrary().getCard(cardId, game);
+ if (card != null) {
+ player.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, ability, game);
+ CopyEffect copyEffect = new CopyEffect(Duration.EndOfTurn, card, ability.getSourceId());
+ game.addEffect(copyEffect, ability);
+ }
+ }
+ }
+ player.shuffleLibrary(game);
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/timespiral/StranglingSoot.java b/Mage.Sets/src/mage/sets/timespiral/StranglingSoot.java
new file mode 100644
index 0000000000..fb8de84eab
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/timespiral/StranglingSoot.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.timespiral;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class StranglingSoot extends mage.sets.sorinvstibalt.StranglingSoot {
+
+ public StranglingSoot(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 132;
+ this.expansionSetCode = "TSP";
+ }
+
+ public StranglingSoot(final StranglingSoot card) {
+ super(card);
+ }
+
+ @Override
+ public StranglingSoot copy() {
+ return new StranglingSoot(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/torment/Unhinge.java b/Mage.Sets/src/mage/sets/torment/Unhinge.java
new file mode 100644
index 0000000000..b7ad8f64f0
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/torment/Unhinge.java
@@ -0,0 +1,65 @@
+/*
+ * 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.sets.torment;
+
+import java.util.UUID;
+
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.discard.DiscardTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.target.TargetPlayer;
+
+/**
+ *
+ * @author EvilGeek
+ */
+public class Unhinge extends CardImpl {
+
+ public Unhinge(UUID ownerId) {
+ super(ownerId, 87, "Unhinge", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}");
+ this.expansionSetCode = "TOR";
+
+ // Target player discards a card.
+ this.getSpellAbility().addTarget(new TargetPlayer());
+ this.getSpellAbility().addEffect(new DiscardTargetEffect(1));
+
+ // Draw a card.
+ this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
+ }
+
+ public Unhinge(final Unhinge card) {
+ super(card);
+ }
+
+ @Override
+ public Unhinge copy() {
+ return new Unhinge(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalForces.java b/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalForces.java
new file mode 100644
index 0000000000..61e5a4482d
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalForces.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.unlimitededition;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces {
+
+ public PhantasmalForces(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 68;
+ this.expansionSetCode = "2ED";
+ }
+
+ public PhantasmalForces(final PhantasmalForces card) {
+ super(card);
+ }
+
+ @Override
+ public PhantasmalForces copy() {
+ return new PhantasmalForces(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SedgeTroll.java b/Mage.Sets/src/mage/sets/unlimitededition/SedgeTroll.java
new file mode 100644
index 0000000000..455725de13
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/unlimitededition/SedgeTroll.java
@@ -0,0 +1,52 @@
+/*
+ * 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.sets.unlimitededition;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author ilcartographer
+ */
+public class SedgeTroll extends mage.sets.masterseditioniv.SedgeTroll {
+
+ public SedgeTroll(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 173;
+ this.expansionSetCode = "2ED";
+ }
+
+ public SedgeTroll(final SedgeTroll card) {
+ super(card);
+ }
+
+ @Override
+ public SedgeTroll copy() {
+ return new SedgeTroll(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Telepathy.java b/Mage.Sets/src/mage/sets/urzassaga/Telepathy.java
index b24a9e4b0f..037fe814b7 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Telepathy.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Telepathy.java
@@ -48,7 +48,6 @@ public class Telepathy extends CardImpl {
super(ownerId, 102, "Telepathy", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{U}");
this.expansionSetCode = "USG";
-
// Your opponents play with their hands revealed.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OpponentsPlayWithTheTopCardRevealedEffect()));
}
@@ -82,7 +81,7 @@ class OpponentsPlayWithTheTopCardRevealedEffect extends ContinuousEffectImpl {
for (UUID opponentId : game.getOpponents(controller.getId())) {
Player opponent = game.getPlayer(opponentId);
if (opponent != null) {
- controller.revealCards(sourceObject.getName() + " " + opponent.getName(), opponent.getHand(), game, false);
+ controller.revealCards(sourceObject.getIdName() + " " + opponent.getName(), opponent.getHand(), game, false);
}
}
return true;
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/ChokingSands.java b/Mage.Sets/src/mage/sets/vintagemasters/ChokingSands.java
new file mode 100644
index 0000000000..a7c36337ca
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/vintagemasters/ChokingSands.java
@@ -0,0 +1,109 @@
+/*
+ * 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.sets.vintagemasters;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterLandPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.common.TargetLandPermanent;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class ChokingSands extends CardImpl {
+
+ private static final FilterLandPermanent filter = new FilterLandPermanent("non-Swamp");
+
+ static {
+ filter.add(Predicates.not(new SubtypePredicate("Swamp")));
+ }
+
+ public ChokingSands(UUID ownerId) {
+ super(ownerId, 109, "Choking Sands", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}{B}");
+ this.expansionSetCode = "VMA";
+
+ // Destroy target non-Swamp land.
+ this.getSpellAbility().addEffect(new DestroyTargetEffect());
+ this.getSpellAbility().addTarget(new TargetLandPermanent(filter));
+
+ // If that land was nonbasic, Choking Sands deals 2 damage to the land's controller.
+ this.getSpellAbility().addEffect(new ChokingSandsEffect());
+ }
+
+ public ChokingSands(final ChokingSands card) {
+ super(card);
+ }
+
+ @Override
+ public ChokingSands copy() {
+ return new ChokingSands(this);
+ }
+}
+
+class ChokingSandsEffect extends OneShotEffect {
+
+ public ChokingSandsEffect() {
+ super(Outcome.Damage);
+ this.staticText = "If that land was nonbasic, Choking Sands deals 2 damage to the land's controller";
+ }
+
+ public ChokingSandsEffect(final ChokingSandsEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public ChokingSandsEffect copy() {
+ return new ChokingSandsEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Permanent permanent = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD);
+ if (permanent != null && !permanent.getSupertype().contains("Basic")) {
+ Player player = game.getPlayer(permanent.getControllerId());
+ if (player != null) {
+ player.damage(2, source.getSourceId(), game, false, true);
+ return true;
+ }
+ }
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/IvoryTower.java b/Mage.Sets/src/mage/sets/vintagemasters/IvoryTower.java
new file mode 100644
index 0000000000..d12c27f1f8
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/vintagemasters/IvoryTower.java
@@ -0,0 +1,53 @@
+/*
+ * 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.sets.vintagemasters;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class IvoryTower extends mage.sets.antiquities.IvoryTower {
+
+ public IvoryTower(UUID ownerId) {
+ super(ownerId);
+ this.cardNumber = 269;
+ this.expansionSetCode = "VMA";
+ }
+
+ public IvoryTower(final IvoryTower card) {
+ super(card);
+ }
+
+ @Override
+ public IvoryTower copy() {
+ return new IvoryTower(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/MindsDesire.java b/Mage.Sets/src/mage/sets/vintagemasters/MindsDesire.java
index 2d9aeb91bb..0533cb5b64 100644
--- a/Mage.Sets/src/mage/sets/vintagemasters/MindsDesire.java
+++ b/Mage.Sets/src/mage/sets/vintagemasters/MindsDesire.java
@@ -114,7 +114,7 @@ class MindsDesireEffect extends OneShotEffect {
class MindsDesireCastFromExileEffect extends AsThoughEffectImpl {
MindsDesireCastFromExileEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
staticText = "you may play that card without paying its mana cost";
}
diff --git a/Mage.Sets/src/mage/sets/vintagemasters/SuChi.java b/Mage.Sets/src/mage/sets/vintagemasters/SuChi.java
new file mode 100644
index 0000000000..075ba52173
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/vintagemasters/SuChi.java
@@ -0,0 +1,65 @@
+/*
+ * 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.sets.vintagemasters;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.Mana;
+import mage.abilities.common.DiesTriggeredAbility;
+import mage.abilities.effects.common.BasicManaEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class SuChi extends CardImpl {
+
+ public SuChi(UUID ownerId) {
+ super(ownerId, 285, "Su-Chi", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}");
+ this.expansionSetCode = "VMA";
+ this.subtype.add("Construct");
+ this.power = new MageInt(4);
+ this.toughness = new MageInt(4);
+
+ // When Su-Chi dies, add {4} to your mana pool.
+ this.addAbility(new DiesTriggeredAbility(new BasicManaEffect(new Mana(0, 0, 0, 0, 0, 4, 0)), false));
+ }
+
+ public SuChi(final SuChi card) {
+ super(card);
+ }
+
+ @Override
+ public SuChi copy() {
+ return new SuChi(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java b/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java
index d9ae21d721..0a776c393d 100644
--- a/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java
+++ b/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java
@@ -34,8 +34,6 @@ import mage.constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
-import mage.abilities.condition.common.KickedCondition;
-import mage.abilities.decorator.ConditionalTriggeredAbility;
import mage.abilities.dynamicvalue.common.MultikickerCount;
import mage.abilities.effects.common.discard.DiscardTargetEffect;
import mage.abilities.keyword.MultikickerAbility;
@@ -61,10 +59,7 @@ public class BloodhuskRitualist extends CardImpl {
this.addAbility(new MultikickerAbility("{B}"));
// When Bloodhusk Ritualist enters the battlefield, target opponent discards a card for each time it was kicked.
- Ability ability = new ConditionalTriggeredAbility(
- new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(new MultikickerCount())),
- KickedCondition.getInstance(),
- "");
+ Ability ability = new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(new MultikickerCount()));
ability.addTarget(new TargetOpponent());
this.addAbility(ability);
}
diff --git a/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java b/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java
index 3a4894f321..a8fcaefca2 100644
--- a/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java
+++ b/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java
@@ -109,7 +109,7 @@ class RumblingAftershocksTriggeredAbility extends TriggeredAbilityImpl {
int damageAmount = 0;
for (Ability ability: spell.getAbilities()) {
if (ability instanceof KickerAbility) {
- damageAmount += ((KickerAbility) ability).getKickedCounter(game);
+ damageAmount += ((KickerAbility) ability).getKickedCounter(game, spell.getSpellAbility());
}
}
if (damageAmount > 0) {
diff --git a/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java b/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java
index 6645440db6..6767e5afff 100644
--- a/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java
+++ b/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java
@@ -54,8 +54,6 @@ public class StrengthOfTheTajuru extends CardImpl {
super(ownerId, 113, "Strength of the Tajuru", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{X}{G}{G}");
this.expansionSetCode = "WWK";
-
-
// Multikicker (You may pay an additional {1} any number of times as you cast this spell.)
this.addAbility(new MultikickerAbility("{1}"));
diff --git a/Mage.Sets/src/mage/sets/worldwake/ThadaAdelAcquisitor.java b/Mage.Sets/src/mage/sets/worldwake/ThadaAdelAcquisitor.java
index 75ef0f6be8..409950b8a7 100644
--- a/Mage.Sets/src/mage/sets/worldwake/ThadaAdelAcquisitor.java
+++ b/Mage.Sets/src/mage/sets/worldwake/ThadaAdelAcquisitor.java
@@ -127,7 +127,7 @@ class ThadaAdelAcquisitorEffect extends OneShotEffect {
class ThadaAdelPlayFromExileEffect extends AsThoughEffectImpl {
public ThadaAdelPlayFromExileEffect() {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
staticText = "You may play this card from exile";
}
diff --git a/Mage.Sets/src/mage/sets/zendikar/ExplorersScope.java b/Mage.Sets/src/mage/sets/zendikar/ExplorersScope.java
index 9046d67a0c..f4733ff67b 100644
--- a/Mage.Sets/src/mage/sets/zendikar/ExplorersScope.java
+++ b/Mage.Sets/src/mage/sets/zendikar/ExplorersScope.java
@@ -28,6 +28,7 @@
package mage.sets.zendikar;
import java.util.UUID;
+import mage.MageObject;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
@@ -42,7 +43,6 @@ import mage.cards.CardImpl;
import mage.cards.Cards;
import mage.cards.CardsImpl;
import mage.game.Game;
-import mage.game.permanent.Permanent;
import mage.players.Player;
/**
@@ -56,7 +56,10 @@ public class ExplorersScope extends CardImpl {
this.expansionSetCode = "ZEN";
this.subtype.add("Equipment");
+ // Whenever equipped creature attacks, look at the top card of your library. If it's a land card, you may put it onto the battlefield tapped.
this.addAbility(new AttacksAttachedTriggeredAbility(new ExplorersScopeEffect()));
+
+ // Equip ({1}: Attach to target creature you control. Equip only as a sorcery.)
this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1)));
}
@@ -88,28 +91,24 @@ class ExplorersScopeEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
- Player player = game.getPlayer(source.getControllerId());
- if (player == null) {
+ Player controller = game.getPlayer(source.getControllerId());
+ MageObject sourceObject = source.getSourceObject(game);
+ if (controller == null || sourceObject == null) {
return false;
}
- Card card = player.getLibrary().getFromTop(game);
+ Card card = controller.getLibrary().getFromTop(game);
if (card != null) {
Cards cards = new CardsImpl();
cards.add(card);
- player.lookAtCards("Explorer's Scope", cards, game);
+ controller.lookAtCards(sourceObject.getIdName(), cards, game);
if (card.getCardType().contains(CardType.LAND)) {
- String message = "Put " + card.getName() + " onto the battlefield tapped?";
- if (player.chooseUse(Outcome.PutLandInPlay, message, game)) {
- if (card.putOntoBattlefield(game, Zone.LIBRARY, source.getSourceId(), source.getControllerId())) {
- Permanent permanent = game.getPermanent(card.getId());
- if (permanent != null) {
- permanent.setTapped(true);
- }
- }
+ String message = "Put " + card.getLogName() + " onto the battlefield tapped?";
+ if (controller.chooseUse(Outcome.PutLandInPlay, message, game)) {
+ card.putOntoBattlefield(game, Zone.LIBRARY, source.getSourceId(), source.getControllerId(), true);
}
}
}
return true;
}
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/sets/zendikar/IonaShieldOfEmeria.java b/Mage.Sets/src/mage/sets/zendikar/IonaShieldOfEmeria.java
index 6bf1a7ce35..91fc8f2419 100644
--- a/Mage.Sets/src/mage/sets/zendikar/IonaShieldOfEmeria.java
+++ b/Mage.Sets/src/mage/sets/zendikar/IonaShieldOfEmeria.java
@@ -35,11 +35,10 @@ import mage.abilities.Ability;
import mage.abilities.common.AsEntersBattlefieldAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
-import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.ChooseColorEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.Card;
import mage.cards.CardImpl;
-import mage.choices.ChoiceColor;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
@@ -47,9 +46,6 @@ import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
-import mage.game.permanent.Permanent;
-import mage.players.Player;
-import mage.util.CardUtil;
/**
*
@@ -70,7 +66,7 @@ public class IonaShieldOfEmeria extends CardImpl {
this.addAbility(FlyingAbility.getInstance());
// As Iona, Shield of Emeria enters the battlefield, choose a color.
- this.addAbility(new AsEntersBattlefieldAbility(new IonaShieldOfEmeriaChooseColorEffect()));
+ this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit)));
// Your opponents can't cast spells of the chosen color.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IonaShieldOfEmeriaReplacementEffect()));
@@ -87,39 +83,6 @@ public class IonaShieldOfEmeria extends CardImpl {
}
}
-class IonaShieldOfEmeriaChooseColorEffect extends OneShotEffect {
-
- public IonaShieldOfEmeriaChooseColorEffect() {
- super(Outcome.Detriment);
- staticText = "choose a color";
- }
-
- public IonaShieldOfEmeriaChooseColorEffect(final IonaShieldOfEmeriaChooseColorEffect effect) {
- super(effect);
- }
-
- @Override
- public boolean apply(Game game, Ability source) {
- Player player = game.getPlayer(source.getControllerId());
- Permanent permanent = game.getPermanent(source.getSourceId());
- if (player != null && permanent != null) {
- ChoiceColor colorChoice = new ChoiceColor();
- if (player.choose(Outcome.Detriment, colorChoice, game)) {
- game.informPlayers(permanent.getName() + ": " + player.getLogName() + " has chosen " + colorChoice.getChoice());
- game.getState().setValue(permanent.getId() + "_color", colorChoice.getColor());
- permanent.addInfo("chosen color", CardUtil.addToolTipMarkTags("Chosen color: " + colorChoice.getColor().getDescription()), game);
- }
- return true;
- }
- return false;
- }
-
- @Override
- public IonaShieldOfEmeriaChooseColorEffect copy() {
- return new IonaShieldOfEmeriaChooseColorEffect(this);
- }
-}
-
class IonaShieldOfEmeriaReplacementEffect extends ContinuousRuleModifyingEffectImpl {
IonaShieldOfEmeriaReplacementEffect() {
@@ -150,6 +113,7 @@ class IonaShieldOfEmeriaReplacementEffect extends ContinuousRuleModifyingEffectI
public boolean applies(GameEvent event, Ability source, Game game) {
if (game.getOpponents(source.getControllerId()).contains(event.getPlayerId()) ) {
ObjectColor chosenColor = (ObjectColor) game.getState().getValue(source.getSourceId() + "_color");
+ // spell is not on the stack yet, so we have to check the card
Card card = game.getCard(event.getSourceId());
if (chosenColor != null && card != null && card.getColor(game).contains(chosenColor)) {
return true;
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/ScytheOfTheWretchedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/ScytheOfTheWretchedTest.java
new file mode 100644
index 0000000000..06bc16cf28
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/ScytheOfTheWretchedTest.java
@@ -0,0 +1,185 @@
+/*
+ * 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 org.mage.test.cards.abilities.equipped;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import mage.game.permanent.Permanent;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class ScytheOfTheWretchedTest extends CardTestPlayerBase {
+
+ /**
+ * Test that the creature taht died returns to battlefield under your control
+ * if the previous equiped creature does not die
+ */
+ @Test
+ public void testEquipAlive() {
+ addCard(Zone.BATTLEFIELD, playerA, "Soulmender", 1);
+
+ addCard(Zone.BATTLEFIELD, playerB, "Plains", 4);
+ addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion");
+ // Equipped creature gets +2/+2.
+ // Whenever a creature dealt damage by equipped creature this turn dies, return that card to the battlefield under your control. Attach Scythe of the Wretched to that creature.
+ // Equip {4}
+ addCard(Zone.BATTLEFIELD, playerB, "Scythe of the Wretched");
+
+ activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Equip {4}", "Silvercoat Lion");
+
+ attack(2, playerB, "Silvercoat Lion");
+ block(2, playerA, "Soulmender", "Silvercoat Lion");
+
+ setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
+ execute();
+
+ assertLife(playerA, 20);
+ assertLife(playerB, 20);
+
+ assertPermanentCount(playerA, "Soulmender", 0);
+ assertPermanentCount(playerB, "Soulmender", 1);
+ assertPowerToughness(playerB, "Soulmender", 3, 3);
+
+ assertPowerToughness(playerB, "Silvercoat Lion", 2, 2);
+
+ Permanent silvercoatLion = getPermanent("Silvercoat Lion", playerB.getId());
+ Assert.assertTrue("Silvercoat Lion may not have any attachments", silvercoatLion.getAttachments().isEmpty());
+ }
+ /**
+ * Test that the creature that died returns to battlefield under your control
+ * if the previous equiped creature does die after equipment is removed
+ */
+ @Test
+ public void testEquipDied() {
+ addCard(Zone.BATTLEFIELD, playerA, "Oreskos Swiftclaw", 1); // 3/1
+
+ addCard(Zone.BATTLEFIELD, playerB, "Plains", 4);
+ addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion");
+ // Equipped creature gets +2/+2.
+ // Whenever a creature dealt damage by equipped creature this turn dies, return that card to the battlefield under your control. Attach Scythe of the Wretched to that creature.
+ // Equip {4}
+ addCard(Zone.BATTLEFIELD, playerB, "Scythe of the Wretched");
+
+ activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Equip {4}", "Silvercoat Lion");
+
+ attack(2, playerB, "Silvercoat Lion");
+ block(2, playerA, "Oreskos Swiftclaw", "Silvercoat Lion");
+
+ setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
+ execute();
+
+ assertLife(playerA, 20);
+ assertLife(playerB, 20);
+
+ assertPermanentCount(playerA, "Oreskos Swiftclaw", 0);
+ assertPermanentCount(playerB, "Oreskos Swiftclaw", 1);
+ assertPowerToughness(playerB, "Oreskos Swiftclaw", 5, 3);
+
+ assertGraveyardCount(playerB, "Silvercoat Lion", 1);
+ }
+
+ /**
+ * Test that the creature that died returns to battlefield under your control
+ * if the previous equiped creature does die already in combat
+ */
+ @Test
+ public void testEquipDiedInCombat() {
+ addCard(Zone.BATTLEFIELD, playerA, "Serra Angel", 1); // 4/4
+
+ addCard(Zone.BATTLEFIELD, playerB, "Plains", 4);
+ addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion");
+ // Equipped creature gets +2/+2.
+ // Whenever a creature dealt damage by equipped creature this turn dies, return that card to the battlefield under your control. Attach Scythe of the Wretched to that creature.
+ // Equip {4}
+ addCard(Zone.BATTLEFIELD, playerB, "Scythe of the Wretched");
+
+ activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Equip {4}", "Silvercoat Lion");
+
+ attack(2, playerB, "Silvercoat Lion");
+ block(2, playerA, "Serra Angel", "Silvercoat Lion");
+
+ setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
+ execute();
+
+ assertLife(playerA, 20);
+ assertLife(playerB, 20);
+
+ assertPermanentCount(playerA, "Serra Angel", 0);
+ assertPermanentCount(playerB, "Serra Angel", 1);
+ assertPowerToughness(playerB, "Serra Angel", 6, 6);
+
+ assertGraveyardCount(playerB, "Silvercoat Lion", 1);
+ }
+
+
+ /**
+ * Test that the creature that died returns to battlefield under your control
+ * if the previous equiped creature does die already in combat and the equipment was destroyed meanwhile
+ */
+ @Test
+ public void testEquipDiedInCombat2() {
+ addCard(Zone.BATTLEFIELD, playerA, "Serra Angel", 1); // 4/4
+ addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
+ addCard(Zone.HAND, playerA, "Disenchant", 1);
+
+ addCard(Zone.BATTLEFIELD, playerB, "Plains", 4);
+ addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion");
+ // Equipped creature gets +2/+2.
+ // Whenever a creature dealt damage by equipped creature this turn dies, return that card to the battlefield under your control. Attach Scythe of the Wretched to that creature.
+ // Equip {4}
+ addCard(Zone.BATTLEFIELD, playerB, "Scythe of the Wretched");
+
+ activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Equip {4}", "Silvercoat Lion");
+
+ attack(2, playerB, "Silvercoat Lion");
+ block(2, playerA, "Serra Angel", "Silvercoat Lion");
+
+ castSpell(2, PhaseStep.COMBAT_DAMAGE, playerA, "Disenchant", "Scythe of the Wretched", "Whenever a creature dealt damage");
+
+ setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
+ execute();
+
+ assertLife(playerA, 20);
+ assertLife(playerB, 20);
+
+ assertGraveyardCount(playerA, "Disenchant", 1);
+ assertGraveyardCount(playerB, "Scythe of the Wretched", 1);
+
+ assertPermanentCount(playerA, "Serra Angel", 0);
+ assertPermanentCount(playerB, "Serra Angel", 1);
+ assertPowerToughness(playerB, "Serra Angel", 4, 4);
+
+ assertGraveyardCount(playerB, "Silvercoat Lion", 1);
+ }
+}
\ No newline at end of file
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java
index e378635919..52dff9e173 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java
@@ -75,4 +75,50 @@ public class FlashbackTest extends CardTestPlayerBase {
assertExileCount("Fracturing Gust", 1);
}
+ /**
+ * My opponent put Iona on the battlefield using Unburial Rites, but my game
+ * log didn't show me the color he has chosen.
+ *
+ */
+ @Test
+ public void testUnburialRites() {
+ addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1);
+ addCard(Zone.BATTLEFIELD, playerA, "Plains", 8);
+ // Return target creature card from your graveyard to the battlefield.
+ // Flashback {3}{W}
+ addCard(Zone.HAND, playerA, "Unburial Rites", 1); // Sorcery - {4}{B}
+
+ // Flying
+ // As Iona, Shield of Emeria enters the battlefield, choose a color.
+ // Your opponents can't cast spells of the chosen color.
+ addCard(Zone.GRAVEYARD, playerA, "Iona, Shield of Emeria");
+
+ // As Lurebound Scarecrow enters the battlefield, choose a color.
+ // When you control no permanents of the chosen color, sacrifice Lurebound Scarecrow.
+ addCard(Zone.GRAVEYARD, playerA, "Lurebound Scarecrow"); // Enchantment - {2}{U}
+
+ addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1);
+ addCard(Zone.HAND, playerB, "Lightning Bolt", 1);
+
+
+ castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Unburial Rites", "Iona, Shield of Emeria");
+ setChoice(playerA, "Red");
+
+ activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Flashback {3}{W}");
+ addTarget(playerA, "Lurebound Scarecrow");
+ setChoice(playerA, "White");
+
+ castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Lightning Bolt", playerA);
+
+ setStopAt(1, PhaseStep.END_TURN);
+ execute();
+
+ assertPermanentCount(playerA, "Iona, Shield of Emeria", 1);
+ assertPermanentCount(playerA, "Lurebound Scarecrow", 1);
+
+ assertHandCount(playerB, "Lightning Bolt", 1);
+
+ assertExileCount("Unburial Rites", 1);
+ }
+
}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java
index 8744f4f5a2..162211c664 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/KickerTest.java
@@ -31,6 +31,7 @@ package org.mage.test.cards.abilities.keywords;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.counters.CounterType;
+import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
@@ -203,4 +204,92 @@ public class KickerTest extends CardTestPlayerBase {
assertLife(playerB, 20);
}
+
+ /**
+ * Bloodhusk Ritualist's discard trigger does nothing if the Ritualist leaves the battlefield before the trigger resolves.
+ */
+ @Test
+ public void testBloodhuskRitualist() {
+ addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1);
+ addCard(Zone.HAND, playerB, "Lightning Bolt");
+ addCard(Zone.HAND, playerB, "Fireball", 2);
+
+ addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5);
+ addCard(Zone.HAND, playerA, "Bloodhusk Ritualist", 1); // 2/2 {2}{B}
+
+ // Multikicker (You may pay an additional {B} any number of times as you cast this spell.)
+ // When Bloodhusk Ritualist enters the battlefield, target opponent discards a card for each time it was kicked.
+ castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Bloodhusk Ritualist");
+ setChoice(playerA, "Yes"); // 2 x Multikicker
+ setChoice(playerA, "Yes");
+ setChoice(playerA, "No");
+ castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Bloodhusk Ritualist");
+
+ setStopAt(1, PhaseStep.BEGIN_COMBAT);
+ execute();
+
+ Assert.assertEquals("All mana has to be used","[]", playerA.getManaAvailable(currentGame).toString());
+ assertGraveyardCount(playerB, "Lightning Bolt", 1);
+ assertGraveyardCount(playerA, "Bloodhusk Ritualist", 1);
+ assertGraveyardCount(playerB, "Fireball", 2);
+
+ assertHandCount(playerB, 0);
+ }
+
+ /**
+ * Test and/or kicker costs
+ */
+ @Test
+ public void testSunscapeBattlemage1() {
+ addCard(Zone.BATTLEFIELD, playerA, "Island", 3);
+ addCard(Zone.BATTLEFIELD, playerA, "Plains", 3);
+
+ // Kicker {1}{G} and/or {2}{U}
+ // When {this} enters the battlefield, if it was kicked with its {1}{G} kicker, destroy target creature with flying.
+ // When {this} enters the battlefield, if it was kicked with its {2}{U} kicker, draw two cards.
+ addCard(Zone.HAND, playerA, "Sunscape Battlemage", 1); // 2/2 {2}{W}
+
+ castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sunscape Battlemage");
+ setChoice(playerA, "No"); // no {1}{G}
+ setChoice(playerA, "Yes"); // but {2}{U}
+
+ setStopAt(1, PhaseStep.BEGIN_COMBAT);
+ execute();
+
+ assertPermanentCount(playerA, "Sunscape Battlemage", 1);
+ assertHandCount(playerA, 2);
+ }
+
+
+ /**
+ * Test and/or kicker costs
+ */
+ @Test
+ public void testSunscapeBattlemage2() {
+ addCard(Zone.BATTLEFIELD, playerA, "Island", 3);
+ addCard(Zone.BATTLEFIELD, playerA, "Plains", 3);
+ addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
+
+
+ // Kicker {1}{G} and/or {2}{U}
+ // When {this} enters the battlefield, if it was kicked with its {1}{G} kicker, destroy target creature with flying.
+ // When {this} enters the battlefield, if it was kicked with its {2}{U} kicker, draw two cards.
+ addCard(Zone.HAND, playerA, "Sunscape Battlemage", 1); // 2/2 {2}{W}
+
+ addCard(Zone.BATTLEFIELD, playerB, "Birds of Paradise", 2);
+
+ castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sunscape Battlemage");
+ addTarget(playerA, "Birds of Paradise");
+ setChoice(playerA, "Yes"); // no {1}{G}
+ setChoice(playerA, "Yes"); // but {2}{U}
+
+ setStopAt(1, PhaseStep.BEGIN_COMBAT);
+ execute();
+
+ assertGraveyardCount(playerB, "Birds of Paradise", 1);
+ assertPermanentCount(playerA, "Sunscape Battlemage", 1);
+ assertHandCount(playerA, 2);
+ }
+
+
}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ProvokeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ProvokeTest.java
index b39949adc9..0200455ca2 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ProvokeTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ProvokeTest.java
@@ -29,6 +29,9 @@ package org.mage.test.cards.abilities.keywords;
import mage.constants.PhaseStep;
import mage.constants.Zone;
+import mage.game.permanent.Permanent;
+import mage.game.permanent.PermanentToken;
+import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
@@ -89,5 +92,5 @@ public class ProvokeTest extends CardTestPlayerBase{
assertLife(playerA, 18); // one attack from Imp
assertLife(playerB, 15); // Not blocked
- }
+ }
}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/WrathOfGodTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/WrathOfGodTest.java
new file mode 100644
index 0000000000..3cf17c6fd6
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/WrathOfGodTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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 org.mage.test.cards.abilities.oneshot.destroy;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class WrathOfGodTest extends CardTestPlayerBase {
+
+ @Test
+ public void testDestroy() {
+ addCard(Zone.BATTLEFIELD, playerA, "Plains",4);
+ addCard(Zone.HAND, playerA, "Wrath of God");
+
+ addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion");
+ // If Mossbridge Troll would be destroyed, regenerate it.
+ // Tap any number of untapped creatures you control other than Mossbridge Troll with total power 10 or greater: Mossbridge Troll gets +20/+20 until end of turn.
+ addCard(Zone.BATTLEFIELD, playerA, "Mossbridge Troll");
+
+ // Flying
+ // Darksteel Gargoyle is indestructible. ("Destroy" effects and lethal damage don't destroy it.)
+ addCard(Zone.BATTLEFIELD, playerA, "Darksteel Gargoyle");
+
+ addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion");
+ addCard(Zone.BATTLEFIELD, playerB, "Mossbridge Troll");
+ addCard(Zone.BATTLEFIELD, playerB, "Darksteel Gargoyle");
+
+
+ castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wrath of God");
+
+ setStopAt(1, PhaseStep.BEGIN_COMBAT);
+ execute();
+ assertPermanentCount(playerA, "Silvercoat Lion", 0);
+ assertPermanentCount(playerA, "Mossbridge Troll", 0);
+ assertPermanentCount(playerA, "Darksteel Gargoyle", 1);
+ assertPermanentCount(playerB, "Silvercoat Lion", 0);
+ assertPermanentCount(playerB, "Mossbridge Troll", 0);
+ assertPermanentCount(playerB, "Darksteel Gargoyle", 1);
+ }
+}
\ No newline at end of file
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SerraAscendantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SerraAscendantTest.java
new file mode 100644
index 0000000000..3e5cd7ae3c
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SerraAscendantTest.java
@@ -0,0 +1,94 @@
+/*
+ * 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 org.mage.test.cards.continuous;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class SerraAscendantTest extends CardTestPlayerBase {
+
+ /**
+ * The game goes on; he plays his Serra Ascendant on turn one, passes the
+ * turn, you play your newly unbanned Wild Nacatl with a Stomping Ground and
+ * also pass the turn. On turn 2, he casts a Martyr of Sands and sacrifices
+ * it, revealing 3 white cards to gain 9 life and end up at 29. He goes to
+ * the combat phase, declares Serra as an attacker, and you happily block
+ * him, thinking that this is such a bad move from him. After the damage is
+ * dealt, the Serra is still there, bigger than ever.
+ */
+ @Test
+ public void testSilence() {
+ addCard(Zone.HAND, playerA, "Plains", 2);
+ // As long as you have 30 or more life, Serra Ascendant gets +5/+5 and has flying.
+ addCard(Zone.HAND, playerA, "Serra Ascendant");
+ // {1}, Reveal X white cards from your hand, Sacrifice Martyr of Sands: You gain three times X life.
+ addCard(Zone.HAND, playerA, "Martyr of Sands");
+ addCard(Zone.HAND, playerA, "Silvercoat Lion",3);
+
+ addCard(Zone.HAND, playerB, "Stomping Ground", 1);
+ addCard(Zone.HAND, playerB, "Wild Nacatl", 1);
+
+ playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Plains");
+ castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Serra Ascendant");
+
+ playLand(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Stomping Ground");
+ setChoice(playerB, "Yes");
+ castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Wild Nacatl");
+
+ playLand(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Plains");
+ castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Martyr of Sands");
+ activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{1},You may reveal X white cards from your hand");
+ setChoice(playerA,"X=3");
+
+ attack(3, playerA, "Serra Ascendant");
+ block(3, playerB, "Wild Nacatl", "Serra Ascendant");
+
+ setStopAt(3, PhaseStep.POSTCOMBAT_MAIN);
+
+ execute();
+
+ assertGraveyardCount(playerA, "Martyr of Sands", 1);
+
+ assertLife(playerB, 18);
+ assertLife(playerA, 30);
+
+ assertPermanentCount(playerB, "Wild Nacatl", 1);
+
+ assertPermanentCount(playerA, "Serra Ascendant", 1);
+ assertPowerToughness(playerA, "Serra Ascendant", 6, 6);
+
+ }
+
+}
\ No newline at end of file
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/requirement/AttackRequirementTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/requirement/AttackRequirementTest.java
new file mode 100644
index 0000000000..6fcfd8a443
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/requirement/AttackRequirementTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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 org.mage.test.cards.requirement;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class AttackRequirementTest extends CardTestPlayerBase {
+
+
+ @Test
+ public void testSimpleAttackRequirement() {
+ // Defender
+ // {G}: Wall of Tanglecord gains reach until end of turn. (It can block creatures with flying.)
+ addCard(Zone.BATTLEFIELD, playerA, "Wall of Tanglecord"); // 0/6
+
+ // Juggernaut attacks each turn if able.
+ // Juggernaut can't be blocked by Walls
+ addCard(Zone.BATTLEFIELD, playerB, "Juggernaut"); // 5/3
+
+ // Juggernaut should be forced to ttack
+ block(2, playerA, "Wall of Tanglecord", "Juggernaut"); // this block should'nt work because of Juggernauts restriction
+
+ setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
+ execute();
+
+ assertLife(playerA, 15);
+ assertLife(playerB, 20);
+
+ }
+
+
+ @Test
+ public void testAttackRequirementWithAttackRestriction() {
+ addCard(Zone.BATTLEFIELD, playerA, "Plains", 3);
+ // Defender
+ // {G}: Wall of Tanglecord gains reach until end of turn. (It can block creatures with flying.)
+ addCard(Zone.BATTLEFIELD, playerA, "Wall of Tanglecord"); // 0/6
+
+ // Creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you
+ addCard(Zone.HAND, playerA, "Ghostly Prison");
+
+ // Juggernaut attacks each turn if able.
+ // Juggernaut can't be blocked by Walls
+ addCard(Zone.BATTLEFIELD, playerB, "Juggernaut"); // 5/3
+
+ castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ghostly Prison");
+
+ // Juggernaut is forced to attack but can't without paying the Ghostly Prison cost and don't has to pay the costs so no attack
+
+ setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
+ execute();
+
+ assertLife(playerA, 20);
+ assertLife(playerB, 20);
+
+ }
+
+}
diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
index be7c65487a..6de99aff26 100644
--- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
+++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
@@ -1127,7 +1127,12 @@ public class TestPlayer implements Player {
public void lookAtCards(String name, Cards cards, Game game) {
computerPlayer.lookAtCards(name, cards, game);
}
-
+
+ @Override
+ public void lookAtCards(String name, Card card, Game game) {
+ computerPlayer.lookAtCards(name, card, game);
+ }
+
@Override
public void phasing(Game game) {
computerPlayer.phasing(game);
diff --git a/Mage/src/mage/MageObjectReference.java b/Mage/src/mage/MageObjectReference.java
index b406030eb9..8242aff19a 100644
--- a/Mage/src/mage/MageObjectReference.java
+++ b/Mage/src/mage/MageObjectReference.java
@@ -69,7 +69,11 @@ public class MageObjectReference implements Comparable<MageObjectReference>, Ser
if (mageObject != null) {
this.zoneChangeCounter = mageObject.getZoneChangeCounter(game);
} else {
- throw new IllegalArgumentException("The provided sourceId is not connected to an object in the game");
+ if (game.getPlayerList().contains(sourceId)) {
+ this.zoneChangeCounter = 0;
+ } else {
+ throw new IllegalArgumentException("The provided sourceId is not connected to an object in the game");
+ }
}
}
diff --git a/Mage/src/mage/abilities/PlayLandAbility.java b/Mage/src/mage/abilities/PlayLandAbility.java
index 416bb45003..60a60797cc 100644
--- a/Mage/src/mage/abilities/PlayLandAbility.java
+++ b/Mage/src/mage/abilities/PlayLandAbility.java
@@ -30,9 +30,9 @@ package mage.abilities;
import java.util.UUID;
import mage.constants.AbilityType;
+import mage.constants.AsThoughEffectType;
import mage.constants.Zone;
import mage.game.Game;
-import mage.game.events.GameEvent;
/**
*
@@ -52,7 +52,8 @@ public class PlayLandAbility extends ActivatedAbilityImpl {
@Override
public boolean canActivate(UUID playerId, Game game) {
- if (!controlsAbility(playerId, game)) {
+ if (!controlsAbility(playerId, game) &&
+ !game.getContinuousEffects().asThough(getSourceId(), AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, playerId, game)) {
return false;
}
//20091005 - 114.2a
diff --git a/Mage/src/mage/abilities/SpellAbility.java b/Mage/src/mage/abilities/SpellAbility.java
index 6deef056b0..2c2d9c0fa2 100644
--- a/Mage/src/mage/abilities/SpellAbility.java
+++ b/Mage/src/mage/abilities/SpellAbility.java
@@ -96,7 +96,8 @@ public class SpellAbility extends ActivatedAbilityImpl {
return false;
}
// fix for Gitaxian Probe and casting opponent's spells
- if (!controllerId.equals(playerId)) {
+ if (!game.getContinuousEffects().asThough(getSourceId(), AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, playerId, game)
+ && !controllerId.equals(playerId)) {
return false;
}
// Check if spell has no costs (not {0} mana costs), than it's not castable. E.g. for spells like Living End, that only can be cast by Suspend Ability.
diff --git a/Mage/src/mage/abilities/condition/common/CardsInOpponentGraveCondition.java b/Mage/src/mage/abilities/condition/common/CardsInOpponentGraveCondition.java
index 6c82596133..1c2d203d2c 100644
--- a/Mage/src/mage/abilities/condition/common/CardsInOpponentGraveCondition.java
+++ b/Mage/src/mage/abilities/condition/common/CardsInOpponentGraveCondition.java
@@ -13,7 +13,7 @@ import java.util.UUID;
* @author Loki
*/
public class CardsInOpponentGraveCondition implements Condition {
- private int value;
+ private final int value;
public CardsInOpponentGraveCondition(int value) {
this.value = value;
diff --git a/Mage/src/mage/abilities/condition/common/KickedCondition.java b/Mage/src/mage/abilities/condition/common/KickedCondition.java
index 88491bdb5d..02c9cfec31 100644
--- a/Mage/src/mage/abilities/condition/common/KickedCondition.java
+++ b/Mage/src/mage/abilities/condition/common/KickedCondition.java
@@ -59,7 +59,7 @@ public class KickedCondition implements Condition {
if (card != null) {
for (Ability ability: card.getAbilities()) {
if (ability instanceof KickerAbility) {
- if(((KickerAbility) ability).isKicked(game)) {
+ if(((KickerAbility) ability).isKicked(game, source, "")) {
return true;
}
}
diff --git a/Mage/src/mage/abilities/condition/common/KickedCostCondition.java b/Mage/src/mage/abilities/condition/common/KickedCostCondition.java
index 0add305c72..2a11646d85 100644
--- a/Mage/src/mage/abilities/condition/common/KickedCostCondition.java
+++ b/Mage/src/mage/abilities/condition/common/KickedCostCondition.java
@@ -24,17 +24,9 @@ public class KickedCostCondition implements Condition {
public boolean apply(Game game, Ability source) {
Card card = game.getCard(source.getSourceId());
if (card != null) {
- KickerAbility kickerAbility = null;
for (Ability ability: card.getAbilities()) {
if (ability instanceof KickerAbility) {
- kickerAbility = (KickerAbility) ability;
- }
- }
- if (kickerAbility != null) {
- for (OptionalAdditionalCost cost: kickerAbility.getKickerCosts()) {
- if (cost.getText(true).equals(kickerCostText)) {
- return cost.isActivated();
- }
+ return ((KickerAbility) ability).isKicked(game, source, kickerCostText);
}
}
}
diff --git a/Mage/src/mage/abilities/condition/common/SourceDealtDamageCondition.java b/Mage/src/mage/abilities/condition/common/SourceDealtDamageCondition.java
new file mode 100644
index 0000000000..0a4f7044e1
--- /dev/null
+++ b/Mage/src/mage/abilities/condition/common/SourceDealtDamageCondition.java
@@ -0,0 +1,37 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package mage.abilities.condition.common;
+
+import mage.abilities.Ability;
+import mage.abilities.condition.Condition;
+import mage.game.Game;
+import mage.watchers.common.DamageDoneWatcher;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class SourceDealtDamageCondition implements Condition {
+ private final int value;
+
+ public SourceDealtDamageCondition(int value) {
+ this.value = value;
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ DamageDoneWatcher watcher = (DamageDoneWatcher) game.getState().getWatchers().get("DamageDone");
+ return watcher != null && watcher.damageDone(source.getSourceId(), source.getSourceObjectZoneChangeCounter(), game) >= value;
+ }
+
+ @Override
+ public String toString() {
+ return "{this} has dealt " + value + " or more damage this turn" ;
+ }
+
+
+}
\ No newline at end of file
diff --git a/Mage/src/mage/abilities/condition/common/SpellMasteryCondition.java b/Mage/src/mage/abilities/condition/common/SpellMasteryCondition.java
new file mode 100644
index 0000000000..fd8a29207c
--- /dev/null
+++ b/Mage/src/mage/abilities/condition/common/SpellMasteryCondition.java
@@ -0,0 +1,53 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package mage.abilities.condition.common;
+
+import mage.abilities.Ability;
+import mage.abilities.condition.Condition;
+import mage.constants.CardType;
+import mage.filter.FilterCard;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.game.Game;
+import mage.players.Player;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class SpellMasteryCondition implements Condition {
+
+ private static final FilterCard filter = new FilterCard();
+
+ static {
+ filter.add(Predicates.or(new CardTypePredicate(CardType.INSTANT), new CardTypePredicate(CardType.SORCERY)));
+ }
+
+ private static SpellMasteryCondition fInstance = null;
+
+ public static SpellMasteryCondition getInstance() {
+ if (fInstance == null) {
+ fInstance = new SpellMasteryCondition();
+ }
+ return fInstance;
+ }
+
+ private SpellMasteryCondition() {}
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Player player = game.getPlayer(source.getControllerId());
+ return player != null && player.getGraveyard().count(filter, game) >= 2;
+ }
+
+ @Override
+ public String toString() {
+ return "there are two or more instant and/or sorcery cards in your graveyard";
+ }
+
+
+}
\ No newline at end of file
diff --git a/Mage/src/mage/abilities/costs/common/ExileFromTopOfLibraryCost.java b/Mage/src/mage/abilities/costs/common/ExileFromTopOfLibraryCost.java
new file mode 100644
index 0000000000..0262041875
--- /dev/null
+++ b/Mage/src/mage/abilities/costs/common/ExileFromTopOfLibraryCost.java
@@ -0,0 +1,81 @@
+/*
+ * 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.abilities.costs.common;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.costs.CostImpl;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.players.Player;
+import mage.util.CardUtil;
+
+/**
+ *
+ * @author LoneFox
+ */
+public class ExileFromTopOfLibraryCost extends CostImpl {
+
+ private final int amount;
+
+ public ExileFromTopOfLibraryCost(int amount) {
+ this.amount = amount;
+ this.text = "Exile the top " + (amount == 1 ? "card" : CardUtil.numberToText(amount) + " cards")
+ + " of your library";
+ }
+
+ public ExileFromTopOfLibraryCost(ExileFromTopOfLibraryCost cost) {
+ super(cost);
+ this.amount = cost.amount;
+ }
+
+ @Override
+ public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) {
+ Player controller = game.getPlayer(controllerId);
+ if(controller == null) {
+ return false;
+ }
+ return controller.getLibrary().size() >= amount;
+ }
+
+ @Override
+ public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana) {
+ Player controller = game.getPlayer(controllerId);
+ if(controller != null) {
+ controller.moveCards(controller.getLibrary().getTopCards(game, amount), Zone.LIBRARY, Zone.EXILED, ability, game);
+ paid = true;
+ }
+ return paid;
+ }
+
+ @Override
+ public ExileFromTopOfLibraryCost copy() {
+ return new ExileFromTopOfLibraryCost(this);
+ }
+}
diff --git a/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java b/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
index 28ba0af2cd..5a4cae21da 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
@@ -1,5 +1,6 @@
package mage.abilities.decorator;
+import mage.MageObject;
import mage.abilities.TriggeredAbility;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.condition.Condition;
@@ -74,4 +75,21 @@ public class ConditionalTriggeredAbility extends TriggeredAbilityImpl {
return ability.getEffects();
}
+ @Override
+ public MageObject getSourceObjectIfItStillExists(Game game) {
+ return ability.getSourceObjectIfItStillExists(game);
+ }
+
+ @Override
+ public MageObject getSourceObject(Game game) {
+ return ability.getSourceObject(game);
+ }
+
+
+
+ @Override
+ public int getSourceObjectZoneChangeCounter() {
+ return ability.getSourceObjectZoneChangeCounter();
+ }
+
}
diff --git a/Mage/src/mage/abilities/dynamicvalue/common/MultikickerCount.java b/Mage/src/mage/abilities/dynamicvalue/common/MultikickerCount.java
index 7ad2b93eeb..d52f265e43 100644
--- a/Mage/src/mage/abilities/dynamicvalue/common/MultikickerCount.java
+++ b/Mage/src/mage/abilities/dynamicvalue/common/MultikickerCount.java
@@ -50,7 +50,7 @@ public class MultikickerCount implements DynamicValue {
if (card != null) {
for (Ability ability: card.getAbilities()) {
if (ability instanceof KickerAbility) {
- count += ((KickerAbility) ability).getKickedCounter(game);
+ count += ((KickerAbility) ability).getKickedCounter(game, source);
}
}
}
diff --git a/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java b/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
index a30192d886..92dbfa7aa0 100644
--- a/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
+++ b/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
@@ -95,21 +95,14 @@ public class EntersBattlefieldEffect extends ReplacementEffectImpl {
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
- if (event.getType() == EventType.ENTERS_THE_BATTLEFIELD) {
- if (event.getTargetId().equals(source.getSourceId())) {
- if (condition == null || condition.apply(game, source)) {
- return true;
- }
+ if (event.getTargetId().equals(source.getSourceId())) {
+ if (condition == null || condition.apply(game, source)) {
+ return true;
}
}
return false;
}
- @Override
- public boolean apply(Game game, Ability source) {
- return false;
- }
-
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
if (optional) {
diff --git a/Mage/src/mage/abilities/effects/ReplacementEffectImpl.java b/Mage/src/mage/abilities/effects/ReplacementEffectImpl.java
index 48b96a68be..a0c2208381 100644
--- a/Mage/src/mage/abilities/effects/ReplacementEffectImpl.java
+++ b/Mage/src/mage/abilities/effects/ReplacementEffectImpl.java
@@ -33,7 +33,6 @@ import mage.constants.Duration;
import mage.constants.EffectType;
import mage.constants.Outcome;
import mage.game.Game;
-import mage.game.events.GameEvent;
/**
*
diff --git a/Mage/src/mage/abilities/effects/common/ChooseColorEffect.java b/Mage/src/mage/abilities/effects/common/ChooseColorEffect.java
index ff5d4cee3c..76c84fba22 100644
--- a/Mage/src/mage/abilities/effects/common/ChooseColorEffect.java
+++ b/Mage/src/mage/abilities/effects/common/ChooseColorEffect.java
@@ -35,6 +35,7 @@ import mage.constants.Outcome;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
+import mage.util.CardUtil;
/**
*
@@ -64,10 +65,10 @@ public class ChooseColorEffect extends OneShotEffect {
}
}
if (!game.isSimulation()) {
- game.informPlayers(new StringBuilder(permanent.getLogName()).append(": ").append(controller.getLogName()).append(" has chosen ").append(choice.getChoice()).toString());
+ game.informPlayers(permanent.getLogName()+": "+controller.getLogName()+" has chosen "+choice.getChoice());
}
game.getState().setValue(source.getSourceId() + "_color", choice.getColor());
- permanent.addInfo("chosen color", "<font color = 'blue'>Chosen color: " + choice.getColor().getDescription() + "</font>", game);
+ permanent.addInfo("chosen color", CardUtil.addToolTipMarkTags("Chosen color: " + choice.getChoice()), game);
return true;
}
return false;
diff --git a/Mage/src/mage/abilities/effects/common/HideawayPlayEffect.java b/Mage/src/mage/abilities/effects/common/HideawayPlayEffect.java
index 039ce418f7..63358fb60c 100644
--- a/Mage/src/mage/abilities/effects/common/HideawayPlayEffect.java
+++ b/Mage/src/mage/abilities/effects/common/HideawayPlayEffect.java
@@ -70,7 +70,7 @@ public class HideawayPlayEffect extends OneShotEffect {
if (card.getCardType().contains(CardType.LAND)) {
// If the revealed card is a land, you can play it only if it's your turn and you haven't yet played a land this turn.
if (game.getActivePlayerId().equals(source.getControllerId()) && controller.canPlayLand()) {
- if (controller.chooseUse(Outcome.Benefit, new StringBuilder("Play ").append(card.getName()).append(" from Exile?").toString(), game)) {
+ if (controller.chooseUse(Outcome.Benefit, "Play " + card.getLogName() + " from Exile?", game)) {
card.setFaceDown(false, game);
return controller.playLand(card, game);
}
@@ -82,7 +82,7 @@ public class HideawayPlayEffect extends OneShotEffect {
// The land's last ability allows you to play the removed card as part of the resolution of that ability.
// Timing restrictions based on the card's type are ignored (for instance, if it's a creature or sorcery).
// Other play restrictions are not (such as "Play [this card] only during combat").
- if (controller.chooseUse(Outcome.Benefit, new StringBuilder("Cast ").append(card.getName()).append(" without paying it's mana cost?").toString(), game)) {
+ if (controller.chooseUse(Outcome.Benefit, "Cast "+ card.getLogName() + " without paying it's mana cost?", game)) {
card.setFaceDown(false, game);
return controller.cast(card.getSpellAbility(), game, true);
}
diff --git a/Mage/src/mage/abilities/effects/common/ReturnToLibrarySpellEffect.java b/Mage/src/mage/abilities/effects/common/ReturnToLibrarySpellEffect.java
index 35e3292023..bc8af09cfe 100644
--- a/Mage/src/mage/abilities/effects/common/ReturnToLibrarySpellEffect.java
+++ b/Mage/src/mage/abilities/effects/common/ReturnToLibrarySpellEffect.java
@@ -33,6 +33,7 @@ import mage.cards.Card;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
+import mage.game.stack.Spell;
import mage.players.Player;
/**
@@ -58,9 +59,12 @@ public class ReturnToLibrarySpellEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
- Card spellCard = game.getStack().getSpell(source.getSourceId()).getCard();
- if (spellCard != null) {
- controller.moveCardToLibraryWithInfo(spellCard, source.getSourceId(), game, Zone.STACK, toTop, true);
+ Spell spell = game.getStack().getSpell(source.getSourceId());
+ if (spell != null) {
+ Card spellCard = game.getStack().getSpell(source.getSourceId()).getCard();
+ if (spellCard != null) {
+ controller.moveCardToLibraryWithInfo(spellCard, source.getSourceId(), game, Zone.STACK, toTop, true);
+ }
}
return true;
}
diff --git a/Mage/src/mage/abilities/effects/common/ShuffleIntoLibrarySourceEffect.java b/Mage/src/mage/abilities/effects/common/ShuffleIntoLibrarySourceEffect.java
index 22f8bf9f66..5310e50938 100644
--- a/Mage/src/mage/abilities/effects/common/ShuffleIntoLibrarySourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/ShuffleIntoLibrarySourceEffect.java
@@ -28,12 +28,14 @@
package mage.abilities.effects.common;
+import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
+import mage.game.permanent.Permanent;
import mage.players.Player;
/**
@@ -54,15 +56,27 @@ public class ShuffleIntoLibrarySourceEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
- Card card = game.getCard(source.getSourceId());
- if (card != null) {
- Player player = game.getPlayer(card.getOwnerId());
- if (player != null) {
- Zone fromZone = game.getState().getZone(card.getId());
- player.moveCardToLibraryWithInfo(card, source.getSourceId(), game, fromZone, true, true);
- player.shuffleLibrary(game);
- return true;
+ MageObject mageObject = source.getSourceObjectIfItStillExists(game);
+ if (mageObject != null) {
+ Zone fromZone = game.getState().getZone(mageObject.getId());
+ Player owner;
+ if (mageObject instanceof Permanent) {
+ owner = game.getPlayer(((Permanent) mageObject).getOwnerId());
+ if (owner != null) {
+ owner.moveCardToLibraryWithInfo((Permanent)mageObject, source.getSourceId(), game, fromZone, true, true);
+ owner.shuffleLibrary(game);
+ return true;
+ }
+ } else if (mageObject instanceof Card) {
+ owner = game.getPlayer(((Card) mageObject).getOwnerId());
+ if (owner != null) {
+ owner.moveCardToLibraryWithInfo((Card)mageObject, source.getSourceId(), game, fromZone, true, true);
+ owner.shuffleLibrary(game);
+ return true;
+ }
}
+
+
}
return false;
}
diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java b/Mage/src/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java
index 3931652585..31a33d5831 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java
@@ -72,7 +72,7 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
public BecomesBasicLandTargetEffect(Duration duration, boolean chooseLandType, String... landNames) {
this(duration, chooseLandType, true, landNames);
}
-
+
public BecomesBasicLandTargetEffect(Duration duration, boolean chooseLandType, boolean loseOther, String... landNames) {
super(duration, Outcome.Detriment);
this.landTypes.addAll(Arrays.asList(landNames));
@@ -86,6 +86,7 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
super(effect);
this.landTypes.addAll(effect.landTypes);
this.chooseLandType = effect.chooseLandType;
+ this.loseOther = effect.loseOther;
}
@Override
@@ -111,7 +112,7 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
this.discard();
}
}
-
+
if(!loseOther) {
for (UUID targetPermanent : targetPointer.getTargets(game, source)) {
Permanent land = game.getPermanent(targetPermanent);
diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java
index 6ed437d089..77b9483002 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java
@@ -80,6 +80,7 @@ public class GainAbilityAllEffect extends ContinuousEffectImpl {
public GainAbilityAllEffect(final GainAbilityAllEffect effect) {
super(effect);
this.ability = effect.ability.copy();
+ ability.newId(); // This is needed if the effect is copied e.g. by a clone so the ability can be added multiple times to permanents
this.filter = effect.filter.copy();
this.excludeSource = effect.excludeSource;
}
diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java
index cdbc829cbb..6a0509da83 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java
@@ -80,6 +80,7 @@ public class GainAbilityAttachedEffect extends ContinuousEffectImpl {
public GainAbilityAttachedEffect(final GainAbilityAttachedEffect effect) {
super(effect);
this.ability = effect.ability.copy();
+ ability.newId(); // This is needed if the effect is copied e.g. by a clone so the ability can be added multiple times to permanents
this.attachmentType = effect.attachmentType;
this.fixedTarget = effect.fixedTarget;
}
diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityPairedEffect.java b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityPairedEffect.java
index 7f7b4c49e7..686b7f0a52 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityPairedEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityPairedEffect.java
@@ -54,6 +54,7 @@ public class GainAbilityPairedEffect extends ContinuousEffectImpl {
public GainAbilityPairedEffect(final GainAbilityPairedEffect effect) {
super(effect);
this.ability = effect.ability.copy();
+ ability.newId(); // This is needed if the effect is copied e.g. by a clone so the ability can be added multiple times to permanents
}
@Override
@@ -68,7 +69,7 @@ public class GainAbilityPairedEffect extends ContinuousEffectImpl {
Permanent paired = game.getPermanent(permanent.getPairedCard());
if (paired != null) {
permanent.addAbility(ability, game);
- paired.addAbility(ability, source.getSourceId(), game);
+ paired.addAbility(ability, source.getSourceId(), game, false);
return true;
}
}
diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilitySourceEffect.java b/Mage/src/mage/abilities/effects/common/continuous/GainAbilitySourceEffect.java
index cd691be7fe..81fc17c970 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/GainAbilitySourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/GainAbilitySourceEffect.java
@@ -80,6 +80,7 @@ public class GainAbilitySourceEffect extends ContinuousEffectImpl implements Sou
public GainAbilitySourceEffect(final GainAbilitySourceEffect effect) {
super(effect);
this.ability = effect.ability.copy();
+ ability.newId(); // This is needed if the effect is copied e.g. by a clone so the ability can be added multiple times to permanents
this.onCard = effect.onCard;
}
diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java
index d8635ef0f2..404c0476d7 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java
@@ -77,6 +77,7 @@ public class GainAbilityTargetEffect extends ContinuousEffectImpl {
public GainAbilityTargetEffect(final GainAbilityTargetEffect effect) {
super(effect);
this.ability = effect.ability.copy();
+ ability.newId(); // This is needed if the effect is copied e.g. by a clone so the ability can be added multiple times to permanents
this.onCard = effect.onCard;
this.durationPhaseStep = effect.durationPhaseStep;
this.durationPlayerId = effect.durationPlayerId;
diff --git a/Mage/src/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java b/Mage/src/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java
index 4a3ac3919a..0c68c6db67 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java
@@ -52,7 +52,7 @@ public class PlayTheTopCardEffect extends AsThoughEffectImpl {
}
public PlayTheTopCardEffect(FilterCard filter) {
- super(AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit);
+ super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit);
this.filter = filter;
staticText = "You may play the top card of your library if it's a " + filter.getMessage();
}
diff --git a/Mage/src/mage/abilities/keyword/CantBlockAloneAttachedEffect.java b/Mage/src/mage/abilities/keyword/CantBlockAloneAttachedEffect.java
deleted file mode 100644
index 06b01440a2..0000000000
--- a/Mage/src/mage/abilities/keyword/CantBlockAloneAttachedEffect.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package mage.abilities.keyword;
-
-/**
- *
- * @author ludwig.hirth
- */
-public class CantBlockAloneAttachedEffect {
-
-}
diff --git a/Mage/src/mage/abilities/keyword/HauntAbility.java b/Mage/src/mage/abilities/keyword/HauntAbility.java
index 76e3ebc6f0..d9e276b1ec 100644
--- a/Mage/src/mage/abilities/keyword/HauntAbility.java
+++ b/Mage/src/mage/abilities/keyword/HauntAbility.java
@@ -40,7 +40,6 @@ import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
-import mage.game.events.GameEvent.EventType;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
import mage.target.common.TargetCreaturePermanent;
diff --git a/Mage/src/mage/abilities/keyword/HideawayAbility.java b/Mage/src/mage/abilities/keyword/HideawayAbility.java
index b59172bccf..124e7eec05 100644
--- a/Mage/src/mage/abilities/keyword/HideawayAbility.java
+++ b/Mage/src/mage/abilities/keyword/HideawayAbility.java
@@ -64,7 +64,7 @@ import mage.util.CardUtil;
*/
public class HideawayAbility extends StaticAbility {
- public HideawayAbility(Card card) {
+ public HideawayAbility() {
super(Zone.BATTLEFIELD, new EntersBattlefieldEffect(new TapSourceEffect(true)));
Ability ability = new EntersBattlefieldTriggeredAbility(new HideawayExileEffect(), false);
ability.setRuleVisible(false);
@@ -93,7 +93,6 @@ public class HideawayAbility extends StaticAbility {
class HideawayExileEffect extends OneShotEffect {
private static FilterCard filter1 = new FilterCard("card to exile face down");
- private static FilterCard filter2 = new FilterCard("card to put on the bottom of your library");
public HideawayExileEffect() {
super(Outcome.Benefit);
@@ -111,46 +110,26 @@ class HideawayExileEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
- Player player = game.getPlayer(source.getControllerId());
- Cards cards = new CardsImpl(Zone.PICK);
- int count = Math.min(player.getLibrary().size(), 4);
- for (int i = 0; i < count; i++) {
- Card card = player.getLibrary().removeFromTop(game);
- cards.add(card);
- game.setZone(card.getId(), Zone.PICK);
- }
-
+ Player controller = game.getPlayer(source.getControllerId());
Permanent hideawaySource = game.getPermanent(source.getSourceId());
- if (cards.size() == 0 || hideawaySource == null) {
+ if (hideawaySource == null || controller == null) {
return false;
}
-
- TargetCard target1 = new TargetCard(Zone.PICK, filter1);
- if (player.choose(Outcome.Detriment, cards, target1, game)) {
- Card card = cards.get(target1.getFirstTarget(), game);
- if (card != null) {
- cards.remove(card);
- card.moveToExile(CardUtil.getCardExileZoneId(game, source),
- new StringBuilder("Hideaway (").append(hideawaySource.getName()).append(")").toString(),
- source.getSourceId(), game);
- card.setFaceDown(true, game);
- }
- target1.clearChosen();
- }
-
+
+ Cards cards = new CardsImpl(Zone.LIBRARY);
+ cards.addAll(controller.getLibrary().getTopCards(game, 4));
if (cards.size() > 0) {
- TargetCard target2 = new TargetCard(Zone.PICK, filter2);
- while (player.isInGame() && cards.size() > 1) {
- player.choose(Outcome.Benefit, cards, target2, game);
- Card card = cards.get(target2.getFirstTarget(), game);
+ TargetCard target1 = new TargetCard(Zone.LIBRARY, filter1);
+ if (controller.choose(Outcome.Detriment, cards, target1, game)) {
+ Card card = cards.get(target1.getFirstTarget(), game);
if (card != null) {
cards.remove(card);
- card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, false);
+ controller.moveCardToExileWithInfo(card, CardUtil.getCardExileZoneId(game, source),
+ "Hideaway (" + hideawaySource.getIdName() +")", source.getSourceId(), game, Zone.LIBRARY, false);
+ card.setFaceDown(true, game);
}
- target2.clearChosen();
}
- Card card = cards.get(cards.iterator().next(), game);
- card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, false);
+ controller.putCardsOnBottomOfLibrary(cards, game, source, true);
}
return true;
@@ -179,24 +158,25 @@ class HideawayLookAtFaceDownCardEffect extends AsThoughEffectImpl {
}
@Override
- public boolean applies(UUID sourceId, Ability source, UUID affectedControllerId, Game game) {
- Card card = game.getCard(sourceId);
- if (card != null && game.getState().getZone(sourceId) == Zone.EXILED) {
- Card sourceCard = game.getCard(source.getSourceId());
- if (sourceCard == null) {
- return false;
- }
-
+ public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
+ if (game.getState().getZone(objectId) != Zone.EXILED
+ || !game.getState().getCardState(objectId).isFaceDown()) {
+ return false;
+ }
+ // TODO: Does not handle if a player had the control of the land permanent some time before
+ // we would need to add a watcher to handle this
+ Permanent sourcePermanet = game.getPermanentOrLKIBattlefield(source.getSourceId());
+ if (sourcePermanet != null && sourcePermanet.getControllerId().equals(affectedControllerId)) {
ExileZone exile = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, source));
- if (exile != null && exile.contains(sourceId)) {
- Cards cards = new CardsImpl(card);
- Player controller = game.getPlayer(source.getControllerId());
- if (controller != null) {
- // only the controller can see the card, so return always false
- controller.lookAtCards("Exiled with " + sourceCard.getName(), cards, game);
+ Card card = game.getCard(objectId);
+ if (exile != null && exile.contains(objectId) && card != null) {
+ Player player = game.getPlayer(affectedControllerId);
+ if (player != null) {
+ player.lookAtCards("Hideaway by " + sourcePermanet.getIdName(), card, game);
}
}
}
+ // only the current or a previous controller can see the card, so always return false for reveal request
return false;
}
}
diff --git a/Mage/src/mage/abilities/keyword/KickerAbility.java b/Mage/src/mage/abilities/keyword/KickerAbility.java
index fef48ffa24..ada8a8248f 100644
--- a/Mage/src/mage/abilities/keyword/KickerAbility.java
+++ b/Mage/src/mage/abilities/keyword/KickerAbility.java
@@ -28,9 +28,11 @@
package mage.abilities.keyword;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import mage.abilities.Ability;
import mage.abilities.SpellAbility;
import mage.abilities.StaticAbility;
@@ -42,7 +44,7 @@ import mage.abilities.costs.OptionalAdditionalSourceCosts;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.costs.mana.VariableManaCost;
-import mage.cards.Card;
+import mage.constants.AbilityType;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
@@ -87,12 +89,12 @@ public class KickerAbility extends StaticAbility implements OptionalAdditionalSo
protected static final String KICKER_REMINDER_MANA = "(You may pay an additional {cost} as you cast this spell.)";
protected static final String KICKER_REMINDER_COST = "(You may {cost} in addition to any other costs as you cast this spell.)";
+ protected Map<String, Integer> activations = new HashMap<>(); // zoneChangeCounter, activations
+
protected String keywordText;
protected String reminderText;
protected List<OptionalAdditionalCost> kickerCosts = new LinkedList<>();
private int xManaValue = 0;
- // needed to reset kicked status, if card changes zone after casting it
- private int zoneChangeCounter = 0;
public KickerAbility(String manaString) {
this(KICKER_KEYWORD, KICKER_REMINDER_MANA);
@@ -118,7 +120,7 @@ public class KickerAbility extends StaticAbility implements OptionalAdditionalSo
this.keywordText = ability.keywordText;
this.reminderText = ability.reminderText;
this.xManaValue = ability.xManaValue;
- this.zoneChangeCounter = ability.zoneChangeCounter;
+ this.activations.putAll(ability.activations);
}
@@ -139,39 +141,30 @@ public class KickerAbility extends StaticAbility implements OptionalAdditionalSo
return kickerCost;
}
- public void resetKicker() {
+ public void resetKicker(Game game, Ability source) {
+ String key = getActivationKey(source, "", game);
+ activations.remove(key);
for (OptionalAdditionalCost cost: kickerCosts) {
cost.reset();
}
- zoneChangeCounter = 0;
}
public int getXManaValue() {
return xManaValue;
}
- public int getKickedCounter(Game game) {
- if (isKicked(game)) {
- int counter = 0;
- for (OptionalAdditionalCost cost: kickerCosts) {
- counter += cost.getActivateCount();
- }
- return counter;
+ public int getKickedCounter(Game game, Ability source) {
+ String key = getActivationKey(source, "", game);
+ if (activations.containsKey(key)) {
+ return activations.get(key);
}
return 0;
}
- public boolean isKicked(Game game) {
- Card card = game.getCard(sourceId);
- // kicked status counts only if card not changed zone since it was kicked
- if (card != null && card.getZoneChangeCounter(game) <= zoneChangeCounter +1) {
- for (OptionalAdditionalCost cost: kickerCosts) {
- if(cost.isActivated()) {
- return true;
- }
- }
- } else {
- this.resetKicker();
+ public boolean isKicked(Game game, Ability source, String costText) {
+ String key = getActivationKey(source, costText, game);
+ if (activations.containsKey(key)) {
+ return activations.get(key) > 0;
}
return false;
}
@@ -180,36 +173,43 @@ public class KickerAbility extends StaticAbility implements OptionalAdditionalSo
return kickerCosts;
}
- private void activateKicker(OptionalAdditionalCost kickerCost, Game game) {
- kickerCost.activate();
- // remember zone change counter
- if (zoneChangeCounter == 0) {
- Card card = game.getCard(getSourceId());
- if (card != null) {
- zoneChangeCounter = card.getZoneChangeCounter(game);
- } else {
- throw new IllegalArgumentException("Kicker source card not found");
- }
+ private void activateKicker(OptionalAdditionalCost kickerCost, Ability source, Game game) {
+ int amount = 1;
+ String key = getActivationKey(source, kickerCost.getText(true), game);
+ if (activations.containsKey(key)) {
+ amount += activations.get(key);
}
+ activations.put(key, amount);
}
+ private String getActivationKey(Ability source, String costText, Game game) {
+ int zcc = source.getSourceObjectZoneChangeCounter();
+ if (source.getSourceObjectZoneChangeCounter() == 0) {
+ zcc = game.getState().getZoneChangeCounter(source.getSourceId());
+ }
+ if (zcc > 0 && (source.getAbilityType().equals(AbilityType.TRIGGERED) || source.getAbilityType().equals(AbilityType.STATIC))) {
+ --zcc;
+ }
+ return String.valueOf(zcc) + ((kickerCosts.size() > 1) ? costText :"");
+ }
+
@Override
public void addOptionalAdditionalCosts(Ability ability, Game game) {
if (ability instanceof SpellAbility) {
Player player = game.getPlayer(controllerId);
if (player != null) {
- this.resetKicker();
+ this.resetKicker(game, ability);
for (OptionalAdditionalCost kickerCost: kickerCosts) {
boolean again = true;
while (player.isInGame() && again) {
String times = "";
if (kickerCost.isRepeatable()) {
- int activatedCount = kickerCost.getActivateCount();
+ int activatedCount = getKickedCounter(game, ability);
times = Integer.toString(activatedCount + 1) + (activatedCount == 0 ? " time ":" times ");
}
if (kickerCost.canPay(ability, sourceId, controllerId, game) &&
- player.chooseUse(Outcome.Benefit, new StringBuilder("Pay ").append(times).append(kickerCost.getText(false)).append(" ?").toString(), game)) {
- this.activateKicker(kickerCost, game);
+ player.chooseUse(Outcome.Benefit, "Pay " + times + kickerCost.getText(false) + " ?", game)) {
+ this.activateKicker(kickerCost, ability, game);
for (Iterator it = ((Costs) kickerCost).iterator(); it.hasNext();) {
Cost cost = (Cost) it.next();
if (cost instanceof ManaCostsImpl) {
diff --git a/Mage/src/mage/abilities/keyword/MenaceAbility.java b/Mage/src/mage/abilities/keyword/MenaceAbility.java
new file mode 100644
index 0000000000..cad29e9ab9
--- /dev/null
+++ b/Mage/src/mage/abilities/keyword/MenaceAbility.java
@@ -0,0 +1,38 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package mage.abilities.keyword;
+
+import mage.abilities.Ability;
+import mage.abilities.StaticAbility;
+import mage.abilities.effects.common.combat.CantBeBlockedByMoreThanOneSourceEffect;
+import mage.abilities.effects.common.combat.CantBeBlockedByOneEffect;
+import mage.constants.Zone;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class MenaceAbility extends StaticAbility {
+
+ public MenaceAbility() {
+ super(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2));
+ }
+
+ public MenaceAbility(MenaceAbility ability) {
+ super(ability);
+ }
+
+ @Override
+ public Ability copy() {
+ return new MenaceAbility(this);
+ }
+
+ @Override
+ public String getRule() {
+ return "Menace <i>(This creature can't be blocked except by two or more creatures.)</i>";
+ }
+
+}
diff --git a/Mage/src/mage/cards/repository/CardRepository.java b/Mage/src/mage/cards/repository/CardRepository.java
index 6cfd22889b..587634b387 100644
--- a/Mage/src/mage/cards/repository/CardRepository.java
+++ b/Mage/src/mage/cards/repository/CardRepository.java
@@ -60,7 +60,7 @@ public enum CardRepository {
// raise this if db structure was changed
private static final long CARD_DB_VERSION = 39;
// raise this if new cards were added to the server
- private static final long CARD_CONTENT_VERSION = 19;
+ private static final long CARD_CONTENT_VERSION = 20;
private final Random random = new Random();
private Dao<CardInfo, Object> cardDao;
diff --git a/Mage/src/mage/constants/AsThoughEffectType.java b/Mage/src/mage/constants/AsThoughEffectType.java
index 66f09ee240..433fbd7c03 100644
--- a/Mage/src/mage/constants/AsThoughEffectType.java
+++ b/Mage/src/mage/constants/AsThoughEffectType.java
@@ -11,7 +11,7 @@ public enum AsThoughEffectType {
BLOCK_SHADOW,
BLOCK_DRAGON,
BE_BLOCKED,
- PLAY_FROM_NON_HAND_ZONE,
+ PLAY_FROM_NOT_OWN_HAND_ZONE,
CAST_AS_INSTANT,
ACTIVATE_AS_INSTANT,
DAMAGE,
diff --git a/Mage/src/mage/game/GameCommanderImpl.java b/Mage/src/mage/game/GameCommanderImpl.java
index 4a12851b2e..92fbac3425 100644
--- a/Mage/src/mage/game/GameCommanderImpl.java
+++ b/Mage/src/mage/game/GameCommanderImpl.java
@@ -56,8 +56,10 @@ import mage.watchers.common.CommanderInfoWatcher;
public abstract class GameCommanderImpl extends GameImpl {
+ static boolean CHECK_COMMANDER_DAMAGE = true;
+
private final Map<UUID, Cards> mulliganedCards = new HashMap<>();
- private final Set<CommanderInfoWatcher> commanderCombatWatcher = new HashSet<>();
+ // private final Set<CommanderInfoWatcher> commanderCombatWatcher = new HashSet<>();
protected boolean alsoHand; // replace commander going to hand
protected boolean alsoLibrary; // replace commander going to library
@@ -91,9 +93,8 @@ public abstract class GameCommanderImpl extends GameImpl {
ability.addEffect(new CommanderCostModification(commander.getId()));
ability.addEffect(new CommanderManaReplacementEffect(player.getId(), CardUtil.getColorIdentity(commander)));
getState().setValue(commander.getId() + "_castCount", 0);
- CommanderInfoWatcher watcher = new CommanderInfoWatcher(commander.getId(), true);
+ CommanderInfoWatcher watcher = new CommanderInfoWatcher(commander.getId(), CHECK_COMMANDER_DAMAGE);
getState().getWatchers().add(watcher);
- this.commanderCombatWatcher.add(watcher);
watcher.addCardInfoToCommander(this);
}
}
@@ -185,12 +186,13 @@ public abstract class GameCommanderImpl extends GameImpl {
*/
@Override
protected boolean checkStateBasedActions() {
- for (CommanderInfoWatcher damageWatcher: commanderCombatWatcher) {
+ for (Player player: getPlayers().values()) {
+ CommanderInfoWatcher damageWatcher = (CommanderInfoWatcher) getState().getWatchers().get("CommanderCombatDamageWatcher", player.getCommanderId());
for(Map.Entry<UUID, Integer> entrySet : damageWatcher.getDamageToPlayer().entrySet()){
if (entrySet.getValue() > 20) {
- Player player = getPlayer(entrySet.getKey());
- if (player != null && player.isInGame()){
- player.lost(this);
+ Player opponent = getPlayer(entrySet.getKey());
+ if (opponent != null && player.isInGame()){
+ opponent.lost(this);
}
}
}
diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java
index 505bfa8c0f..f9a2930de5 100644
--- a/Mage/src/mage/game/GameImpl.java
+++ b/Mage/src/mage/game/GameImpl.java
@@ -122,6 +122,7 @@ import mage.watchers.Watchers;
import mage.watchers.common.BlockedAttackerWatcher;
import mage.watchers.common.BloodthirstWatcher;
import mage.watchers.common.CastSpellLastTurnWatcher;
+import mage.watchers.common.DamageDoneWatcher;
import mage.watchers.common.MorbidWatcher;
import mage.watchers.common.PlayerDamagedBySourceWatcher;
import mage.watchers.common.PlayerLostLifeWatcher;
@@ -912,6 +913,7 @@ public abstract class GameImpl implements Game, Serializable {
watchers.add(new SoulbondWatcher());
watchers.add(new PlayerLostLifeWatcher());
watchers.add(new BlockedAttackerWatcher());
+ watchers.add(new DamageDoneWatcher());
//20100716 - 103.5
for (UUID playerId: state.getPlayerList(startingPlayerId)) {
@@ -1144,6 +1146,7 @@ public abstract class GameImpl implements Game, Serializable {
int bookmark = 0;
clearAllBookmarks();
try {
+ applyEffects();
while (!isPaused() && !gameOver(null) && !this.getTurn().isEndTurnRequested()) {
if (!resuming) {
state.getPlayers().resetPassed();
@@ -1198,7 +1201,6 @@ public abstract class GameImpl implements Game, Serializable {
applyEffects();
state.getPlayers().resetPassed();
fireUpdatePlayersEvent();
- state.getRevealed().reset();
resetShortLivingLKI();
break;
} else {
@@ -1977,6 +1979,8 @@ public abstract class GameImpl implements Game, Serializable {
}
logger.trace("fireUpdatePlayersEvent");
tableEventSource.fireTableEvent(EventType.UPDATE, null, this);
+ getState().clearLookedAt();
+ getState().clearRevealed();
}
@Override
diff --git a/Mage/src/mage/game/GameState.java b/Mage/src/mage/game/GameState.java
index 83236ef4e6..c48ba70ad0 100644
--- a/Mage/src/mage/game/GameState.java
+++ b/Mage/src/mage/game/GameState.java
@@ -445,8 +445,12 @@ public class GameState implements Serializable, Copyable<GameState> {
return lookedAt.get(playerId);
}
- public void clearLookedAt(UUID playerId) {
- lookedAt.remove(playerId);
+ public void clearRevealed() {
+ revealed.clear();
+ }
+
+ public void clearLookedAt() {
+ lookedAt.clear();
}
public Turn getTurn() {
@@ -581,7 +585,28 @@ public class GameState implements Serializable, Copyable<GameState> {
newPlayerList.setCurrent(playerId);
return newPlayerList;
}
-
+ /**
+ * Returns a list of all active players of the game in range of playerId,
+ * also setting the playerId to the current player of the list.
+ *
+ * @param playerId
+ * @param game
+ * @return playerList
+ */
+ public PlayerList getPlayersInRange(UUID playerId, Game game) {
+ PlayerList newPlayerList = new PlayerList();
+ Player currentPlayer = game.getPlayer(playerId);
+ if (currentPlayer != null) {
+ for (Player player: players.values()) {
+ if (!player.hasLeft()&& !player.hasLost() && currentPlayer.getInRange().contains(player.getId())) {
+ newPlayerList.add(player.getId());
+ }
+ }
+ newPlayerList.setCurrent(playerId);
+ }
+ return newPlayerList;
+ }
+
public Permanent getPermanent(UUID permanentId) {
if (permanentId != null && battlefield.containsPermanent(permanentId)) {
Permanent permanent = battlefield.getPermanent(permanentId);
diff --git a/Mage/src/mage/game/LookedAt.java b/Mage/src/mage/game/LookedAt.java
index 17b8af9b8a..501cb34c70 100644
--- a/Mage/src/mage/game/LookedAt.java
+++ b/Mage/src/mage/game/LookedAt.java
@@ -52,13 +52,14 @@ public class LookedAt extends HashMap<String, Cards> implements Serializable, Co
}
}
- public void add(String name, Card card) {
- this.get(name).add(card);
+ public void add(String name, Card card) {
+ this.createLookedAt(name).add(card);
}
public void add(String name, Cards cards) {
- if (!this.containsKey(name))
+ if (!this.containsKey(name)) {
createLookedAt(name);
+ }
this.put(name, cards.copy());
}
diff --git a/Mage/src/mage/game/Revealed.java b/Mage/src/mage/game/Revealed.java
index f7400ca874..af4b7cd320 100644
--- a/Mage/src/mage/game/Revealed.java
+++ b/Mage/src/mage/game/Revealed.java
@@ -55,6 +55,10 @@ public class Revealed extends HashMap<String, Cards> implements Serializable, Co
this.get(name).add(card);
}
+ public void update(String name, Cards cards) {
+ this.put(name, cards.copy());
+ }
+
public void add(String name, Cards cards) {
if (this.containsKey(name)) {
this.get(name).addAll(cards);
diff --git a/Mage/src/mage/game/permanent/token/MerfolkToken.java b/Mage/src/mage/game/permanent/token/MerfolkWizardToken.java
similarity index 67%
rename from Mage/src/mage/game/permanent/token/MerfolkToken.java
rename to Mage/src/mage/game/permanent/token/MerfolkWizardToken.java
index ee97ff82a8..ad83a93e28 100644
--- a/Mage/src/mage/game/permanent/token/MerfolkToken.java
+++ b/Mage/src/mage/game/permanent/token/MerfolkWizardToken.java
@@ -1,21 +1,21 @@
-package mage.game.permanent.token;
-
-import mage.MageInt;
-import mage.constants.CardType;
-
-/**
- *
- * @author Loki
- */
-public class MerfolkToken extends Token {
-
- public MerfolkToken() {
- super("Merfolk", "1/1 blue Merfolk Wizard creature token");
- cardType.add(CardType.CREATURE);
- color.setBlue(true);
- subtype.add("Merfolk");
- subtype.add("Wizard");
- power = new MageInt(1);
- toughness = new MageInt(1);
- }
-}
+package mage.game.permanent.token;
+
+import mage.MageInt;
+import mage.constants.CardType;
+
+/**
+ *
+ * @author Loki
+ */
+public class MerfolkWizardToken extends Token {
+
+ public MerfolkWizardToken() {
+ super("Merfolk Wizard", "1/1 blue Merfolk Wizard creature token");
+ cardType.add(CardType.CREATURE);
+ color.setBlue(true);
+ subtype.add("Merfolk");
+ subtype.add("Wizard");
+ power = new MageInt(1);
+ toughness = new MageInt(1);
+ }
+}
diff --git a/Mage/src/mage/players/Player.java b/Mage/src/mage/players/Player.java
index c2f4a016ac..c369e8f045 100644
--- a/Mage/src/mage/players/Player.java
+++ b/Mage/src/mage/players/Player.java
@@ -293,6 +293,7 @@ public interface Player extends MageItem, Copyable<Player> {
void revealCards(String name, Cards cards, Game game);
void revealCards(String name, Cards cards, Game game, boolean postToLog);
+ void lookAtCards(String name, Card card, Game game);
void lookAtCards(String name, Cards cards, Game game);
@Override
@@ -488,6 +489,7 @@ public interface Player extends MageItem, Copyable<Player> {
* @param sourceId
* @param game
* @param fromZone if null, this info isn't postet
+ * @param withName
* @return
*/
boolean moveCardToExileWithInfo(Card card, UUID exileId, String exileName, UUID sourceId, Game game, Zone fromZone, boolean withName);
diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java
index 65228de1e6..d87e64e540 100644
--- a/Mage/src/mage/players/PlayerImpl.java
+++ b/Mage/src/mage/players/PlayerImpl.java
@@ -41,7 +41,6 @@ import java.util.Map.Entry;
import java.util.Random;
import java.util.Set;
import java.util.UUID;
-
import mage.MageObject;
import mage.Mana;
import mage.abilities.Abilities;
@@ -130,7 +129,6 @@ import mage.target.common.TargetCardInLibrary;
import mage.target.common.TargetDiscard;
import mage.util.CardUtil;
import mage.util.GameLog;
-
import org.apache.log4j.Logger;
public abstract class PlayerImpl implements Player, Serializable {
@@ -1097,10 +1095,9 @@ public abstract class PlayerImpl implements Player, Serializable {
return true;
}
if (ability instanceof PlayLandAbility) {
- Card card = hand.get(ability.getSourceId(), game);
- if (card == null) {
- card = game.getCard(ability.getSourceId());
- }
+
+
+ Card card = game.getCard(ability.getSourceId());
result = playLand(card, game);
} else {
if (!ability.canActivate(this.playerId, game)) {
@@ -1214,7 +1211,7 @@ public abstract class PlayerImpl implements Player, Serializable {
}
}
}
- if (zone != Zone.BATTLEFIELD && game.getContinuousEffects().asThough(object.getId(), AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, this.getId(), game)) {
+ if (zone != Zone.BATTLEFIELD && game.getContinuousEffects().asThough(object.getId(), AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, this.getId(), game)) {
for (Ability ability : object.getAbilities()) {
ability.setControllerId(this.getId());
if (ability instanceof ActivatedAbility && ability.getZone().match(Zone.HAND)
@@ -1317,7 +1314,11 @@ public abstract class PlayerImpl implements Player, Serializable {
@Override
public void revealCards(String name, Cards cards, Game game, boolean postToLog) {
- game.getState().getRevealed().add(name, cards);
+ if (postToLog) {
+ game.getState().getRevealed().add(name, cards);
+ } else {
+ game.getState().getRevealed().update(name, cards);
+ }
if (postToLog && !game.isSimulation()) {
StringBuilder sb = new StringBuilder(getLogName()).append(" reveals ");
int current = 0, last = cards.size();
@@ -1332,6 +1333,12 @@ public abstract class PlayerImpl implements Player, Serializable {
}
}
+ @Override
+ public void lookAtCards(String name, Card card, Game game) {
+ game.getState().getLookedAt(this.playerId).add(name, card);
+ game.fireUpdatePlayersEvent();
+ }
+
@Override
public void lookAtCards(String name, Cards cards, Game game) {
game.getState().getLookedAt(this.playerId).add(name, cards);
@@ -2403,7 +2410,7 @@ public abstract class PlayerImpl implements Player, Serializable {
}
}
for (Card card : graveyard.getUniqueCards(game)) {
- boolean asThoughtCast = game.getContinuousEffects().asThough(card.getId(), AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, this.getId(), game);
+ boolean asThoughtCast = game.getContinuousEffects().asThough(card.getId(), AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, this.getId(), game);
for (ActivatedAbility ability : card.getAbilities().getActivatedAbilities(Zone.ALL)) {
boolean possible = false;
if (ability.getZone().match(Zone.GRAVEYARD)) {
@@ -2425,7 +2432,7 @@ public abstract class PlayerImpl implements Player, Serializable {
}
for (ExileZone exile : game.getExile().getExileZones()) {
for (Card card : exile.getCards(game)) {
- if (game.getContinuousEffects().asThough(card.getId(), AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, this.getId(), game)) {
+ if (game.getContinuousEffects().asThough(card.getId(), AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, this.getId(), game)) {
for (Ability ability : card.getAbilities()) {
if (ability.getZone().match(Zone.HAND)) {
ability.setControllerId(this.getId()); // controller must be set for case owner != caster
@@ -2441,7 +2448,7 @@ public abstract class PlayerImpl implements Player, Serializable {
}
for (Cards cards : game.getState().getRevealed().values()) {
for (Card card : cards.getCards(game)) {
- if (game.getContinuousEffects().asThough(card.getId(), AsThoughEffectType.PLAY_FROM_NON_HAND_ZONE, this.getId(), game)) {
+ if (game.getContinuousEffects().asThough(card.getId(), AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, this.getId(), game)) {
for (ActivatedAbility ability : card.getAbilities().getActivatedAbilities(Zone.HAND)) {
if (ability instanceof SpellAbility || ability instanceof PlayLandAbility) {
playable.add(ability);
diff --git a/Mage/src/mage/watchers/common/DamageDoneWatcher.java b/Mage/src/mage/watchers/common/DamageDoneWatcher.java
new file mode 100644
index 0000000000..df94911ebc
--- /dev/null
+++ b/Mage/src/mage/watchers/common/DamageDoneWatcher.java
@@ -0,0 +1,67 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package mage.watchers.common;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import mage.MageObjectReference;
+import mage.constants.WatcherScope;
+import mage.game.Game;
+import mage.game.events.DamageEvent;
+import mage.game.events.GameEvent;
+import mage.watchers.Watcher;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class DamageDoneWatcher extends Watcher {
+
+ // which object did how much damage during the turn
+ public Map<MageObjectReference, Integer> damagingObjects = new HashMap<>();
+
+ public DamageDoneWatcher() {
+ super("DamageDone", WatcherScope.GAME);
+ }
+
+ public DamageDoneWatcher(final DamageDoneWatcher watcher) {
+ super(watcher);
+ this.damagingObjects.putAll(damagingObjects);
+ }
+
+ @Override
+ public DamageDoneWatcher copy() {
+ return new DamageDoneWatcher(this);
+ }
+
+ @Override
+ public void watch(GameEvent event, Game game) {
+ switch(event.getType()) {
+ case DAMAGED_CREATURE:
+ case DAMAGED_PLANESWALKER:
+ case DAMAGED_PLAYER:
+ {
+ MageObjectReference mor = new MageObjectReference(event.getSourceId(), game);
+ int count = damagingObjects.containsKey(mor) ? damagingObjects.get(mor) : 0;
+ damagingObjects.put(mor, count + event.getAmount());
+ }
+ }
+ }
+
+ @Override
+ public void reset() {
+ super.reset();
+ damagingObjects.clear();
+ }
+
+ public int damageDone(UUID objectId, int zoneChangeCounter, Game game) {
+ MageObjectReference mor = new MageObjectReference(objectId, zoneChangeCounter, game);
+ return damagingObjects.containsKey(mor) ? damagingObjects.get(mor) : 0;
+ }
+
+}
diff --git a/Mage/src/mage/watchers/common/MiracleWatcher.java b/Mage/src/mage/watchers/common/MiracleWatcher.java
index c2fd6a518e..847be13193 100644
--- a/Mage/src/mage/watchers/common/MiracleWatcher.java
+++ b/Mage/src/mage/watchers/common/MiracleWatcher.java
@@ -99,7 +99,7 @@ public class MiracleWatcher extends Watcher {
Cards cards = new CardsImpl();
cards.add(card);
controller.lookAtCards("Miracle", cards, game);
- if (controller.chooseUse(Outcome.Benefit, "Reveal " + card.getName() + " to be able to use Miracle?", game)) {
+ if (controller.chooseUse(Outcome.Benefit, "Reveal " + card.getLogName() + " to be able to use Miracle?", game)) {
controller.revealCards("Miracle", cards, game);
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.MIRACLE_CARD_REVEALED, card.getId(), card.getId(),controller.getId()));
break;
diff --git a/Utils/keywords.txt b/Utils/keywords.txt
index 7c0e7fe923..57945d8a0f 100644
--- a/Utils/keywords.txt
+++ b/Utils/keywords.txt
@@ -37,6 +37,7 @@ Islandwalk|new|
Level up|cost|
Lifelink|instance|
Living weapon|new|
+Menace|new|
Miracle|cost|
Mountaincycling|cost|
Mountainwalk|new|
diff --git a/Utils/known-sets.txt b/Utils/known-sets.txt
index 3397c42b57..28a4e10182 100644
--- a/Utils/known-sets.txt
+++ b/Utils/known-sets.txt
@@ -8,6 +8,7 @@ Avacyn Restored|avacynrestored|
Betrayers of Kamigawa|betrayersofkamigawa|
Born of the Gods|bornofthegods|
Champions of Kamigawa|championsofkamigawa|
+Clash Pack|clashpack|
Classic Sixth Edition|classicsixthedition|
Coldsnap|coldsnap|
Commander 2013 Edition|commander2013|
diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt
index 7539be256d..0e3974d0b5 100644
--- a/Utils/mtg-cards-data.txt
+++ b/Utils/mtg-cards-data.txt
@@ -1,4 +1,4 @@
-Ardent Plea|Alara Reborn|1|U|{1}{W}{U}|Enchantment|||Exalted <i>(Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)</i>$Cascade <i>(When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)</i>|
+Ardent Plea|Alara Reborn|1|U|{1}{W}{U}|Enchantment|||Exalted <i>(Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)</i>$Cascade <i>(When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)</i>|
Aven Mimeomancer|Alara Reborn|2|R|{1}{W}{U}|Creature - Bird Wizard|3|1|Flying$At the beginning of your upkeep, you may put a feather counter on target creature. If you do, that creature is 3/1 and has flying for as long as it has a feather counter on it.|
Ethercaste Knight|Alara Reborn|3|C|{W}{U}|Artifact Creature - Human Knight|1|3|Exalted <i>(Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)</i>|
Ethersworn Shieldmage|Alara Reborn|4|C|{1}{W}{U}|Artifact Creature - Vedalken Wizard|2|2|Flash$When Ethersworn Shieldmage enters the battlefield, prevent all damage that would be dealt to artifact creatures this turn.|
@@ -5889,6 +5889,8 @@ Hordeling Outburst|Friday Night Magic|178|U|{1}{R}{R}|Sorcery|||Put three 1/1 re
Suspension Field|Friday Night Magic|179|U|{1}{W}|Enchantment|||When Suspension Field enters the battlefield, you may exile target creature with toughness 3 or greater until Suspension Field leaves the battlefield. <i>(That creature returns under its owner's control.)</i>|
Abzan Beastmaster|Friday Night Magic|180|U|{2}{G}|Creature - Hound Shaman|2|1|At the beginning of your upkeep, draw a card if you control the creature with the greatest toughness or tied for the greatest toughness.|
Frost Walker|Friday Night Magic|181|U|{1}{U}|Creature - Elemental|4|1|When Frost Walker becomes the target of a spell or ability, sacrifice it.|
+Path to Exile|Friday Night Magic|182|U|{W}|Instant|||Exile target creature. Its controller may search his or her library for a basic land card, put that card onto the battlefield tapped, then shuffle his or her library.|
+Serum Visions|Friday Night Magic|183|C|{U}|Sorcery|||Draw a card.$Scry 2. <i>(To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)</i>|
Bladewing the Risen|From the Vault: Dragons|1|R|{3}{B}{B}{R}{R}|Legendary Creature - Zombie Dragon|4|4|Flying$When Bladewing the Risen enters the battlefield, you may return target Dragon permanent card from your graveyard to the battlefield.${B}{R}: Dragon creatures get +1/+1 until end of turn.|
Nicol Bolas|From the Vault: Dragons|10|R|{2}{U}{U}{B}{B}{R}{R}|Legendary Creature - Elder Dragon|7|7|Flying$At the beginning of your upkeep, sacrifice Nicol Bolas unless you pay {U}{B}{R}.$Whenever Nicol Bolas deals damage to an opponent, that player discards his or her hand.|
Niv-Mizzet, the Firemind|From the Vault: Dragons|11|R|{2}{U}{U}{R}{R}|Legendary Creature - Dragon Wizard|4|4|Flying$Whenever you draw a card, Niv-Mizzet, the Firemind deals 1 damage to target creature or player.${tap}: Draw a card.|
@@ -7878,6 +7880,10 @@ Island|Judge Promo|90|L||Land|||<i>({T}: Add {U} to your mana pool.)</i>|
Swamp|Judge Promo|91|L||Land|||<i>({T}: Add {B} to your mana pool.)</i>|
Mountain|Judge Promo|92|L||Land|||<i>({T}: Add {R} to your mana pool.)</i>|
Forest|Judge Promo|93|L||Land|||<i>({T}: Add {G} to your mana pool.)</i>|
+Damnation|Judge Promo|94|R|{2}{B}{B}|Sorcery|||Destroy all creatures. They can't be regenerated.|
+Dualcaster Mage|Judge Promo|95|R|{1}{R}{R}|Creature - Human Wizard|2|2|Flash$When Dualcaster Mage enters the battlefield, copy target instant or sorcery spell. You may choose new targets for the copy.|
+Feldon of the Third Path|Judge Promo|96|M|{1}{R}{R}|Legendary Creature - Human Artificer|2|3|{2}{R}, {tap}: Put a token onto the battlefield that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step.|
+Ravages of War|Judge Promo|97|R|{3}{W}|Sorcery|||Destroy all lands.|
Ancestor's Chosen|Judgment|1|U|{5}{W}{W}|Creature - Human Cleric|4|4|First strike <i>(This creature deals combat damage before creatures without first strike.)</i>$When Ancestor's Chosen enters the battlefield, you gain 1 life for each card in your graveyard.|
Funeral Pyre|Judgment|10|C|{W}|Instant|||Exile target card from a graveyard. Its owner puts a 1/1 white Spirit creature token with flying onto the battlefield.|
Spellgorger Barbarian|Judgment|100|C|{3}{R}|Creature - Human Nightmare Barbarian|3|1|When Spellgorger Barbarian enters the battlefield, discard a card at random.$When Spellgorger Barbarian leaves the battlefield, draw a card.|
@@ -25676,6 +25682,46 @@ Mercurial Pretender|Prerelease Events|84|Special|{4}{U}|Creature - Shapeshifter|
Indulgent Tormentor|Prerelease Events|85|Special|{3}{B}{B}|Creature - Demon|5|3|Flying$At the beginning of your upkeep, draw a card unless target opponent sacrifices a creature or pays 3 life.|
Siege Dragon|Prerelease Events|86|Special|{5}{R}{R}|Creature - Dragon|5|5|Flying$When Siege Dragon enters the battlefield, destroy all Walls your opponents control.$Whenever Siege Dragon attacks, if defending player controls no Walls, it deals 2 damage to each creature without flying that player controls.|
Phytotitan|Prerelease Events|87|Special|{4}{G}{G}|Creature - Plant Elemental|7|2|When Phytotitan dies, return it to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.|
+Abzan Ascendancy|Prerelease Events|88|Special|{W}{B}{G}|Enchantment|||When Abzan Ascendancy enters the battlefield, put a +1/+1 counter on each creature you control.$Whenever a nontoken creature you control dies, put a 1/1 white Spirit creature token with flying onto the battlefield.|
+Anafenza, the Foremost|Prerelease Events|89|Special|{W}{B}{G}|Legendary Creature - Human Soldier|4|4|Whenever Anafenza, the Foremost attacks, put a +1/+1 counter on another target tapped creature you control.$If a creature card would be put into an opponent's graveyard from anywhere, exile it instead.|
+Ankle Shanker|Prerelease Events|90|Special|{2}{R}{W}{B}|Creature - Goblin Berserker|2|2|Haste$Whenever Ankle Shanker attacks, creatures you control gain first strike and deathtouch until end of turn.|
+Avalanche Tusker|Prerelease Events|91|Special|{2}{G}{U}{R}|Creature - Elephant Warrior|6|4|Whenever Avalanche Tusker attacks, target creature defending player controls blocks it this combat if able.|
+Bloodsoaked Champion|Prerelease Events|92|Special|{B}|Creature - Human Warrior|2|1|Bloodsoaked Champion can't block.$Raid - {1}{B}: Return Bloodsoaked Champion from your graveyard to the battlefield. Activate this ability only if you attacked with a creature this turn.|
+Butcher of the Horde|Prerelease Events|93|Special|{1}{R}{W}{B}|Creature - Demon|5|4|Flying$Sacrifice another creature: Butcher of the Horde gains your choice of vigilance, lifelink, or haste until end of turn.|
+Crackling Doom|Prerelease Events|94|Special|{R}{W}{B}|Instant|||Crackling Doom deals 2 damage to each opponent. Each opponent sacrifices a creature with the greatest power among creatures he or she controls.|
+Crater's Claws|Prerelease Events|95|Special|{X}{R}|Sorcery|||Crater's Claws deals X damage to target creature or player.$Ferocious - Crater's Claws deals X plus 2 damage to that creature or player instead if you control a creature with power 4 or greater.|
+Deflecting Palm|Prerelease Events|96|Special|{R}{W}|Instant|||The next time a source of your choice would deal damage to you this turn, prevent that damage. If damage is prevented this way, Deflecting Palm deals that much damage to that source's controller.|
+Dig Through Time|Prerelease Events|97|Special|{6}{U}{U}|Instant|||Delve <i>(Each card you exile from your graveyard while casting this spell pays for {1}.)</i>$Look at the top seven cards of your library. Put two of them into your hand and the rest on the bottom of your library in any order.|
+Dragon-Style Twins|Prerelease Events|98|Special|{3}{R}{R}|Creature - Human Monk|3|3|Double strike$Prowess <i>(Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)</i>|
+Duneblast|Prerelease Events|99|Special|{4}{W}{B}{G}|Sorcery|||Choose up to one creature. Destroy the rest.|
+Flying Crane Technique|Prerelease Events|100|Special|{3}{U}{R}{W}|Instant|||Untap all creatures you control. They gain flying and double strike until end of turn.|
+Grim Haruspex|Prerelease Events|101|Special|{2}{B}|Creature - Human Wizard|3|2|Morph {B} <i>(You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)</i>$Whenever another nontoken creature you control dies, draw a card.|
+Hardened Scales|Prerelease Events|102|Special|{G}|Enchantment|||If one or more +1/+1 counters would be placed on a creature you control, that many plus one +1/+1 counters are placed on it instead.|
+Herald of Anafenza|Prerelease Events|103|Special|{W}|Creature - Human Soldier|1|2|Outlast {2}{W} <i>({2}{W}, {tap}: Put a +1/+1 counter on this creature. Outlast only as a sorcery.)</i>$Whenever you activate Herald of Anafenza's outlast ability, put a 1/1 white Warrior creature token onto the battlefield.|
+High Sentinels of Arashin|Prerelease Events|104|Special|{3}{W}|Creature - Bird Soldier|3|4|Flying$High Sentinels of Arashin gets +1/+1 for each other creature you control with a +1/+1 counter on it.${3}{W}: Put a +1/+1 counter on target creature.|
+Icy Blast|Prerelease Events|105|Special|{X}{U}|Instant|||Tap X target creatures.$Ferocious - If you control a creature with power 4 or greater, those creatures don't untap during their controllers' next untap steps.|
+Ivorytusk Fortress|Prerelease Events|106|Special|{2}{W}{B}{G}|Creature - Elephant|5|7|Untap each creature you control with a +1/+1 counter on it during each other player's untap step.|
+Jeering Instigator|Prerelease Events|107|Special|{1}{R}|Creature - Goblin Rogue|2|1|Morph {2}{R} <i>(You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)</i>$When Jeering Instigator is turned face up, if it's your turn, gain control of another target creature until end of turn. Untap that creature. It gains haste until end of turn.|
+Jeskai Ascendancy|Prerelease Events|108|Special|{U}{R}{W}|Enchantment|||Whenever you cast a noncreature spell, creatures you control get +1/+1 until end of turn. Untap those creatures.$Whenever you cast a noncreature spell, you may draw a card. If you do, discard a card.|
+Kheru Lich Lord|Prerelease Events|109|Special|{3}{B}{G}{U}|Creature - Zombie Wizard|4|4|At the beginning of your upkeep, you may pay {2}{B}. If you do, return a creature card at random from your graveyard to the battlefield. It gains flying, trample, and haste. Exile that card at the beginning of your next end step. If it would leave the battlefield, exile it instead of putting it anywhere else.|
+Mardu Ascendancy|Prerelease Events|110|Special|{R}{W}{B}|Enchantment|||Whenever a nontoken creature you control attacks, put a 1/1 red Goblin creature token onto the battlefield tapped and attacking.$Sacrifice Mardu Ascendancy: Creatures you control get +0/+3 until end of turn.|
+Master of Pearls|Prerelease Events|111|Special|{1}{W}|Creature - Human Monk|2|2|Morph {3}{W}{W} <i>(You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)</i>$When Master of Pearls is turned face up, creatures you control get +2/+2 until end of turn.|
+Narset, Enlightened Master|Prerelease Events|112|Special|{3}{U}{R}{W}|Legendary Creature - Human Monk|3|2|First strike, hexproof$Whenever Narset, Enlightened Master attacks, exile the top four cards of your library. Until end of turn, you may cast noncreature cards exiled with Narset this turn without paying their mana costs.|
+Necropolis Fiend|Prerelease Events|113|Special|{7}{B}{B}|Creature - Demon|4|5|Delve <i>(Each card you exile from your graveyard while casting this spell pays for {1}.)</i>$Flying${X}, {tap}, Exile X cards from your graveyard: Target creature gets -X/-X until end of turn.|
+Rakshasa Vizier|Prerelease Events|114|Special|{2}{B}{G}{U}|Creature - Cat Demon|4|4|Whenever one or more cards are put into exile from your graveyard, put that many +1/+1 counters on Rakshasa Vizier.|
+Rattleclaw Mystic|Prerelease Events|115|Special|{1}{G}|Creature - Human Shaman|2|1|{tap}: Add {G}, {U}, or {R} to your mana pool.$Morph {2} <i>(You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)</i>$When Rattleclaw Mystic is turned face up, add {G}{U}{R} to your mana pool.|
+Sage of the Inward Eye|Prerelease Events|116|Special|{2}{U}{R}{W}|Creature - Djinn Wizard|3|4|Flying$Whenever you cast a noncreature spell, creatures you control gain lifelink until end of turn.|
+Sidisi, Brood Tyrant|Prerelease Events|117|Special|{1}{B}{G}{U}|Legendary Creature - Naga Shaman|3|3|Whenever Sidisi, Brood Tyrant enters the battlefield or attacks, put the top three cards of your library into your graveyard.$Whenever one or more creature cards are put into your graveyard from your library, put a 2/2 black Zombie creature token onto the battlefield.|
+Siege Rhino|Prerelease Events|118|Special|{1}{W}{B}{G}|Creature - Rhino|4|5|Trample$When Siege Rhino enters the battlefield, each opponent loses 3 life and you gain 3 life.|
+Sultai Ascendancy|Prerelease Events|119|Special|{B}{G}{U}|Enchantment|||At the beginning of your upkeep, look at the top two cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.|
+Surrak Dragonclaw|Prerelease Events|120|Special|{2}{G}{U}{R}|Legendary Creature - Human Warrior|6|6|Flash$Surrak Dragonclaw can't be countered.$Creature spells you control can't be countered.$Other creatures you control have trample.|
+Temur Ascendancy|Prerelease Events|121|Special|{G}{U}{R}|Enchantment|||Creatures you control have haste.$Whenever a creature with power 4 or greater enters the battlefield under your control, you may draw a card.|
+Thousand Winds|Prerelease Events|122|Special|{4}{U}{U}|Creature - Elemental|5|6|Flying$Morph {5}{U}{U} <i>(You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)</i>$When Thousand Winds is turned face up, return all other tapped creatures to their owners' hands.|
+Trail of Mystery|Prerelease Events|123|Special|{1}{G}|Enchantment|||Whenever a face-down creature enters the battlefield under your control, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle your library.$Whenever a permanent you control is turned face up, if it's a creature, it gets +2/+2 until end of turn.|
+Trap Essence|Prerelease Events|124|Special|{G}{U}{R}|Instant|||Counter target creature spell. Put two +1/+1 counters on up to one target creature.|
+Utter End|Prerelease Events|125|Special|{2}{W}{B}|Instant|||Exile target nonland permanent.|
+Villainous Wealth|Prerelease Events|126|Special|{X}{B}{G}{U}|Sorcery|||Target opponent exiles the top X cards of his or her library. You may cast any number of nonland cards with converted mana cost X or less from among them without paying their mana costs.|
+Zurgo Helmsmasher|Prerelease Events|127|Special|{2}{R}{W}{B}|Legendary Creature - Orc Warrior|7|2|Haste$Zurgo Helmsmasher attacks each combat if able.$Zurgo Helmsmasher has indestructible as long as it's your turn.$Whenever a creature dealt damage by Zurgo Helmsmasher this turn dies, put a +1/+1 counter on Zurgo Helmsmasher.|
Scion of Ugin|Dragons of Tarkir|1|U|{6}|Creature - Dragon Spirit|4|4|Flying|
Anafenza, Kin-Tree Spirit|Dragons of Tarkir|2|R|{W}{W}|Legendary Creature - Spirit Soldier|2|2|Whenever another nontoken creature enters the battlefield under your control, bolster 1. <i>(Choose a creature with the least toughness among creatures you control and put a +1/+1 counter on it.)</i>|
Arashin Foremost|Dragons of Tarkir|3|R|{1}{W}{W}|Creature - Human Warrior|2|2|Double strike$Whenever Arashin Foremost enters the battlefield or attacks, another target Warrior creature you control gains double strike until end of turn.|
@@ -26189,93 +26235,109 @@ Sickle Ripper|Modern Masters 2015 Edition|96|C|{1}{B}|Creature - Elemental Warri
Sign in Blood|Modern Masters 2015 Edition|97|C|{B}{B}|Sorcery|||Target player draws two cards and loses 2 life.|
Spread the Sickness|Modern Masters 2015 Edition|98|U|{4}{B}|Sorcery|||Destroy target creature, then proliferate. <i>(You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there.)</i>|
Surgical Extraction|Modern Masters 2015 Edition|99|R|{BP}|Instant|||<i>({BP} can be paid with either {B} or 2 life.)</i>$Choose target card in a graveyard other than a basic land card. Search its owner's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles his or her library.|
-Charging Griffin|Magic Origins|?|C|{3}{W}{3}{W}|Creature - Griffin|2|22|2|Flying$Whenever Charging Griffin attacks, it gets +1/+1 until end of turn.$Flying$Whenever Charging Griffin attacks, it gets +1/+1 until end of turn.|
-Mighty Leap|Magic Origins|?|C|{1}{W}{1}{W}|Instant|||Target creature gets +2/+2 and gains flying until end of turn.$Target creature gets +2/+2 and gains flying until end of turn.|
-Yoked Ox|Magic Origins|?|C|{W}{W}|Creature - Ox|0|40|4||
Akroan Jailer|Magic Origins|1|C|{W}|Creature - Human Soldier|1|1|{2}{W}, {T}: Tap target creature.|
+Blessed Spirits|Magic Origins|7|U|{2}{W}|Creature - Spirit|2|2|Flying$Whenever you cast an enchantment spell, put a +1/+1 counter on Blessed Spirits.|
+Charging Griffin|Magic Origins|9|C|{3}{W}|Creature - Griffin|2|2|Flying$Whenever Charging Griffin attacks, it gets +1/+1 until end of turn.|
+Enshrouding Mist|Magic Origins|13|C|{W}|Instant|||Target creature gets +1/+1 until end of turn. Prevent all damage that would dealt to it this turn. If it's renowned, untap it.|
Grasp of the Hieromancer|Magic Origins|15|C|{1}{W}|Enchantment - Aura|||Enchant creature$Enchanted creature gets +1/+1 and has "Whenever this creature attacks, tap target creature defending player controls."|
Heavy Infantry|Magic Origins|18|C|{4}{W}|Creature - Human Soldier|3|4|When Heavy Infantry enters the battlefield, tap target creature an opponent controls.|
-Hixus, Prison Warden|Magic Origins|19|R|{3}{W}{W}{3}{W}{W}|Legendary Creature - Human Soldier|4|44|4|Flash$Whenever a creature deals combat damage to you, if Hixus, Prison Warden entered the battlefield this turn, exile that creature until Hixus leaves the battlefield.$Flash$Whenever a creature deals combat damage to you, if Hixus, Prison Warden entered the battlefield this turn, exile that creature until Hixus leaves the battlefield.|
+Hixus, Prison Warden|Magic Origins|19|R|{3}{W}{W}|Legendary Creature - Human Soldier|4|4|Flash$Whenever a creature deals combat damage to you, if Hixus, Prison Warden entered the battlefield this turn, exile that creature until Hixus leaves the battlefield.|
+Knight of the Pilgrim's Road|Magic Origins|20|C|{2}{W}|Creature - Human Knight|3|2|Renown 1 <i>(When this creature deals combat damage to a player, if it isn't renowned, put a +1/+1 counter on it and it becomes renowned.)</i>|
Gideon, Battle-Forged|Magic Origins|23|M||Planeswalker - Gideon|3|+2: Up to one target creature an opponent controls attacks Gideon, Battle-Forged during its controller's next turn if able.$+1: Until your next turn, target creature gains indestructible. Untap that creature.$0: Until end of turn, Gideon, Battle-Forged becomes a 4/4 Human Soldier creature with indestructible that's still a planeswalker. Prevent all damage that would be dealt to him this turn.|
Kytheon, Hero of Akros|Magic Origins|23|M|{W}|Legendary Creature - Human Soldier|2|1|At end of combat, if Kytheon, Hero of Akros and at least two other creatures attacked this combat, exile Kytheon, then return him to the battlefield transformed under his owner's control.${2}{W}: Kytheon gains indestructible until end of turn.|
+Mighty Leap|Magic Origins|26|C|{1}{W}|Instant|||Target creature gets +2/+2 and gains flying until end of turn.|
+Patron of the Valiant|Magic Origins|28|U|{3}{W}{W}|Creature - Angel|4|4|Flying$When Patron of the Valiant enters the battlefield, put a +1/+1 counter on each creature you control with a +1/+1 counter on it.|
+Relic Hunter|Magic Origins|29|R|{1}{W}|Creature - Human|2|2|Renown 1 <i>(When this creature deals combat damage to a player, put a +1/+1 counter on it and it becomes renowned.)</i>$When Relic Hunter becomes renowned, you may search your library for an Equipment card, reveal it, put it in your hand, then shuffle your library.|
Sentinel of the Eternal Watch|Magic Origins|30|U|{5}{W}|Creature - Giant Soldier|4|6|Vigilance <i>(Attacking doesn't cause this creature to tap.)</i>$At the beginning of combat on each opponent's turn, tap target creature that player controls.|
Valor in Akros|Magic Origins|39|U|{3}{W}|Enchantment|||Whenever a creature enters the battlefield under your control, creatures you control get +1/+1 until end of turn.|
-Aegis Angel|Magic Origins|273|R|{4}{W}{W}{4}{W}{W}|Creature - Angel|5|55|5|Flying$When Aegis Angel enters the battlefield, another target permanent gains indestructible for as long as you control Aegis Angel.$Flying$When Aegis Angel enters the battlefield, another target permanent gains indestructible for as long as you control Aegis Angel.|
-Divine Verdict|Magic Origins|274|C|{3}{W}{3}{W}|Instant|||Destroy target attacking or blocking creature.$Destroy target attacking or blocking creature.|
-Eagle of the Watch|Magic Origins|275|C|{2}{W}|Creature - Bird|2|1|Flying, vigilance|
-Serra Angel|Magic Origins|276|U|{3}{W}{W}{3}{W}{W}|Creature - Angel|4|44|4|Flying$Vigilance$Flying$Vigilance|
-Claustrophobia|Magic Origins|?|C|{1}{U}{U}{1}{U}{U}|Enchantment - Aura|||$Enchant creature$When Claustrophobia enters the battlefield, tap enchanted creature.$Enchanted creature doesn't untap during its controller's untap step.$Enchant creature$When Claustrophobia enters the battlefield, tap enchanted creature.$Enchanted creature doesn't untap during its controller's untap step.|
-Disperse|Magic Origins|?|C|{1}{U}{1}{U}|Instant|||Return target nonland permanent to its owner's hand.$Return target nonland permanent to its owner's hand.|
-Displacement Wave|Magic Origins|?|?mtg-set-icon mtg-set-magic-origins-unknown|{X}{U}{U}{X}{U}{U}|Sorcery|||Return all nonland permanents with converted mana cost X or less to their owners' hands.$Return all nonland permanents with converted mana cost X or less to their owners' hands.|
-Maritime Guard|Magic Origins|?|C|{1}{U}{1}{U}|Creature - Merfolk Soldier|1|31|3||
-Mizzium Meddler|Magic Origins|?|R|{2}{U}{2}{U}|Creature - Vedalken Wizard|1|41|4|Flash$When Mizzium Meddler enters the battlefield, change a target of target spell or ability to Mizzium Meddler.$Flash$When Mizzium Meddler enters the battlefield, change a target of target spell or ability to Mizzium Meddler.|
-Scrapskin Drake|Magic Origins|?|C|{2}{U}{2}{U}|Creature - Zombie Drake|2|32|3|Flying$Scrapskin Drake can block only creatures with flying.$Flying$Scrapskin Drake can block only creatures with flying.|
-Tower Geist|Magic Origins|?|U|{3}{U}{3}{U}|Creature - Spirit|2|22|2|Flying$When Tower Geist enters the battlefield, look at the top two cards of your library. Put one of them into your hand and the other into your graveyard.$Flying$When Tower Geist enters the battlefield, look at the top two cards of your library. Put one of them into your hand and the other into your graveyard.|
+Yoked Ox|Magic Origins|42|C|{W}|Creature - Ox|0|4||
+Alhammarrat, High Arbiter|43|R|{5}{U}{U}|Legendary Creature - Sphinx|5|5|Flying$As Alhammarret, High Arbiter enters the battlefield, each opponent reveals his or her hand. You choose the name of a nonland card revealed this way.$Your opponents can't cast spells with the chosen name <i>(as long as this creature is on the battlefield)</i>.|
+Clash of Wills|49|U|{X}{U}|Instant|||Counter target spell unless its controller pays {X}.|
+Claustrophobia|Magic Origins|50|C|{1}{U}{U}|Enchantment - Aura|||$Enchant creature$When Claustrophobia enters the battlefield, tap enchanted creature.$Enchanted creature doesn't untap during its controller's untap step.|
+Disperse|Magic Origins|54|C|{1}{U}|Instant|||Return target nonland permanent to its owner's hand.|
+Displacement Wave|Magic Origins|55|R|{X}{U}{U}{X}{U}{U}|Sorcery|||Return all nonland permanents with converted mana cost X or less to their owners' hands.|
Hydrolash|Magic Origins|59|U|{2}{U}|Instant|||Attacking creatures get -2/-0 until end of turn.$Draw a card.|
-Jace, Telepath Unbound|Magic Origins|60|M||Planeswalker - Jace|55|+1: Up to one target creature gets -2/-0 until your next turn.$-3: You may cast target instant or sorcery card from your graveyard this turn. If that card would be put into your graveyard this turn, exile it instead.$-9: You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of his or her library into his or her graveyard". $+1: Up to one target creature gets -2/-0 until your next turn.$-3: You may cast target instant or sorcery card from your graveyard this turn. If that card would be put into your graveyard this turn, exile it instead.$-9: You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of his or her library into his or her graveyard". |
-Jace, Vryn's Prodigy|Magic Origins|60|M|{1}{U}{1}{U}|Legendary Creature - Human Wizard|0|20|2|{T}: Draw a card, then discard a card. If there are five or more cards in your graveyard, exile Jace, Vryn''s Prodigy, then return him to the battefield transformed under his owner's control. ${T}: Draw a card, then discard a card. If there are five or more cards in your graveyard, exile Jace, Vryn''s Prodigy, then return him to the battefield transformed under his owner's control. |
+Jace, Telepath Unbound|Magic Origins|60|M||Planeswalker - Jace|5|+1: Up to one target creature gets -2/-0 until your next turn.$-3: You may cast target instant or sorcery card from your graveyard this turn. If that card would be put into your graveyard this turn, exile it instead.$-9: You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of his or her library into his or her graveyard". $+1: Up to one target creature gets -2/-0 until your next turn.$-3: You may cast target instant or sorcery card from your graveyard this turn. If that card would be put into your graveyard this turn, exile it instead.$-9: You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of his or her library into his or her graveyard". |
+Jace, Vryn's Prodigy|Magic Origins|60|M|{1}{U}|Legendary Creature - Human Wizard|0|2|{T}: Draw a card, then discard a card. If there are five or more cards in your graveyard, exile Jace, Vryn''s Prodigy, then return him to the battefield transformed under his owner's control. ${T}: Draw a card, then discard a card. If there are five or more cards in your graveyard, exile Jace, Vryn''s Prodigy, then return him to the battefield transformed under his owner's control. |
Jhessian Thief|Magic Origins|62|U|{2}{U}|Creature - Human Rogue|1|3|Prowess <i>(Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)</i>$Whenever Jhessian Thief deals combat damage to a player, draw a card.|
-Ringwarden Owl|Magic Origins|068|C|{3}{U}{U}|Creature - Bird|3|3|Flying <i>(This creature can't be blocked except by creatures with flying or reach.)</i>$Prowess <i>(Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)</i>|
+Maritime Guard|Magic Origins|63|C|{1}{U}|Creature - Merfolk Soldier|1|3||
+Mizzium Meddler|Magic Origins|?|R|{2}{U}|Creature - Vedalken Wizard|1|4|Flash$When Mizzium Meddler enters the battlefield, change a target of target spell or ability to Mizzium Meddler.|
+Ringwarden Owl|Magic Origins|68|C|{3}{U}{U}|Creature - Bird|3|3|Flying <i>(This creature can't be blocked except by creatures with flying or reach.)</i>$Prowess <i>(Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)</i>|
+Scrapskin Drake|Magic Origins|69|C|{2}{U}|Creature - Zombie Drake|2|3|Flying$Scrapskin Drake can block only creatures with flying.|
+Send to Sleep|Magic Origins|71|C|{1}{U}|Instant|||Tap up to two target creatures.$<i>Spell mastery </i> - If there are two or more instant and/or sorcery cards in your graveyard, those creatures don't untap during their controllers' next untap steps.|
Separatist Voidmage|Magic Origins|72|C|{3}{U}|Creature - Human Wizard|2|2|When Separatist Voidmage enters the battlefield, you may return target creature to its owner's hand.|
-Into the Void|Magic Origins|277|U|{3}{U}{3}{U}|Sorcery|||Return up to two target creatures to their owners' hands.$Return up to two target creatures to their owners' hands.|
-Mahamoti Djinn|Magic Origins|278|R|{4}{U}{U}{4}{U}{U}|Creature - Djinn|5|65|6|Flying$Flying|
-Weave Fate|Magic Origins|279|C|{3}{U}{3}{U}|Instant|||Draw two cards.$Draw two cards.|
-Catacomb Slug|Magic Origins|?|C|{4}{B}{4}{B}|Creature - Slug|2|62|6||
-Cruel Revival|Magic Origins|?|C|{4}{B}{4}{B}|Instant|||Destroy target non-Zombie creature. It can't be regenerated. Return up to one target Zombie card from your graveyard to your hand.$Destroy target non-Zombie creature. It can't be regenerated. Return up to one target Zombie card from your graveyard to your hand.|
-Weight of the Underworld|Magic Origins|?|C|{3}{B}{3}{B}|Enchantment - Aura|||Enchant creature$Enchanted creature gets -3/-2.$Enchant creature$Enchanted creature gets -3/-2.|
+Sphinx's Tutelage|Magic Origins|76|U|{2}{U}|Enchantment|||Whenever you draw a card, target opponent puts the top two cards of his or her library into his or her graveyard. If they're both nonland cards that share a color, repeat this process.${5}{U}: Draw a card, then discard a card.|
+Tower Geist|Magic Origins|80|U|{3}{U}|Creature - Spirit|2|2|Flying$When Tower Geist enters the battlefield, look at the top two cards of your library. Put one of them into your hand and the other into your graveyard.|
+Catacomb Slug|Magic Origins|86|C|{4}{B}|Creature - Slug|2|6||
+Cruel Revival|Magic Origins|88|C|{4}{B}|Instant|||Destroy target non-Zombie creature. It can't be regenerated. Return up to one target Zombie card from your graveyard to your hand.|
Deadbridge Shaman|Magic Origins|91|C|{2}{B}|Creature - Elf Shaman|3|1|When Deadbridge Shaman dies, target opponent discards a card.|
Eyeblight Assassin|Magic Origins|95|C|{2}{B}|Creature - Elf Assassin|2|2|When Eyeblight Assassin enters the battlefield, target creature an opponent controls gets -1/-1 until end of turn.|
Infernal Scarring|Magic Origins|102|C|{1}{B}|Enchantment - Aura|||Enchant creature$Enchanted creature gets +2/+0 and has "When this creature dies, draw a card."|
+Kothophed, Soul Hoarder|Magic Origins|104|R|{4}{B}{B}|Legendary Creature - Demon|6|6|Flying$Whenever a permanent owned by another player is put into the graveyard from the battlefield, you draw one card and lose 1 life.|
+Languish|Magic Origins|105|R|{2}{B}{B}|Sorcery|||All creatures get -4/-4 until end of turn.|
Liliana, Defiant Necromancer|Magic Origins|106|M||Planeswalker - Liliana|3|+2: Each player discards a card.$-X: Return target nonlegendary creature with converted mana cost X from your graveyard to the battlefield.$-8: You get an emblem with "Whenever a creature you control dies, return it to the battlefield under your control at the beginning of the next end step."|
Liliana, Heretical Healer|Magic Origins|106|M|{1}{B}{B}|Legendary Creature - Human Cleric|2|3|Lifelink$Whenever another nontoken creature you control dies, exile Liliana Heretical Healer, then return her to the battlefield transformed under her owner's control. If you do, put a 2/2 black Zombie creature token onto the battlefield.|
Malakir Cullblade|Magic Origins|108|U|{1}{B}|Creature - Vampire Warrior|1|1|Whenever a creature an opponent controls dies, put a +1/+1 counter on Malakir Cullblade.|
Rabid Bloodsucker|Magic Origins|113|C|{4}{B}|Creature - Vampire|3|2|Flying$When Rabid Bloodsucker enters the battlefield, each player loses 2 life.|
Reave Soul|Magic Origins|115|C|{1}{B}|Sorcery|||Destroy target creature with power 3 or less.|
Shambling Ghoul|Magic Origins|119|C|{1}{B}|Creature - Zombie|2|3|Shambling Ghoul enters the battlefield tapped.|
-Flesh to Dust|Magic Origins|280|C|{3}{B}{B}{3}{B}{B}|Instant|||Destroy target creature. It can't be regenerated.$Destroy target creature. It can't be regenerated.|
-Mind Rot|Magic Origins|281|C|{2}{B}{2}{B}|Sorcery|||Target player discards two cards.$Target player discards two cards.|
-Nightmare|Magic Origins|282|R|{5}{B}{5}{B}|Creature - Nightmare Horse|0|00|0|Flying$Nightmare's power and toughness are each equal to the number of Swamps you control.$Flying$Nightmare's power and toughness are each equal to the number of Swamps you control.|
-Sengir Vampire|Magic Origins|283|U|{3}{B}{B}{3}{B}{B}|Creature - Vampire|4|44|4|Flying$Whenever a creature dealt damage by Sengir Vampire this turn dies, put a +1/+1 counter on Sengir Vampire.$Flying$Whenever a creature dealt damage by Sengir Vampire this turn dies, put a +1/+1 counter on Sengir Vampire.|
-Act of Treason|Magic Origins|?|C|{2}{R}{2}{R}|Sorcery|||Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.$Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.|
-Cobblebrute|Magic Origins|?|C|{3}{R}{3}{R}|Creature - Elemental|5|25|2||
-Fiery Conclusion|Magic Origins|?|C|{1}{R}{1}{R}|Instant|||As an additional cost to cast Fiery Conclusion, sacrifice a creature.$Fiery Conclusion deals 5 damage to target creature.$As an additional cost to cast Fiery Conclusion, sacrifice a creature.$Fiery Conclusion deals 5 damage to target creature.|
-Titan's Strength|Magic Origins|?|C|{R}{R}|Instant|||Target creature gets +3/+1 until end of turn. Scry 1.$Target creature gets +3/+1 until end of turn. Scry 1.|
+Weight of the Underworld|Magic Origins|126|C|{3}{B}|Enchantment - Aura|||Enchant creature$Enchanted creature gets -3/-2.|
+Act of Treason|Magic Origins|129|C|{2}{R}{2}{R}|Sorcery|||Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.|
Avaricious Dragon|Magic Origins|131|M|{2}{R}{R}|Creature - Dragon|4|4|Flying$At the beginning of your draw step, draw an additional card.$At the beginning of your end step, discard your hand.|
-Bellows Lizard|Magic Origins|132|C|{R}{R}|Creature - Lizard|1|11|1|{1}{R}: Bellows Lizard gets +1/+0 until end of turn.${1}{R}: Bellows Lizard gets +1/+0 until end of turn.|
+Bellows Lizard|Magic Origins|132|C|{R}|Creature - Lizard|1|1|{1}{R}: Bellows Lizard gets +1/+0 until end of turn.${1}{R}: Bellows Lizard gets +1/+0 until end of turn.|
Boggart Brute|Magic Origins|133|C|{2}{R}|Creature - Goblin Warrior|3|2|Menace <i>(This creature can't be blocked except by two or more creatures.)</i>|
-Chandra, Fire of Kaladesh|Magic Origins|135|M|{1}{R}{R}{1}{R}{R}|Legendary Creature - Human Shaman|2|22|2|Whenever you cast a red spell, untap Chandra, Fire of Kaladesh.${T}: Chandra, Fire of Kaladesh deals 1 damage to target player. If Chandra has dealt 3 or more damage this turn, exile her, then return her to the battlefield transformed under her owner's control.$Whenever you cast a red spell, untap Chandra, Fire of Kaladesh.${T}: Chandra, Fire of Kaladesh deals 1 damage to target player. If Chandra has dealt 3 or more damage this turn, exile her, then return her to the battlefield transformed under her owner's control.|
-Chandra, Roaring Flame|Magic Origins|135|M||Planeswalker - Chandra|44|+1: Chandra, Roaring Flame deals 2 damage to target player.$-2: Chandra, Roaring Flame deals 2 damage to target creature.$-7: Chandra, Roaring Flame deals 6 damage to each opponent. Each player dealt damage this way gets an emblem with "At the beginning of your upkeep, this emblem deals 3 damage to you."$+1: Chandra, Roaring Flame deals 2 damage to target player.$-2: Chandra, Roaring Flame deals 2 damage to target creature.$-7: Chandra, Roaring Flame deals 6 damage to each opponent. Each player dealt damage this way gets an emblem with "At the beginning of your upkeep, this emblem deals 3 damage to you."|
-Chandra's Fury|Magic Origins|136|C|{4}{R}{4}{R}|Instant|||Chandra's Fury deals 4 damage to target player and 1 damage to each creature that player controls.$Chandra's Fury deals 4 damage to target player and 1 damage to each creature that player controls.|
+Chandra, Fire of Kaladesh|Magic Origins|135|M|{1}{R}{R}|Legendary Creature - Human Shaman|2|2|Whenever you cast a red spell, untap Chandra, Fire of Kaladesh.${T}: Chandra, Fire of Kaladesh deals 1 damage to target player. If Chandra has dealt 3 or more damage this turn, exile her, then return her to the battlefield transformed under her owner's control.|
+Chandra, Roaring Flame|Magic Origins|135|M||Planeswalker - Chandra|4|+1: Chandra, Roaring Flame deals 2 damage to target player.$-2: Chandra, Roaring Flame deals 2 damage to target creature.$-7: Chandra, Roaring Flame deals 6 damage to each opponent. Each player dealt damage this way gets an emblem with "At the beginning of your upkeep, this emblem deals 3 damage to you."|
+Chandra's Fury|Magic Origins|136|C|{4}{R}|Instant|||Chandra's Fury deals 4 damage to target player and 1 damage to each creature that player controls.|
Chandra's Ignition|Magic Origins|137|R|{3}{R}{R}|Sorcery|||Target creature you control deals damage equal to its power to each other creature and each opponent.|
+Cobblebrute|Magic Origins|138|C|{3}{R}{3}{R}|Creature - Elemental|5|2||
Enthralling Victor|Magic Origins|142|U|{3}{R}|Creature - Human Warrior|3|2|When Enthralling Victor enters the battlefield, gain control of target creature an opponent controls with power 2 or less until end of turn. Untap that creature. It gains haste until end of turn.|
+Fiery Conclusion|Magic Origins|144|C|{1}{R}|Instant|||As an additional cost to cast Fiery Conclusion, sacrifice a creature.$Fiery Conclusion deals 5 damage to target creature.|
+Fiery Impulse|Magic Origins|145|C|{R}|Instant|||Fiery Imulse deals 2 damage to target creature.$<i>Spell mastery</i> - If there are two or more instant and/or sorcery cards in your graveyard, Fiery Impulse deals 3 damage to that creature instead.|
Lightning Javelin|Magic Origins|153|C|{3}{R}|Sorcery|||Lightning Javelin deals 3 damage to target creature or player. Scry 1.|
Pia and Kiran Nalaar|Magic Origins|157|R|{2}{R}{R}|Legendary Creature - Human Artificer|2|2|When Pia and Kiran Nalaar enters the battlefield put 2 1/1 colorless Thopter artifact creature tokens with flying onto the battlefield.${2}{R}, Sacrifice an artifact: Pia and Kiran Nalaar deals 2 damage to target creature or player.|
Ravaging Blaze|Magic Origins|159|U|{X}{R}{R}|Instant|||Ravaging Blaze deals X damage to target creature. $<i>Spell mastery</i> — If there are two or more instant and/or sorcery cards in your graveyard, Ravaging Blaze also deals X damage to that creature's controller.|
Seismic Elemental|Magic Origins|161|U|{3}{R}{R}|Creature - Elemental|4|4|When Seismic Elemental enters the battlefield, creatures without flying can't block this turn.|
Subterranean Scout|Magic Origins|164|C|{1}{R}|Creature - Goblin Scout|2|1|When Subterranean Scout enters the battlefield, target creature with power 2 or less can't be blocked this turn.|
+Titan's Strength|Magic Origins|166|C|{R}|Instant|||Target creature gets +3/+1 until end of turn. Scry 1.|
Volcanic Rambler|Magic Origins|167|C|{5}{R}|Creature - Elemental|6|4|{2}{R}: Volcanic Rambler deals 1 damage to target player.|
-Fiery Hellhound|Magic Origins|284|C|{1}{R}{R}{1}{R}{R}|Creature - Elemental Hound|2|22|2|{R}: Fiery Hellhound gets +1/+0 until end of turn.${R}: Fiery Hellhound gets +1/+0 until end of turn.|
-Shivan Dragon|Magic Origins|285|R|{4}{R}{R}{4}{R}{R}|Creature - Dragon|5|55|5|Flying${R}: Shivan Dragon gets +1/+0 until end of turn.$Flying${R}: Shivan Dragon gets +1/+0 until end of turn.|
-Elvish Visionary|Magic Origins|?|C|{1}{G}{1}{G}|Creature - Elf Shaman|1|11|1|When Elvish Visionary enters the battlefield, draw a card.$When Elvish Visionary enters the battlefield, draw a card.|
-Leaf Gilder|Magic Origins|?|C|{1}{G}{1}{G}|Creature - Elf Druid|2|12|1|{T}: Add {G} to your mana pool.${T}: Add {G} to your mana pool.|
-Titanic Growth|Magic Origins|?|C|{1}{G}{1}{G}|Instant|||Target creature gets +4/+4 until end of turn.$Target creature gets +4/+4 until end of turn.|
-Vastwood Gorger|Magic Origins|?|C|{5}{G}{5}{G}|Creature - Wurm|5|65|6||
-Yeva's Forcemage|Magic Origins|?|C|{2}{G}{2}{G}|Creature - Elf Shaman|2|22|2|When Yeva's Forcemage enters the battlefield, target creature gets +2/+2 until end of turn.$When Yeva's Forcemage enters the battlefield, target creature gets +2/+2 until end of turn.|
Conclave Naturalists|Magic Origins|171|U|{4}{G}|Creature - Dryad|4|4|When Conclave Naturalists enters the battlefield, you may destroy target artifact or enchantment.|
Dwynen, Gilt-Leaf Daen|Magic Origins|172|R|{2}{G}{G}|Legendary Creature - Elf Warrior|3|4|Reach$Other Elf creatures you control get +1/+1.$Whenever Dwynen, Gilt-Leaf Daen attacks, you gain 1 life for each attacking Elf you control.|
+Elemental Bond|Magic Origins|174|U|{2}{G}|Enchantment|||Whenever a creature with power 3 or greater enters the battlefield under your control, draw a card.|
+Elvish Visionary|Magic Origins|175|C|{1}{G}|Creature - Elf Shaman|1|1|When Elvish Visionary enters the battlefield, draw a card.|
Hitchclaw Recluse|Magic Origins|181|C|{2}{G}|Creature - Spider|1|4|Reach|
Joraga Invocation|Magic Origins|183|U|{4}{G}{G}|Sorcery|||Each creature you control gets +3/+3 until end of turn and must be blocked this turn if able.|
+Leaf Gilder|Magic Origins|184|C|{1}{G}|Creature - Elf Druid|2|1|{T}: Add {G} to your mana pool.|
Mantle of Webs|Magic Origins|187|C|{1}{G}|Enchantment - Aura|||Enchant Creature$Enchanted creature gets +1/+3 and has reach.|
-Nissa, Sage Animist|Magic Origins|189|M||Planeswalker - Nissa|33|+1: Reveal the top card of your library. If it's a land card, put it onto the battlefield. Otherwise, put it into your hand.$-2: Put a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World onto the battlefield.$-7: Untap up to six target lands. They become 6/6 Elemental creatures. They're still lands.$+1: Reveal the top card of your library. If it's a land card, put it onto the battlefield. Otherwise, put it into your hand.$-2: Put a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World onto the battlefield.$-7: Untap up to six target lands. They become 6/6 Elemental creatures. They're still lands.|
-Nissa, Vastwood Seer|Magic Origins|189|M|{2}{G}{2}{G}|Legendary Creature - Elf Scout|2|22|2|When Nissa, Vastwood Seer enters the battlefield, you may search your library for a basic Forest card, reveal it, put it into your hand, then shuffle your library.$Whenever a land enters the battlefield under your control, if you control seven or more lands, exile Nissa, then return her to the battlefield transformed under her owner's control.$When Nissa, Vastwood Seer enters the battlefield, you may search your library for a basic Forest card, reveal it, put it into your hand, then shuffle your library.$Whenever a land enters the battlefield under your control, if you control seven or more lands, exile Nissa, then return her to the battlefield transformed under her owner's control.|
-Plummet|Magic Origins|286|C|{1}{G}{1}{G}|Instant|||Destroy target creature with flying.$Destroy target creature with flying.|
-Prized Unicorn|Magic Origins|287|U|{3}{G}{3}{G}|Creature - Unicorn|2|22|2|All creatures able to block Prized Unicorn do so.$All creatures able to block Prized Unicorn do so.|
-Terra Stomper|Magic Origins|288|R|{3}{G}{G}{G}{3}{G}{G}{G}|Creature - Beast|8|88|8|Terra Stomper can't be countered.$Trample$Terra Stomper can't be countered.$Trample|
-Meteorite|Magic Origins|?|U|{5}{5}|Artifact|||When Meteorite enters the battlefield, it deals 2 damage to target creature or player.${T}: Add one mana of any color to your mana pool.$When Meteorite enters the battlefield, it deals 2 damage to target creature or player.${T}: Add one mana of any color to your mana pool.|
-Gold-Forged Sentinel|Magic Origins|?|U|{6}{6}|Artifact Creature - Chimera|4|44|4|Flying$Flying|
-Runed Servitor|Magic Origins|?|U|{2}{2}|Artifact Creature - Construct|2|22|2|When Runed Servitor dies, each player draws a card.$When Runed Servitor dies, each player draws a card.|
-Jayemdae Tome|Magic Origins|?|U|{4}{4}|Artifact|||{4}, {T}: Draw a card.${4}, {T}: Draw a card.|
+Nissa, Sage Animist|Magic Origins|189|M||Planeswalker - Nissa|3|+1: Reveal the top card of your library. If it's a land card, put it onto the battlefield. Otherwise, put it into your hand.$-2: Put a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World onto the battlefield.$-7: Untap up to six target lands. They become 6/6 Elemental creatures. They're still lands.$|
+Nissa, Vastwood Seer|Magic Origins|189|M|{2}{G}|Legendary Creature - Elf Scout|2|2|When Nissa, Vastwood Seer enters the battlefield, you may search your library for a basic Forest card, reveal it, put it into your hand, then shuffle your library.$Whenever a land enters the battlefield under your control, if you control seven or more lands, exile Nissa, then return her to the battlefield transformed under her owner's control.|
+Rhox Maulers|Magic Origins|196|C|{4}{G}|Creature - Rhino Soldier|4|4|Trample <i>(This creature can deal excess combat damage to defending player or planeswalker while attacking.)</i>$Renown 2 <i>(When this creature deals combat damage to a player, if it isn't renowned, put two +1/+1 counters on it and it becomes renowned.)</i>|
+Titanic Growth|Magic Origins|201|C|{1}{G}|Instant|||Target creature gets +4/+4 until end of turn.|
+Vastwood Gorger|Magic Origins|204|C|{5}{G}|Creature - Wurm|5|6||
+Yeva's Forcemage|Magic Origins|208|C|{2}{G}|Creature - Elf Shaman|2|2|When Yeva's Forcemage enters the battlefield, target creature gets +2/+2 until end of turn.|
+Blazing Hellhound|Magic Origins|210|U|{2}{B}{R}|Creature - Elemental Hound|4|3|{1}, Sacrifice another creature: Blazing Hellhound deals 1 damage to target creature or player.|
+Zendikar Incarnate|Magic Origins|219|U|{2}{R}{G}|Creature - Elemental|0|4|Zendikar Incarnate's power is equal to the amount of lands you control.|
+Gold-Forged Sentinel|Magic Origins|226|U|{6}|Artifact Creature - Chimera|4|4|Flying$Flying|
+Jayemdae Tome|Magic Origins|231|U|{4}|Artifact|||{4}, {T}: Draw a card.${4}, {T}: Draw a card.|
+Meteorite|Magic Origins|233|U|{5}|Artifact|||When Meteorite enters the battlefield, it deals 2 damage to target creature or player.${T}: Add one mana of any color to your mana pool.|
+Runed Servitor|Magic Origins|238|U|{2}|Artifact Creature - Construct|2|2|When Runed Servitor dies, each player draws a card.|
Veteran's Sidearm|Magic Origins|242|C|{2}|Artifact - Equipment|||Equipped creature gets +1/+1.$Equip {1}|
+Aegis Angel|Magic Origins|273|R|{4}{W}{W}|Creature - Angel|5|5|Flying$When Aegis Angel enters the battlefield, another target permanent gains indestructible for as long as you control Aegis Angel.|
+Divine Verdict|Magic Origins|274|C|{3}{W}|Instant|||Destroy target attacking or blocking creature.|
+Eagle of the Watch|Magic Origins|275|C|{2}{W}|Creature - Bird|2|1|Flying, vigilance|
+Serra Angel|Magic Origins|276|U|{3}{W}{W}|Creature - Angel|4|4|Flying$Vigilance|
+Into the Void|Magic Origins|277|U|{3}{U}|Sorcery|||Return up to two target creatures to their owners' hands.|
+Mahamoti Djinn|Magic Origins|278|R|{4}{U}{U}|Creature - Djinn|5|6|Flying|
+Weave Fate|Magic Origins|279|C|{3}{U}|Instant|||Draw two cards.|
+Flesh to Dust|Magic Origins|280|C|{3}{B}{B}|Instant|||Destroy target creature. It can't be regenerated.|
+Mind Rot|Magic Origins|281|C|{2}{B}|Sorcery|||Target player discards two cards.|
+Nightmare|Magic Origins|282|R|{5}{B}|Creature - Nightmare Horse|0|0|Flying$Nightmare's power and toughness are each equal to the number of Swamps you control.|
+Sengir Vampire|Magic Origins|283|U|{3}{B}{B}|Creature - Vampire|4|4|Flying$Whenever a creature dealt damage by Sengir Vampire this turn dies, put a +1/+1 counter on Sengir Vampire.|
+Fiery Hellhound|Magic Origins|284|C|{1}{R}{R}|Creature - Elemental Hound|2|2|{R}: Fiery Hellhound gets +1/+0 until end of turn.|
+Shivan Dragon|Magic Origins|285|R|{4}{R}{R}|Creature - Dragon|5|5|Flying${R}: Shivan Dragon gets +1/+0 until end of turn.|
+Plummet|Magic Origins|286|C|{1}{G}{1}{G}|Instant|||Destroy target creature with flying.|
+Prized Unicorn|Magic Origins|287|U|{3}{G}|Creature - Unicorn|2|22|2|All creatures able to block Prized Unicorn do so.|
+Terra Stomper|Magic Origins|288|R|{3}{G}{G}{G}|Creature - Beast|8|8|Terra Stomper can't be countered.$Trample|
Ambush Commander|Duel Decks: Anthology, Elves vs. Goblins|1|R|{3}{G}{G}|Creature - Elf|2|2|Forests you control are 1/1 green Elf creatures that are still lands.${1}{G}, Sacrifice an Elf: Target creature gets +3/+3 until end of turn.|
Lys Alana Huntmaster|Duel Decks: Anthology, Elves vs. Goblins|10|C|{2}{G}{G}|Creature - Elf Warrior|3|3|Whenever you cast an Elf spell, you may put a 1/1 green Elf Warrior creature token onto the battlefield.|
Stonewood Invoker|Duel Decks: Anthology, Elves vs. Goblins|11|C|{1}{G}|Creature - Elf Mutant|2|2|{7}{G}: Stonewood Invoker gets +5/+5 until end of turn.|
@@ -26911,4 +26973,16 @@ Mountain|Tempest Remastered|265|L||Basic Land - Mountain|||R|
Forest|Tempest Remastered|266|L||Basic Land - Forest|||G|
Forest|Tempest Remastered|267|L||Basic Land - Forest|||G|
Forest|Tempest Remastered|268|L||Basic Land - Forest|||G|
-Forest|Tempest Remastered|269|L||Basic Land - Forest|||G|
\ No newline at end of file
+Forest|Tempest Remastered|269|L||Basic Land - Forest|||G|
+Prognostic Sphinx|Clash Pack|1|Special|{3}{U}{U}|Creature - Sphinx|3|5|Flying$Discard a card: Prognostic Sphinx gains hexproof until end of turn. Tap it.$Whenever Prognostic Sphinx attacks, scry 3. <i>(Look at the top three cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)</i>|
+Fated Intervention|Clash Pack|2|Special|{2}{G}{G}{G}|Insant|||Put two 3/3 green Centaur enchantment creature tokens onto the battlefield. If it's your turn, scry 2.|
+Font of Fertility|Clash Pack|3|Special|{G}|Enchantment|||{1}{G}, Sacrifice Font of Fertility: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.|
+Hydra Broodmaster|Clash Pack|4|Special|{4}{G}{G}|Creature - Hydra|7|7|{X}{X}{G}: Monstrosity X. <i>(If this creature isn't monstrous, put X +1/+1 counters on it and it becomes monstrous.)</i>$When Hydra Broodmaster becomes monstrous, put X X/X green Hydra creature tokens onto the battlefield.|
+Prophet of Kruphix|Clash Pack|5|Special|{3}{U}{G}|Creature - Human Wizard|2|3|Untap all creatures and lands you control during each other player's untap step.$You may cast creature cards as though they had flash.|
+Temple of Mystery|Clash Pack|6|Special||Land|||Temple of Mystery enters the battlefield tapped.$When Temple of Mystery enters the battlefield, scry 1. <i>(Look at the top card of your library. You may put that card on the bottom of your library.)</i>${tap}: Add {G} or {U} to your mana pool.|
+Necropolis Fiend|Clash Pack|7|Special|{7}{B}{B}|Creature - Demon|4|5|Delve <i>(Each card you exile from your graveyard while casting this spell pays for {1}.)</i>$Flying${X}, {tap}, Exile X cards from your graveyard: Target creature gets -X/-X until end of turn.|
+Hero's Downfall|Clash Pack|8|Special|{1}{B}{B}|Instant|||Destroy target creature or planeswalker.|
+Sultai Ascendancy|Clash Pack|9|Special|{B}{G}{U}|Enchantment|||At the beginning of your upkeep, look at the top two cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.|
+Reaper of the Wilds|Clash Pack|10|Special|{2}{B}{G}|Creature - Gorgon|4|5|Whenever another creature dies, scry 1. <i>(Look at the top card of your library. You may put that card on the bottom of your library.)</i>${B}: Reaper of the Wilds gains deathtouch until end of turn.${1}{G}: Reaper of the Wilds gains hexproof until end of turn.|
+Whip of Erebos|Clash Pack|11|Special|{2}{B}{B}|Legendary Enchantment Artifact|||Creatures you control have lifelink.${2}{B}{B}, {tap}: Return target creature card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step. If it would leave the battlefield, exile it instead of putting it anywhere else. Activate this ability only any time you could cast a sorcery.|
+Courser of Kruphix|Clash Pack|12|Special|{1}{G}{G}|Enchantment Creature Centaur|2|4|Play with the top card of your library revealed.$You may play the top card of your library if it's a land card.$Whenever a land enters the battlefield under your control, you gain 1 life.|
\ No newline at end of file
diff --git a/Utils/mtg-sets-data.txt b/Utils/mtg-sets-data.txt
index 5d9cfa41e0..c1af58d3ac 100644
--- a/Utils/mtg-sets-data.txt
+++ b/Utils/mtg-sets-data.txt
@@ -21,6 +21,7 @@ Beatdown Box Set|BTD|
Born of the Gods|BNG|
Champions of Kamigawa|CHK|
Chronicles|CHR|
+Clash Pack|CLASH|
Commander 2013 Edition|C13|
Commander 2014 Edition|C14|
Conflux|CON|
diff --git a/Utils/release/getting_implemented_cards.txt b/Utils/release/getting_implemented_cards.txt
index 203bc26082..875530ee3e 100644
--- a/Utils/release/getting_implemented_cards.txt
+++ b/Utils/release/getting_implemented_cards.txt
@@ -137,6 +137,10 @@ git log 7a54d5364c9789ce2c3ef2c3eb4df7e0e0cde0cf..HEAD --diff-filter=A --name-st
since 1.4.1.v1
git log 3e9b4cfb7c22d363755d28f5ff1de351f6b7123c..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
+since 1.4.1.v2
+git log 675801e8d493b023add4333e7835751d20da07a1..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
+
+
3. Copy added_cards.txt to trunk\Utils folder
4. Run script:
> perl extract_in_wiki_format.perl