github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-25 11:09:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2020-01-14 17:43:43 +01:00
commit 55fe1db60d
22 changed files with 544 additions and 400 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

553
Mage.Client/src/main/java/mage/client/dialog/GameEndDialog.java
View file

@ -1,326 +1,325 @@
/* /*
* GameEndDialog.java * GameEndDialog.java
* *
* Created on Jul 31, 2013, 9:41:00 AM * Created on Jul 31, 2013, 9:41:00 AM
*/ */
package mage.client.dialog; package mage.client.dialog;
import java.awt.Color; import mage.client.MageFrame;
import java.awt.Image; import mage.client.game.GamePanel;
import java.awt.Rectangle; import mage.client.util.Format;
import java.awt.image.BufferedImage; import mage.client.util.ImageHelper;
import java.io.File; import mage.client.util.audio.AudioManager;
import java.io.FileNotFoundException; import mage.client.util.gui.BufferedImageBuilder;
import java.io.PrintWriter; import mage.view.GameEndView;
import java.text.DateFormat; import mage.view.PlayerView;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import javax.swing.ImageIcon;
import javax.swing.JOptionPane;
import mage.client.MageFrame;
import mage.client.game.GamePanel;
import mage.client.util.Format;
import mage.client.util.ImageHelper;
import mage.client.util.audio.AudioManager;
import mage.client.util.gui.BufferedImageBuilder;
import mage.view.GameEndView;
import mage.view.PlayerView;
/** import javax.swing.*;
* import java.awt.*;
* @author LevelX2 import java.awt.image.BufferedImage;
*/ import java.io.File;
public class GameEndDialog extends MageDialog { import java.io.FileNotFoundException;
import java.io.PrintWriter;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
private final DateFormat df = DateFormat.getDateTimeInstance(); /**
* @author LevelX2
*/
public class GameEndDialog extends MageDialog {
/** private final DateFormat df = DateFormat.getDateTimeInstance();
* Creates new form GameEndDialog
*
* @param gameEndView
*/
public GameEndDialog(GameEndView gameEndView) {
initComponents(); /**
this.modal = true; * Creates new form GameEndDialog
*
* @param gameEndView
*/
public GameEndDialog(GameEndView gameEndView) {
pnlText.setOpaque(true); initComponents();
pnlText.setBackground(new Color(240, 240, 240, 140)); this.modal = true;
Rectangle r = new Rectangle(610, 250); pnlText.setOpaque(true);
Image image = ImageHelper.getImageFromResources(gameEndView.hasWon() ? "/game_won.jpg" : "/game_lost.jpg"); pnlText.setBackground(new Color(240, 240, 240, 140));
BufferedImage imageResult = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(image, BufferedImage.TYPE_INT_ARGB), r);
ImageIcon icon = new ImageIcon(imageResult);
lblResultImage.setIcon(icon);
this.lblGameInfo.setText(gameEndView.getGameInfo()); Rectangle r = new Rectangle(610, 250);
this.lblMatchInfo.setText(gameEndView.getMatchInfo()); Image image = ImageHelper.getImageFromResources(gameEndView.hasWon() ? "/game_won.jpg" : "/game_lost.jpg");
this.lblAdditionalInfo.setText(gameEndView.getAdditionalInfo()); BufferedImage imageResult = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(image, BufferedImage.TYPE_INT_ARGB), r);
ImageIcon icon = new ImageIcon(imageResult);
lblResultImage.setIcon(icon);
String autoSave = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_LOG_AUTO_SAVE, "true"); this.lblGameInfo.setText(gameEndView.getGameInfo());
if (autoSave.equals("true")) { this.lblMatchInfo.setText(gameEndView.getMatchInfo());
this.saveGameLog(gameEndView); this.lblAdditionalInfo.setText(gameEndView.getAdditionalInfo());
}
// game duration String autoSave = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_LOG_AUTO_SAVE, "true");
txtDurationGame.setText(" " + Format.getDuration(gameEndView.getStartTime(), gameEndView.getEndTime())); if (autoSave.equals("true")) {
txtDurationGame.setToolTipText(new StringBuilder(df.format(gameEndView.getStartTime())).append(" - ").append(df.format(gameEndView.getEndTime())).toString()); this.saveGameLog(gameEndView);
}
// match duration // game duration
Calendar cal = Calendar.getInstance(); txtDurationGame.setText(" " + Format.getDuration(gameEndView.getStartTime(), gameEndView.getEndTime()));
txtDurationMatch.setText(" " + Format.getDuration(gameEndView.getMatchView().getStartTime(), cal.getTime())); txtDurationGame.setToolTipText(new StringBuilder(df.format(gameEndView.getStartTime())).append(" - ").append(df.format(gameEndView.getEndTime())).toString());
txtDurationMatch.setToolTipText(new StringBuilder(df.format(gameEndView.getMatchView().getStartTime())).append(" - ").append(df.format(cal.getTime())).toString());
StringBuilder sb = new StringBuilder(" "); // match duration
for (PlayerView player : gameEndView.getPlayers()) { Calendar cal = Calendar.getInstance();
sb.append(player.getName()).append(" Life: ").append(player.getLife()).append(' '); txtDurationMatch.setText(" " + Format.getDuration(gameEndView.getMatchView().getStartTime(), cal.getTime()));
} txtDurationMatch.setToolTipText(new StringBuilder(df.format(gameEndView.getMatchView().getStartTime())).append(" - ").append(df.format(cal.getTime())).toString());
this.txtLife.setText(sb.toString());
if (gameEndView.hasWon()) { StringBuilder sb = new StringBuilder(" ");
AudioManager.playPlayerWon(); for (PlayerView player : gameEndView.getPlayers()) {
} else { sb.append(player.getName()).append(" Life: ").append(player.getLife()).append(' ');
AudioManager.playPlayerLost(); }
} this.txtLife.setText(sb.toString());
txtMatchScore.setText(gameEndView.getMatchView().getResult()); if (gameEndView.hasWon()) {
} AudioManager.playPlayerWon();
} else {
AudioManager.playPlayerLost();
}
private void saveGameLog(GameEndView gameEndView) { txtMatchScore.setText(gameEndView.getMatchView().getResult());
String dir = "gamelogs"; }
File saveDir = new File(dir);
//Here comes the existence check
if (!saveDir.exists()) {
saveDir.mkdirs();
}
// get game log
try {
GamePanel gamePanel = MageFrame.getGame(gameEndView.getMatchView().getGames().get(gameEndView.getMatchView().getGames().size() - 1));
if (gamePanel != null) {
SimpleDateFormat sdf = new SimpleDateFormat();
sdf.applyPattern("yyyyMMdd_HHmmss");
String fileName = new StringBuilder(dir).append(File.separator)
.append(sdf.format(gameEndView.getStartTime()))
.append('_').append(gameEndView.getMatchView().getGameType())
.append('_').append(gameEndView.getMatchView().getGames().size())
.append(".txt").toString();
PrintWriter out = new PrintWriter(fileName);
out.print(gamePanel.getGameLog());
out.close();
}
} catch (FileNotFoundException ex) {
JOptionPane.showMessageDialog(this, "Error while writing game log to file\n\n" + ex, "Error writing gamelog", JOptionPane.ERROR_MESSAGE);
}
} private void saveGameLog(GameEndView gameEndView) {
String dir = "gamelogs";
File saveDir = new File(dir);
//Here comes the existence check
if (!saveDir.exists()) {
saveDir.mkdirs();
}
// get game log
try {
if (gameEndView.getMatchView().getGames().size() > 0) {
GamePanel gamePanel = MageFrame.getGame(gameEndView.getMatchView().getGames().get(gameEndView.getMatchView().getGames().size() - 1));
if (gamePanel != null) {
SimpleDateFormat sdf = new SimpleDateFormat();
sdf.applyPattern("yyyyMMdd_HHmmss");
String fileName = new StringBuilder(dir).append(File.separator)
.append(sdf.format(gameEndView.getStartTime()))
.append('_').append(gameEndView.getMatchView().getGameType())
.append('_').append(gameEndView.getMatchView().getGames().size())
.append(".txt").toString();
PrintWriter out = new PrintWriter(fileName);
out.print(gamePanel.getGameLog());
out.close();
}
}
} catch (FileNotFoundException ex) {
JOptionPane.showMessageDialog(this, "Error while writing game log to file\n\n" + ex, "Error writing gamelog", JOptionPane.ERROR_MESSAGE);
}
public void showDialog() { }
this.setLocation(100, 100);
this.setVisible(true);
}
/** public void showDialog() {
* This method is called from within the constructor to initialize the form. this.setLocation(100, 100);
* WARNING: Do NOT modify this code. The content of this method is always this.setVisible(true);
* regenerated by the Form Editor. }
*/
@SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
jPanel2 = new javax.swing.JPanel(); /**
tabPane = new javax.swing.JTabbedPane(); * This method is called from within the constructor to initialize the form.
tabResult = new javax.swing.JLayeredPane(); * WARNING: Do NOT modify this code. The content of this method is always
pnlText = new javax.swing.JLayeredPane(); * regenerated by the Form Editor.
lblGameInfo = new javax.swing.JLabel(); */
lblMatchInfo = new javax.swing.JLabel(); @SuppressWarnings("unchecked")
lblAdditionalInfo = new javax.swing.JLabel(); // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
lblResultImage = new javax.swing.JLabel(); private void initComponents() {
tabStatistics = new javax.swing.JPanel();
lblDurationGame = new javax.swing.JLabel();
txtDurationGame = new javax.swing.JLabel();
lblLife = new javax.swing.JLabel();
txtLife = new javax.swing.JLabel();
lblDurationMatch = new javax.swing.JLabel();
txtDurationMatch = new javax.swing.JLabel();
lblMatchScore = new javax.swing.JLabel();
txtMatchScore = new javax.swing.JLabel();
lblPlayerInfo = new javax.swing.JLabel();
txtPlayerInfo = new javax.swing.JLabel();
btnOk = new javax.swing.JButton();
javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); jPanel2 = new javax.swing.JPanel();
jPanel2.setLayout(jPanel2Layout); tabPane = new javax.swing.JTabbedPane();
jPanel2Layout.setHorizontalGroup( tabResult = new javax.swing.JLayeredPane();
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) pnlText = new javax.swing.JLayeredPane();
.addGap(0, 100, Short.MAX_VALUE) lblGameInfo = new javax.swing.JLabel();
); lblMatchInfo = new javax.swing.JLabel();
jPanel2Layout.setVerticalGroup( lblAdditionalInfo = new javax.swing.JLabel();
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) lblResultImage = new javax.swing.JLabel();
.addGap(0, 100, Short.MAX_VALUE) tabStatistics = new javax.swing.JPanel();
); lblDurationGame = new javax.swing.JLabel();
txtDurationGame = new javax.swing.JLabel();
lblLife = new javax.swing.JLabel();
txtLife = new javax.swing.JLabel();
lblDurationMatch = new javax.swing.JLabel();
txtDurationMatch = new javax.swing.JLabel();
lblMatchScore = new javax.swing.JLabel();
txtMatchScore = new javax.swing.JLabel();
lblPlayerInfo = new javax.swing.JLabel();
txtPlayerInfo = new javax.swing.JLabel();
btnOk = new javax.swing.JButton();
setTitle("Game end information"); javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
jPanel2.setLayout(jPanel2Layout);
jPanel2Layout.setHorizontalGroup(
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 100, Short.MAX_VALUE)
);
jPanel2Layout.setVerticalGroup(
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 100, Short.MAX_VALUE)
);
pnlText.setBackground(new java.awt.Color(200, 100, 100)); setTitle("Game end information");
pnlText.setBorder(javax.swing.BorderFactory.createEtchedBorder());
pnlText.setOpaque(true);
lblGameInfo.setFont(new java.awt.Font("Tahoma", 3, 18)); // NOI18N pnlText.setBackground(new java.awt.Color(200, 100, 100));
lblGameInfo.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); pnlText.setBorder(javax.swing.BorderFactory.createEtchedBorder());
lblGameInfo.setText("gameInfo"); pnlText.setOpaque(true);
pnlText.add(lblGameInfo);
lblGameInfo.setBounds(11, 1, 550, 25);
lblMatchInfo.setFont(new java.awt.Font("Tahoma", 3, 18)); // NOI18N lblGameInfo.setFont(new java.awt.Font("Tahoma", 3, 18)); // NOI18N
lblMatchInfo.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); lblGameInfo.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
lblMatchInfo.setText("matchInfo"); lblGameInfo.setText("gameInfo");
pnlText.add(lblMatchInfo); pnlText.add(lblGameInfo);
lblMatchInfo.setBounds(10, 30, 550, 25); lblGameInfo.setBounds(11, 1, 550, 25);
lblAdditionalInfo.setFont(new java.awt.Font("Tahoma", 3, 18)); // NOI18N lblMatchInfo.setFont(new java.awt.Font("Tahoma", 3, 18)); // NOI18N
lblAdditionalInfo.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); lblMatchInfo.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
lblAdditionalInfo.setText("additionalInfo"); lblMatchInfo.setText("matchInfo");
pnlText.add(lblAdditionalInfo); pnlText.add(lblMatchInfo);
lblAdditionalInfo.setBounds(10, 60, 550, 25); lblMatchInfo.setBounds(10, 30, 550, 25);
tabResult.add(pnlText); lblAdditionalInfo.setFont(new java.awt.Font("Tahoma", 3, 18)); // NOI18N
pnlText.setBounds(20, 150, 570, 90); lblAdditionalInfo.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
lblAdditionalInfo.setText("additionalInfo");
pnlText.add(lblAdditionalInfo);
lblAdditionalInfo.setBounds(10, 60, 550, 25);
lblResultImage.setFont(new java.awt.Font("Tahoma", 1, 24)); // NOI18N tabResult.add(pnlText);
lblResultImage.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); pnlText.setBounds(20, 150, 570, 90);
tabResult.add(lblResultImage);
lblResultImage.setBounds(0, 0, 610, 250);
tabPane.addTab("Result", tabResult); lblResultImage.setFont(new java.awt.Font("Tahoma", 1, 24)); // NOI18N
lblResultImage.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
tabResult.add(lblResultImage);
lblResultImage.setBounds(0, 0, 610, 250);
lblDurationGame.setText("Duration game:"); tabPane.addTab("Result", tabResult);
txtDurationGame.setText("Duration Game"); lblDurationGame.setText("Duration game:");
txtDurationGame.setBorder(javax.swing.BorderFactory.createEtchedBorder());
lblLife.setText("Life at end:"); txtDurationGame.setText("Duration Game");
txtDurationGame.setBorder(javax.swing.BorderFactory.createEtchedBorder());
txtLife.setBorder(javax.swing.BorderFactory.createEtchedBorder()); lblLife.setText("Life at end:");
lblDurationMatch.setText("Duration match:"); txtLife.setBorder(javax.swing.BorderFactory.createEtchedBorder());
txtDurationMatch.setBorder(javax.swing.BorderFactory.createEtchedBorder()); lblDurationMatch.setText("Duration match:");
lblMatchScore.setText("Match score:"); txtDurationMatch.setBorder(javax.swing.BorderFactory.createEtchedBorder());
txtMatchScore.setBorder(javax.swing.BorderFactory.createEtchedBorder()); lblMatchScore.setText("Match score:");
lblPlayerInfo.setText("Player info:"); txtMatchScore.setBorder(javax.swing.BorderFactory.createEtchedBorder());
txtPlayerInfo.setBorder(javax.swing.BorderFactory.createEtchedBorder()); lblPlayerInfo.setText("Player info:");
javax.swing.GroupLayout tabStatisticsLayout = new javax.swing.GroupLayout(tabStatistics); txtPlayerInfo.setBorder(javax.swing.BorderFactory.createEtchedBorder());
tabStatistics.setLayout(tabStatisticsLayout);
tabStatisticsLayout.setHorizontalGroup(
tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(tabStatisticsLayout.createSequentialGroup()
.addContainerGap()
.addGroup(tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lblPlayerInfo, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(lblDurationMatch, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(lblMatchScore, javax.swing.GroupLayout.PREFERRED_SIZE, 86, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(lblDurationGame, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(lblLife, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(txtPlayerInfo, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(txtDurationGame, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 494, Short.MAX_VALUE)
.addComponent(txtLife, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 489, Short.MAX_VALUE)
.addComponent(txtDurationMatch, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 489, Short.MAX_VALUE)
.addComponent(txtMatchScore, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 489, Short.MAX_VALUE))
.addContainerGap())
);
tabStatisticsLayout.setVerticalGroup(
tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(tabStatisticsLayout.createSequentialGroup()
.addGroup(tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lblDurationGame, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtDurationGame, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(lblLife, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtLife, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(lblDurationMatch, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtDurationMatch, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(lblMatchScore, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtMatchScore, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblPlayerInfo, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtPlayerInfo, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(105, Short.MAX_VALUE))
);
tabPane.addTab("Statistics", tabStatistics); javax.swing.GroupLayout tabStatisticsLayout = new javax.swing.GroupLayout(tabStatistics);
tabStatistics.setLayout(tabStatisticsLayout);
tabStatisticsLayout.setHorizontalGroup(
tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(tabStatisticsLayout.createSequentialGroup()
.addContainerGap()
.addGroup(tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lblPlayerInfo, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(lblDurationMatch, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(lblMatchScore, javax.swing.GroupLayout.PREFERRED_SIZE, 86, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(lblDurationGame, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(lblLife, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(txtPlayerInfo, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(txtDurationGame, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 494, Short.MAX_VALUE)
.addComponent(txtLife, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 489, Short.MAX_VALUE)
.addComponent(txtDurationMatch, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 489, Short.MAX_VALUE)
.addComponent(txtMatchScore, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 489, Short.MAX_VALUE))
.addContainerGap())
);
tabStatisticsLayout.setVerticalGroup(
tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(tabStatisticsLayout.createSequentialGroup()
.addGroup(tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lblDurationGame, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtDurationGame, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(lblLife, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtLife, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(lblDurationMatch, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtDurationMatch, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(lblMatchScore, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtMatchScore, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(tabStatisticsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblPlayerInfo, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtPlayerInfo, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(105, Short.MAX_VALUE))
);
btnOk.setText("OK"); tabPane.addTab("Statistics", tabStatistics);
btnOk.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnOkActionPerformed(evt);
}
});
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); btnOk.setText("OK");
getContentPane().setLayout(layout); btnOk.addActionListener(new java.awt.event.ActionListener() {
layout.setHorizontalGroup( public void actionPerformed(java.awt.event.ActionEvent evt) {
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) btnOkActionPerformed(evt);
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() }
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) });
.addComponent(btnOk)
.addContainerGap())
.addGroup(layout.createSequentialGroup()
.addComponent(tabPane, javax.swing.GroupLayout.PREFERRED_SIZE, 626, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, Short.MAX_VALUE))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(tabPane, javax.swing.GroupLayout.PREFERRED_SIZE, 277, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btnOk)
.addGap(0, 8, Short.MAX_VALUE))
);
pack(); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
}// </editor-fold>//GEN-END:initComponents getContentPane().setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(btnOk)
.addContainerGap())
.addGroup(layout.createSequentialGroup()
.addComponent(tabPane, javax.swing.GroupLayout.PREFERRED_SIZE, 626, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, Short.MAX_VALUE))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(tabPane, javax.swing.GroupLayout.PREFERRED_SIZE, 277, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btnOk)
.addGap(0, 8, Short.MAX_VALUE))
);
private void btnOkActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnOkActionPerformed pack();
this.removeDialog(); }// </editor-fold>//GEN-END:initComponents
}//GEN-LAST:event_btnOkActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables private void btnOkActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnOkActionPerformed
private javax.swing.JButton btnOk; this.removeDialog();
private javax.swing.JPanel jPanel2; }//GEN-LAST:event_btnOkActionPerformed
private javax.swing.JLabel lblAdditionalInfo;
private javax.swing.JLabel lblDurationGame;
private javax.swing.JLabel lblDurationMatch;
private javax.swing.JLabel lblGameInfo;
private javax.swing.JLabel lblLife;
private javax.swing.JLabel lblMatchInfo;
private javax.swing.JLabel lblMatchScore;
private javax.swing.JLabel lblPlayerInfo;
private javax.swing.JLabel lblResultImage;
private javax.swing.JLayeredPane pnlText;
private javax.swing.JTabbedPane tabPane;
private javax.swing.JLayeredPane tabResult;
private javax.swing.JPanel tabStatistics;
private javax.swing.JLabel txtDurationGame;
private javax.swing.JLabel txtDurationMatch;
private javax.swing.JLabel txtLife;
private javax.swing.JLabel txtMatchScore;
private javax.swing.JLabel txtPlayerInfo;
// End of variables declaration//GEN-END:variables
} // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton btnOk;
private javax.swing.JPanel jPanel2;
private javax.swing.JLabel lblAdditionalInfo;
private javax.swing.JLabel lblDurationGame;
private javax.swing.JLabel lblDurationMatch;
private javax.swing.JLabel lblGameInfo;
private javax.swing.JLabel lblLife;
private javax.swing.JLabel lblMatchInfo;
private javax.swing.JLabel lblMatchScore;
private javax.swing.JLabel lblPlayerInfo;
private javax.swing.JLabel lblResultImage;
private javax.swing.JLayeredPane pnlText;
private javax.swing.JTabbedPane tabPane;
private javax.swing.JLayeredPane tabResult;
private javax.swing.JPanel tabStatistics;
private javax.swing.JLabel txtDurationGame;
private javax.swing.JLabel txtDurationMatch;
private javax.swing.JLabel txtLife;
private javax.swing.JLabel txtMatchScore;
private javax.swing.JLabel txtPlayerInfo;
// End of variables declaration//GEN-END:variables
}

14
Mage.Sets/src/mage/cards/d/Displace.java
View file

@ -1,32 +1,30 @@
package mage.cards.d; package mage.cards.d;
import java.util.UUID;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ExileTargetForSourceEffect;
import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledCreaturePermanent;
import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent;
import java.util.UUID;
/** /**
*
* @author LevelX2 * @author LevelX2
*/ */
public final class Displace extends CardImpl { public final class Displace extends CardImpl {
public Displace(UUID ownerId, CardSetInfo setInfo) { public Displace(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{U}");
// Exile up to two target creatures you control, then return those cards to the battlefield under their owner's control. // Exile up to two target creatures you control, then return those cards to the battlefield under their owner's control.
this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(0, 2, new FilterControlledCreaturePermanent("creatures you control"), false)); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(0, 2, new FilterControlledCreaturePermanent("creatures you control"), false));
Effect effect = new ExileTargetForSourceEffect(); Effect effect = new ExileTargetForSourceEffect();
effect.setText("Exile up to two target creatures you control");
this.getSpellAbility().addEffect(effect); this.getSpellAbility().addEffect(effect);
effect = new ReturnToBattlefieldUnderYourControlTargetEffect(true); effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect()
effect.setText(", then return those cards to the battlefield under their owner's control"); .withReturnNames("those cards", "their owner's").concatBy(", then");
this.getSpellAbility().addEffect(effect); this.getSpellAbility().addEffect(effect);
} }

1
Mage.Sets/src/mage/cards/d/DreamTrawler.java
View file

@ -52,6 +52,7 @@ public final class DreamTrawler extends CardImpl {
HexproofAbility.getInstance(), Duration.EndOfTurn HexproofAbility.getInstance(), Duration.EndOfTurn
), new DiscardCardCost()); ), new DiscardCardCost());
ability.addEffect(new TapSourceEffect().setText("Tap it")); ability.addEffect(new TapSourceEffect().setText("Tap it"));
this.addAbility(ability);
} }
private DreamTrawler(final DreamTrawler card) { private DreamTrawler(final DreamTrawler card) {

10
Mage.Sets/src/mage/cards/e/EldraziDisplacer.java
View file

@ -1,7 +1,5 @@
package mage.cards.e; package mage.cards.e;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
@ -19,8 +17,9 @@ import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/** /**
*
* @author LevelX2 * @author LevelX2
*/ */
public final class EldraziDisplacer extends CardImpl { public final class EldraziDisplacer extends CardImpl {
@ -42,10 +41,9 @@ public final class EldraziDisplacer extends CardImpl {
// {2}{C}: Exile another target creature, then return it to the battlefield tapped under its owner's control. // {2}{C}: Exile another target creature, then return it to the battlefield tapped under its owner's control.
Effect effect = new ExileTargetForSourceEffect(); Effect effect = new ExileTargetForSourceEffect();
effect.setText("Exile another target creature");
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{C}")); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{C}"));
effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect(true); effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect(true)
effect.setText(", then return it to the battlefield tapped under its owner's control"); .withReturnNames("it", "its owner's").concatBy(", then");
ability.addEffect(effect); ability.addEffect(effect);
ability.addTarget(new TargetCreaturePermanent(FILTER)); ability.addTarget(new TargetCreaturePermanent(FILTER));
this.addAbility(ability); this.addAbility(ability);

15
Mage.Sets/src/mage/cards/f/FacelessButcher.java
View file

@ -1,7 +1,5 @@
package mage.cards.f; package mage.cards.f;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@ -19,32 +17,29 @@ import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.Target; import mage.target.Target;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import java.util.UUID;
/** /**
*
* @author Temba21 * @author Temba21
*/ */
public final class FacelessButcher extends CardImpl { public final class FacelessButcher extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature other than Faceless Butcher");
static { static {
filter.add(AnotherPredicate.instance); filter.add(AnotherPredicate.instance);
} }
public FacelessButcher(UUID ownerId, CardSetInfo setInfo) { public FacelessButcher(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{B}");
this.subtype.add(SubType.NIGHTMARE); this.subtype.add(SubType.NIGHTMARE);
this.subtype.add(SubType.HORROR); this.subtype.add(SubType.HORROR);
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
// When Faceless Butcher enters the battlefield, exile target creature other than Faceless Butcher. // When Faceless Butcher enters the battlefield, exile target creature other than Faceless Butcher.
Effect effect = new ExileTargetForSourceEffect(); Effect effect = new ExileTargetForSourceEffect();
effect.setText("exile target creature other than {this}");
Ability ability1 = new EntersBattlefieldTriggeredAbility(effect, false); Ability ability1 = new EntersBattlefieldTriggeredAbility(effect, false);
Target target = new TargetPermanent(filter); Target target = new TargetPermanent(filter);
ability1.addTarget(target); ability1.addTarget(target);

15
Mage.Sets/src/mage/cards/f/FacelessDevourer.java
View file

@ -1,7 +1,5 @@
package mage.cards.f; package mage.cards.f;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@ -21,13 +19,14 @@ import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.Target; import mage.target.Target;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import java.util.UUID;
/** /**
*
* @author LoneFox * @author LoneFox
*/ */
public final class FacelessDevourer extends CardImpl { public final class FacelessDevourer extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature with shadow");
static { static {
filter.add(AnotherPredicate.instance); filter.add(AnotherPredicate.instance);
@ -35,7 +34,7 @@ public final class FacelessDevourer extends CardImpl {
} }
public FacelessDevourer(UUID ownerId, CardSetInfo setInfo) { public FacelessDevourer(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
this.subtype.add(SubType.NIGHTMARE); this.subtype.add(SubType.NIGHTMARE);
this.subtype.add(SubType.HORROR); this.subtype.add(SubType.HORROR);
this.power = new MageInt(2); this.power = new MageInt(2);
@ -43,15 +42,17 @@ public final class FacelessDevourer extends CardImpl {
// Shadow // Shadow
this.addAbility(ShadowAbility.getInstance()); this.addAbility(ShadowAbility.getInstance());
// When Faceless Devourer enters the battlefield, exile another target creature with shadow. // When Faceless Devourer enters the battlefield, exile another target creature with shadow.
Effect effect = new ExileTargetForSourceEffect(); Effect effect = new ExileTargetForSourceEffect();
effect.setText("exile another target creature with shadow");
Ability ability = new EntersBattlefieldTriggeredAbility(effect, false); Ability ability = new EntersBattlefieldTriggeredAbility(effect, false);
Target target = new TargetPermanent(filter); Target target = new TargetPermanent(filter);
ability.addTarget(target); ability.addTarget(target);
this.addAbility(ability); this.addAbility(ability);
// When Faceless Devourer leaves the battlefield, return the exiled card to the battlefield under its owner's control. // When Faceless Devourer leaves the battlefield, return the exiled card to the battlefield under its owner's control.
ability = new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), false); ability = new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD)
.withReturnName("card", "its owner's"), false);
this.addAbility(ability); this.addAbility(ability);
} }

9
Mage.Sets/src/mage/cards/g/Gravegouger.java
View file

@ -1,7 +1,5 @@
package mage.cards.g; package mage.cards.g;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@ -17,14 +15,15 @@ import mage.constants.Zone;
import mage.filter.FilterCard; import mage.filter.FilterCard;
import mage.target.common.TargetCardInASingleGraveyard; import mage.target.common.TargetCardInASingleGraveyard;
import java.util.UUID;
/** /**
*
* @author LoneFox * @author LoneFox
*/ */
public final class Gravegouger extends CardImpl { public final class Gravegouger extends CardImpl {
public Gravegouger(UUID ownerId, CardSetInfo setInfo) { public Gravegouger(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
this.subtype.add(SubType.NIGHTMARE); this.subtype.add(SubType.NIGHTMARE);
this.subtype.add(SubType.HORROR); this.subtype.add(SubType.HORROR);
this.power = new MageInt(2); this.power = new MageInt(2);
@ -32,10 +31,10 @@ public final class Gravegouger extends CardImpl {
// When Gravegouger enters the battlefield, exile up to two target cards from a single graveyard. // When Gravegouger enters the battlefield, exile up to two target cards from a single graveyard.
Effect effect = new ExileTargetForSourceEffect(); Effect effect = new ExileTargetForSourceEffect();
effect.setText("exile up to two target cards from a single graveyard");
Ability ability = new EntersBattlefieldTriggeredAbility(effect, false); Ability ability = new EntersBattlefieldTriggeredAbility(effect, false);
ability.addTarget(new TargetCardInASingleGraveyard(0, 2, new FilterCard("cards from a single graveyard"))); ability.addTarget(new TargetCardInASingleGraveyard(0, 2, new FilterCard("cards from a single graveyard")));
this.addAbility(ability); this.addAbility(ability);
// When Gravegouger leaves the battlefield, return the exiled cards to their owner's graveyard. // When Gravegouger leaves the battlefield, return the exiled cards to their owner's graveyard.
this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.GRAVEYARD), false)); this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.GRAVEYARD), false));
} }

13
Mage.Sets/src/mage/cards/h/Helvault.java
View file

@ -1,7 +1,5 @@
package mage.cards.h; package mage.cards.h;
import java.util.UUID;
import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapSourceCost;
@ -18,8 +16,9 @@ import mage.filter.common.FilterCreaturePermanent;
import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/** /**
*
* @author North * @author North
*/ */
public final class Helvault extends CardImpl { public final class Helvault extends CardImpl {
@ -31,19 +30,21 @@ public final class Helvault extends CardImpl {
} }
public Helvault(UUID ownerId, CardSetInfo setInfo) { public Helvault(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
addSuperType(SuperType.LEGENDARY); addSuperType(SuperType.LEGENDARY);
// {1}, {tap}: Exile target creature you control. // {1}, {T}: Exile target creature you control.
SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new GenericManaCost(1)); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new GenericManaCost(1));
ability.addCost(new TapSourceCost()); ability.addCost(new TapSourceCost());
ability.addTarget(new TargetControlledCreaturePermanent()); ability.addTarget(new TargetControlledCreaturePermanent());
this.addAbility(ability); this.addAbility(ability);
// {7}, {tap}: Exile target creature you don't control.
// {7}, {T}: Exile target creature you don't control.
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new GenericManaCost(7)); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new GenericManaCost(7));
ability.addCost(new TapSourceCost()); ability.addCost(new TapSourceCost());
ability.addTarget(new TargetCreaturePermanent(filter)); ability.addTarget(new TargetCreaturePermanent(filter));
this.addAbility(ability); this.addAbility(ability);
// When Helvault is put into a graveyard from the battlefield, return all cards exiled with it to the battlefield under their owners' control. // When Helvault is put into a graveyard from the battlefield, return all cards exiled with it to the battlefield under their owners' control.
this.addAbility(new DiesTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD))); this.addAbility(new DiesTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD)));
} }

18
Mage.Sets/src/mage/cards/i/IllusionistsStratagem.java
View file

@ -1,8 +1,5 @@
package mage.cards.i; package mage.cards.i;
import java.util.UUID;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ExileTargetForSourceEffect;
import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect;
@ -12,8 +9,9 @@ import mage.constants.CardType;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledCreaturePermanent;
import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent;
import java.util.UUID;
/** /**
*
* @author Styxo * @author Styxo
*/ */
public final class IllusionistsStratagem extends CardImpl { public final class IllusionistsStratagem extends CardImpl {
@ -22,13 +20,11 @@ public final class IllusionistsStratagem extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{U}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{U}");
// Exile up to two target creatures you control, then return those cards to the battlefield under their owner's control. // Exile up to two target creatures you control, then return those cards to the battlefield under their owner's control.
this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(0, 2, new FilterControlledCreaturePermanent("creatures you control"), false)); this.getSpellAbility().addEffect(new ExileTargetForSourceEffect());
Effect effect = new ExileTargetForSourceEffect(); this.getSpellAbility().addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(true)
effect.setText("Exile up to two target creatures you control"); .withReturnNames("those cards", "their owner's").concatBy(", then"));
this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(0, 2,
effect = new ReturnToBattlefieldUnderYourControlTargetEffect(true); new FilterControlledCreaturePermanent("creatures you control"), false));
effect.setText(", then return those cards to the battlefield under their owner's control");
this.getSpellAbility().addEffect(effect);
// Draw a card. // Draw a card.
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));

20
Mage.Sets/src/mage/cards/n/N1Starfighter.java
View file

@ -1,12 +1,9 @@
package mage.cards.n; package mage.cards.n;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.DoIfCostPaid;
import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ExileTargetForSourceEffect;
import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect; import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect;
@ -19,13 +16,14 @@ import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent;
import java.util.UUID;
/** /**
*
* @author Styxo * @author Styxo
*/ */
public final class N1Starfighter extends CardImpl { public final class N1Starfighter extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature you control"); private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control");
static { static {
filter.add(AnotherPredicate.instance); filter.add(AnotherPredicate.instance);
@ -40,12 +38,14 @@ public final class N1Starfighter extends CardImpl {
// Spaceflight // Spaceflight
this.addAbility(SpaceflightAbility.getInstance()); this.addAbility(SpaceflightAbility.getInstance());
// Whenever N-1 Starfighter deals combat damage to a player, you may pay {1}{W/U}. If you do, exile another creature you control, then return that card to the battlefield under its owner's control. // Whenever N-1 Starfighter deals combat damage to a player, you may pay {1}{W/U}. If you do,
Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(new ExileTargetForSourceEffect(), new ManaCostsImpl("{1}{W/U}")), false); // exile another target creature you control, then return that card to the battlefield under its owner's control.
Effect effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect(false, true); // P.S. original card have error with missing target word (another target creature)
effect.setText(", then return the card to the battlefield under their owner's control"); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(
ability.addEffect(effect); new ExileTargetForSourceEffect(), new ManaCostsImpl("{1}{W/U}")), false);
ability.addEffect(new ReturnToBattlefieldUnderOwnerControlTargetEffect(false, true).concatBy(", then"));
ability.addTarget(new TargetControlledCreaturePermanent(filter)); ability.addTarget(new TargetControlledCreaturePermanent(filter));
ability.getRule();
this.addAbility(ability); this.addAbility(ability);
} }

9
Mage.Sets/src/mage/cards/p/ParallaxTide.java
View file

@ -1,7 +1,5 @@
package mage.cards.p; package mage.cards.p;
import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
@ -16,22 +14,25 @@ import mage.constants.Zone;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.target.common.TargetLandPermanent; import mage.target.common.TargetLandPermanent;
import java.util.UUID;
/** /**
*
* @author Plopman * @author Plopman
*/ */
public final class ParallaxTide extends CardImpl { public final class ParallaxTide extends CardImpl {
public ParallaxTide(UUID ownerId, CardSetInfo setInfo) { public ParallaxTide(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}{U}"); super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}");
// Fading 5 // Fading 5
this.addAbility(new FadingAbility(5, this)); this.addAbility(new FadingAbility(5, this));
// Remove a fade counter from Parallax Tide: Exile target land. // Remove a fade counter from Parallax Tide: Exile target land.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new RemoveCountersSourceCost(CounterType.FADE.createInstance())); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new RemoveCountersSourceCost(CounterType.FADE.createInstance()));
ability.addTarget(new TargetLandPermanent()); ability.addTarget(new TargetLandPermanent());
this.addAbility(ability); this.addAbility(ability);
// When Parallax Tide leaves the battlefield, each player returns to the battlefield all cards they own exiled with Parallax Tide. // When Parallax Tide leaves the battlefield, each player returns to the battlefield all cards they own exiled with Parallax Tide.
this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), splitCard)); this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), splitCard));
} }

22
Mage.Sets/src/mage/cards/p/Petradon.java
View file

@ -1,46 +1,46 @@
package mage.cards.p; package mage.cards.p;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.abilities.effects.common.ExileTargetForSourceEffect;
import mage.abilities.effects.common.ReturnFromExileForSourceEffect; import mage.abilities.effects.common.ReturnFromExileForSourceEffect;
import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.SubType;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterLandPermanent;
import mage.target.common.TargetLandPermanent; import mage.target.common.TargetLandPermanent;
import java.util.UUID;
/** /**
*
* @author LoneFox * @author LoneFox
*/ */
public final class Petradon extends CardImpl { public final class Petradon extends CardImpl {
public Petradon(UUID ownerId, CardSetInfo setInfo) { public Petradon(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{R}{R}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{6}{R}{R}");
this.subtype.add(SubType.NIGHTMARE); this.subtype.add(SubType.NIGHTMARE);
this.subtype.add(SubType.BEAST); this.subtype.add(SubType.BEAST);
this.power = new MageInt(5); this.power = new MageInt(5);
this.toughness = new MageInt(6); this.toughness = new MageInt(6);
// When Petradon enters the battlefield, exile two target lands. // When Petradon enters the battlefield, exile two target lands.
Effect effect = new ExileTargetForSourceEffect(); Ability ability = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect(), false);
effect.setText("exile two target lands"); ability.addTarget(new TargetLandPermanent(2, 2, new FilterLandPermanent("lands"), false));
Ability ability = new EntersBattlefieldTriggeredAbility(effect, false);
ability.addTarget(new TargetLandPermanent(2));
this.addAbility(ability); this.addAbility(ability);
// When Petradon leaves the battlefield, return the exiled cards to the battlefield under their owners' control. // When Petradon leaves the battlefield, return the exiled cards to the battlefield under their owners' control.
this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), false)); this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD)
.withReturnName("cards", "their owners'"), false));
// {R}: Petradon gets +1/+0 until end of turn. // {R}: Petradon gets +1/+0 until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")));
} }

8
Mage.Sets/src/mage/cards/p/Petravark.java
View file

@ -1,7 +1,5 @@
package mage.cards.p; package mage.cards.p;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@ -15,14 +13,15 @@ import mage.constants.SubType;
import mage.constants.Zone; import mage.constants.Zone;
import mage.target.common.TargetLandPermanent; import mage.target.common.TargetLandPermanent;
import java.util.UUID;
/** /**
*
* @author LoneFox * @author LoneFox
*/ */
public final class Petravark extends CardImpl { public final class Petravark extends CardImpl {
public Petravark(UUID ownerId, CardSetInfo setInfo) { public Petravark(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}");
this.subtype.add(SubType.NIGHTMARE); this.subtype.add(SubType.NIGHTMARE);
this.subtype.add(SubType.BEAST); this.subtype.add(SubType.BEAST);
this.power = new MageInt(2); this.power = new MageInt(2);
@ -32,6 +31,7 @@ public final class Petravark extends CardImpl {
Ability ability = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect(), false); Ability ability = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect(), false);
ability.addTarget(new TargetLandPermanent()); ability.addTarget(new TargetLandPermanent());
this.addAbility(ability); this.addAbility(ability);
// When Petravark leaves the battlefield, return the exiled card to the battlefield under its owner's control. // When Petravark leaves the battlefield, return the exiled card to the battlefield under its owner's control.
this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), false)); this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), false));
} }

9
Mage.Sets/src/mage/cards/r/RuinGhost.java
View file

@ -1,7 +1,5 @@
package mage.cards.r; package mage.cards.r;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
@ -17,20 +15,21 @@ import mage.constants.Zone;
import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledLandPermanent;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import java.util.UUID;
/** /**
*
* @author jeffwadsworth * @author jeffwadsworth
*/ */
public final class RuinGhost extends CardImpl { public final class RuinGhost extends CardImpl {
public RuinGhost(UUID ownerId, CardSetInfo setInfo) { public RuinGhost(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}");
this.subtype.add(SubType.SPIRIT); this.subtype.add(SubType.SPIRIT);
this.power = new MageInt(1); this.power = new MageInt(1);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// {W}, {tap}: Exile target land you control, then return it to the battlefield under your control. // {W}, {T}: Exile target land you control, then return it to the battlefield under your control.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new ManaCostsImpl("{W")); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new ManaCostsImpl("{W"));
ability.addCost(new TapSourceCost()); ability.addCost(new TapSourceCost());
ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(true)); ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(true));

19
Mage.Sets/src/mage/cards/t/ThassaDeepDwelling.java
View file

@ -1,6 +1,5 @@
package mage.cards.t; package mage.cards.t;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
@ -20,20 +19,24 @@ import mage.constants.SubType;
import mage.constants.SuperType; import mage.constants.SuperType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import java.util.UUID;
/** /**
* @author TheElk801 * @author TheElk801
*/ */
public final class ThassaDeepDwelling extends CardImpl { public final class ThassaDeepDwelling extends CardImpl {
private static final FilterPermanent filter = new FilterCreaturePermanent("another target creature"); private static final FilterPermanent filterAnother = new FilterCreaturePermanent("another target creature");
private static final FilterPermanent filterOther = new FilterControlledCreaturePermanent("other target creature you control");
static { static {
filter.add(AnotherPredicate.instance); filterAnother.add(AnotherPredicate.instance);
filterOther.add(AnotherPredicate.instance);
} }
public ThassaDeepDwelling(UUID ownerId, CardSetInfo setInfo) { public ThassaDeepDwelling(UUID ownerId, CardSetInfo setInfo) {
@ -53,12 +56,12 @@ public final class ThassaDeepDwelling extends CardImpl {
// At the beginning of your end step, exile up to one other target creature you control, then return that card to the battlefield under your control. // At the beginning of your end step, exile up to one other target creature you control, then return that card to the battlefield under your control.
Ability ability = new BeginningOfEndStepTriggeredAbility( Ability ability = new BeginningOfEndStepTriggeredAbility(
new ExileTargetForSourceEffect().setText("exile up to one other target creature you control, then "), new ExileTargetForSourceEffect(),
TargetController.YOU, false TargetController.YOU, false
); );
ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(true)); ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(true).concatBy(", then"));
ability.addTarget(new TargetPermanent( ability.addTarget(new TargetPermanent(
0, 1, StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE, false 0, 1, filterOther, false
)); ));
this.addAbility(ability); this.addAbility(ability);
@ -66,7 +69,7 @@ public final class ThassaDeepDwelling extends CardImpl {
ability = new SimpleActivatedAbility( ability = new SimpleActivatedAbility(
new TapTargetEffect("another target creature"), new ManaCostsImpl("{3}{U}") new TapTargetEffect("another target creature"), new ManaCostsImpl("{3}{U}")
); );
ability.addTarget(new TargetPermanent(filter)); ability.addTarget(new TargetPermanent(filterAnother));
this.addAbility(ability); this.addAbility(ability);
} }

3
Mage.Sets/src/mage/cards/y/YorvoLordOfGarenbrig.java
View file

@ -17,6 +17,7 @@ import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
import java.util.UUID; import java.util.UUID;
@ -88,7 +89,7 @@ class YorvoLordOfGarenbrigEffect extends OneShotEffect {
return false; return false;
} }
sourcePerm.addCounters(CounterType.P1P1.createInstance(), source, game); sourcePerm.addCounters(CounterType.P1P1.createInstance(), source, game);
Permanent permanent = game.getPermanentOrLKIBattlefield(targetPointer.getFirst(game, source)); Permanent permanent = ((FixedTarget) targetPointer).getTargetedPermanentOrLKIBattlefield(game);
if (permanent == null) { if (permanent == null) {
return true; return true;
} }

82
Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java Normal file
View file

@ -0,0 +1,82 @@
package org.mage.test.commander.duel;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.counters.CounterType;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestCommanderDuelBase;
/**
* @author JayDi85
*/
public class YorvoLordOfGarenbrigOnCommandersTest extends CardTestCommanderDuelBase {
@Test
public void test_TriggerOnSimpleCommander() {
// Yorvo, Lord of Garenbrig enters the battlefield with four +1/+1 counters on it.
// Whenever another green creature enters the battlefield under your control, put a +1/+1 counter on Yorvo. Then if that creature’s power is greater than Yorvo’s power, put another +1/+1 counter on Yorvo.
addCard(Zone.HAND, playerA, "Yorvo, Lord of Garenbrig", 5); // {G}{G}{G}
addCard(Zone.BATTLEFIELD, playerA, "Forest", 3);
//
addCard(Zone.COMMAND, playerA, "Aggressive Mammoth"); // {3}{G}{G}{G}
addCard(Zone.BATTLEFIELD, playerA, "Forest", 6);
// prepare yorvo
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Yorvo, Lord of Garenbrig");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
// cast commander
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aggressive Mammoth");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
checkPermanentCounters("must get +2", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Yorvo, Lord of Garenbrig", CounterType.P1P1, 4 + 2);
checkPermanentCount("must play commander", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aggressive Mammoth", 1);
setStrictChooseMode(true);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertAllCommandsUsed();
}
@Test
public void test_TriggerOnUroTitanOfNaturesWrath() {
// Yorvo, Lord of Garenbrig enters the battlefield with four +1/+1 counters on it.
// Whenever another green creature enters the battlefield under your control, put a +1/+1 counter on Yorvo. Then if that creature’s power is greater than Yorvo’s power, put another +1/+1 counter on Yorvo.
addCard(Zone.HAND, playerA, "Yorvo, Lord of Garenbrig", 5); // {G}{G}{G}
addCard(Zone.BATTLEFIELD, playerA, "Forest", 3);
//
// When Uro enters the battlefield, sacrifice it unless it escaped.
// Whenever Uro enters the battlefield or attacks, you gain 3 life and draw a card, then you may put a land card from your hand onto the battlefield.
// Escape-{G}{G}{U}{U}, Exile five other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
addCard(Zone.COMMAND, playerA, "Uro, Titan of Nature's Wrath"); // {1}{G}{U}
addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
addCard(Zone.BATTLEFIELD, playerA, "Island", 1);
// prepare yorvo
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Yorvo, Lord of Garenbrig");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
// cast commander
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Uro, Titan of Nature's Wrath");
// If the entering green creature dies before Yorvo’s triggered ability resolves, use its power as it last
// existed on the battlefield to determine whether Yorvo gets a second +1/+1 counter.
// (2019-10-04)
// order triggers to remove commander first
setChoice(playerA, "Whenever {this} enters the battlefield or attacks"); // draw trigger
setChoice(playerA, "Whenever another green creature enters the battlefield"); // get counters trigger
//setChoice(playerA, "When {this} enters the battlefield, sacrifice it"); // sacrifice trigger must be on top
setChoice(playerA, "Yes"); // return commander to command zone
setChoice(playerA, "No"); // do not put land to battlefield
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
checkPermanentCounters("must get +2", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Yorvo, Lord of Garenbrig", CounterType.P1P1, 4 + 2);
checkCommandCardCount("return commander", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Uro, Titan of Nature's Wrath", 1);
setStrictChooseMode(true);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertAllCommandsUsed();
}
}

13
Mage/src/main/java/mage/abilities/effects/Effects.java
View file

@ -71,7 +71,18 @@ public class Effects extends ArrayList<Effect> {
nextRule = Character.toUpperCase(nextRule.charAt(0)) + nextRule.substring(1); nextRule = Character.toUpperCase(nextRule.charAt(0)) + nextRule.substring(1);
} }
} }
sbText.append(endString).append(nextRule);
String currentRule = endString + nextRule;
// fix dot in the combined effect like IfDoCost
if (sbText.length() > 0 && currentRule.length() > 0) {
boolean prevTextEndsWithDot = sbText.charAt(sbText.length() - 1) == '.';
boolean currentTextStartsWithDot = currentRule.startsWith(",") || currentRule.startsWith(".");
if (prevTextEndsWithDot && currentTextStartsWithDot) {
sbText.delete(sbText.length() - 1, sbText.length());
}
}
sbText.append(currentRule);
} }
lastRule = nextRule; lastRule = nextRule;
} }

27
Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java
View file

@ -1,9 +1,5 @@
package mage.abilities.effects.common; package mage.abilities.effects.common;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.UUID;
import mage.MageObject; import mage.MageObject;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.Mode; import mage.abilities.Mode;
@ -16,8 +12,11 @@ import mage.target.Target;
import mage.target.targetpointer.FirstTargetPointer; import mage.target.targetpointer.FirstTargetPointer;
import mage.util.CardUtil; import mage.util.CardUtil;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.UUID;
/** /**
*
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class ExileTargetForSourceEffect extends OneShotEffect { public class ExileTargetForSourceEffect extends OneShotEffect {
@ -70,12 +69,24 @@ public class ExileTargetForSourceEffect extends OneShotEffect {
return staticText; return staticText;
} }
String amountText = "";
if (mode.getTargets().get(0).getMinNumberOfTargets() < mode.getTargets().get(0).getMaxNumberOfTargets()) {
amountText = "up to " + CardUtil.numberToText(mode.getTargets().get(0).getMaxNumberOfTargets()) + " ";
} else if (mode.getTargets().get(0).getMinNumberOfTargets() > 1) {
amountText = CardUtil.numberToText(mode.getTargets().get(0).getMinNumberOfTargets()) + " ";
}
String targetText = "";
if (mode.getTargets().get(0).getTargetName().contains("target ")) {
targetText = "";
} else {
targetText = "target ";
}
if (mode.getTargets().isEmpty()) { if (mode.getTargets().isEmpty()) {
return "exile it"; return "exile it";
} else if (mode.getTargets().get(0).getTargetName().startsWith("another")) {
return "exile " + mode.getTargets().get(0).getTargetName();
} else { } else {
return "exile target " + mode.getTargets().get(0).getTargetName(); return "exile " + amountText + targetText + mode.getTargets().get(0).getTargetName();
} }
} }
} }

41
Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java
View file

@ -1,4 +1,3 @@
package mage.abilities.effects.common; package mage.abilities.effects.common;
import mage.MageObject; import mage.MageObject;
@ -14,7 +13,6 @@ import mage.util.CardUtil;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
*
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class ReturnFromExileForSourceEffect extends OneShotEffect { public class ReturnFromExileForSourceEffect extends OneShotEffect {
@ -22,9 +20,10 @@ public class ReturnFromExileForSourceEffect extends OneShotEffect {
private Zone returnToZone; private Zone returnToZone;
private boolean tapped; private boolean tapped;
private boolean previousZone; private boolean previousZone;
private String returnName = "cards";
private String returnControlName;
/** /**
*
* @param zone Zone the card should return to * @param zone Zone the card should return to
*/ */
public ReturnFromExileForSourceEffect(Zone zone) { public ReturnFromExileForSourceEffect(Zone zone) {
@ -36,18 +35,28 @@ public class ReturnFromExileForSourceEffect extends OneShotEffect {
} }
/** /**
*
* @param zone * @param zone
* @param tapped * @param tapped
* @param previousZone if this is used from a dies leave battlefield or * @param previousZone if this is used from a dies leave battlefield or
* destroyed trigger, the exile zone is based on previous zone of the object * destroyed trigger, the exile zone is based on previous zone of the object
*/ */
public ReturnFromExileForSourceEffect(Zone zone, boolean tapped, boolean previousZone) { public ReturnFromExileForSourceEffect(Zone zone, boolean tapped, boolean previousZone) {
super(Outcome.PutCardInPlay); super(Outcome.PutCardInPlay);
this.returnToZone = zone; this.returnToZone = zone;
this.tapped = tapped; this.tapped = tapped;
this.previousZone = previousZone; this.previousZone = previousZone;
setText();
// different default name for zones
switch (zone) {
case BATTLEFIELD:
this.returnControlName = "its owner's";
break;
default:
this.returnControlName = "their owner's";
break;
}
updateText();
} }
public ReturnFromExileForSourceEffect(final ReturnFromExileForSourceEffect effect) { public ReturnFromExileForSourceEffect(final ReturnFromExileForSourceEffect effect) {
@ -55,6 +64,10 @@ public class ReturnFromExileForSourceEffect extends OneShotEffect {
this.returnToZone = effect.returnToZone; this.returnToZone = effect.returnToZone;
this.tapped = effect.tapped; this.tapped = effect.tapped;
this.previousZone = effect.previousZone; this.previousZone = effect.previousZone;
this.returnName = effect.returnName;
this.returnControlName = effect.returnControlName;
updateText();
} }
@Override @Override
@ -85,24 +98,30 @@ public class ReturnFromExileForSourceEffect extends OneShotEffect {
return false; return false;
} }
private void setText() { private void updateText() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("return the exiled cards "); sb.append("return the exiled " + this.returnName + " ");
switch (returnToZone) { switch (returnToZone) {
case BATTLEFIELD: case BATTLEFIELD:
sb.append("to the battlefield under its owner's control"); sb.append("to the battlefield under " + this.returnControlName + " control");
if (tapped) { if (tapped) {
sb.append(" tapped"); sb.append(" tapped");
} }
break; break;
case HAND: case HAND:
sb.append("to their owner's hand"); sb.append("to " + this.returnControlName + " hand");
break; break;
case GRAVEYARD: case GRAVEYARD:
sb.append("to their owner's graveyard"); sb.append("to " + this.returnControlName + " graveyard");
break; break;
} }
staticText = sb.toString(); staticText = sb.toString();
} }
public ReturnFromExileForSourceEffect withReturnName(String returnName, String returnControlName) {
this.returnName = returnName;
this.returnControlName = returnControlName;
updateText();
return this;
}
} }

30
Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java
View file

@ -1,7 +1,5 @@
package mage.abilities.effects.common; package mage.abilities.effects.common;
import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.cards.Card; import mage.cards.Card;
@ -15,14 +13,17 @@ import mage.game.Game;
import mage.players.Player; import mage.players.Player;
import mage.util.CardUtil; import mage.util.CardUtil;
import java.util.UUID;
/** /**
*
* @author LevelX2 * @author LevelX2
*/ */
public class ReturnToBattlefieldUnderOwnerControlTargetEffect extends OneShotEffect { public class ReturnToBattlefieldUnderOwnerControlTargetEffect extends OneShotEffect {
private boolean tapped; private boolean tapped;
protected boolean fromExileZone; protected boolean fromExileZone;
private String returnName = "that card";
private String returnUnderControlName = "its owner's";
public ReturnToBattlefieldUnderOwnerControlTargetEffect() { public ReturnToBattlefieldUnderOwnerControlTargetEffect() {
this(false); this(false);
@ -34,15 +35,26 @@ public class ReturnToBattlefieldUnderOwnerControlTargetEffect extends OneShotEff
public ReturnToBattlefieldUnderOwnerControlTargetEffect(boolean tapped, boolean fromExileZone) { public ReturnToBattlefieldUnderOwnerControlTargetEffect(boolean tapped, boolean fromExileZone) {
super(Outcome.Benefit); super(Outcome.Benefit);
staticText = "return that card to the battlefield under its owner's control";
this.tapped = tapped; this.tapped = tapped;
this.fromExileZone = fromExileZone; this.fromExileZone = fromExileZone;
updateText();
} }
public ReturnToBattlefieldUnderOwnerControlTargetEffect(final ReturnToBattlefieldUnderOwnerControlTargetEffect effect) { public ReturnToBattlefieldUnderOwnerControlTargetEffect(final ReturnToBattlefieldUnderOwnerControlTargetEffect effect) {
super(effect); super(effect);
this.tapped = effect.tapped; this.tapped = effect.tapped;
this.fromExileZone = effect.fromExileZone; this.fromExileZone = effect.fromExileZone;
this.returnName = effect.returnName;
this.returnUnderControlName = effect.returnUnderControlName;
updateText();
}
private void updateText() {
this.staticText = "return " + this.returnName
+ " to the battlefield" + (tapped ? " tapped" : "")
+ " under " + this.returnUnderControlName + " control";
} }
@Override @Override
@ -63,8 +75,7 @@ public class ReturnToBattlefieldUnderOwnerControlTargetEffect extends OneShotEff
for (UUID targetId : this.getTargetPointer().getTargets(game, source)) { for (UUID targetId : this.getTargetPointer().getTargets(game, source)) {
if (exileZone.contains(targetId)) { if (exileZone.contains(targetId)) {
cardsToBattlefield.add(targetId); cardsToBattlefield.add(targetId);
} } else {
else {
Card card = game.getCard(targetId); Card card = game.getCard(targetId);
if (card instanceof MeldCard) { if (card instanceof MeldCard) {
MeldCard meldCard = (MeldCard) card; MeldCard meldCard = (MeldCard) card;
@ -91,4 +102,11 @@ public class ReturnToBattlefieldUnderOwnerControlTargetEffect extends OneShotEff
} }
return false; return false;
} }
public ReturnToBattlefieldUnderOwnerControlTargetEffect withReturnNames(String returnName, String returnUnderControlName) {
this.returnName = returnName;
this.returnUnderControlName = returnUnderControlName;
updateText();
return this;
}
} }

13
Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java
View file

@ -23,6 +23,8 @@ public class ReturnToBattlefieldUnderYourControlTargetEffect extends OneShotEffe
private boolean fromExileZone; private boolean fromExileZone;
private boolean tapped; private boolean tapped;
private boolean attacking; private boolean attacking;
private String returnName = "that card";
private String returnUnderControlName = "your";
public ReturnToBattlefieldUnderYourControlTargetEffect() { public ReturnToBattlefieldUnderYourControlTargetEffect() {
this(false); this(false);
@ -50,12 +52,14 @@ public class ReturnToBattlefieldUnderYourControlTargetEffect extends OneShotEffe
this.fromExileZone = effect.fromExileZone; this.fromExileZone = effect.fromExileZone;
this.tapped = effect.tapped; this.tapped = effect.tapped;
this.attacking = effect.attacking; this.attacking = effect.attacking;
this.returnName = effect.returnName;
this.returnUnderControlName = effect.returnUnderControlName;
updateText(); updateText();
} }
private void updateText() { private void updateText() {
this.staticText = "return that card to the battlefield under your control" this.staticText = "return " + returnName + " to the battlefield under " + returnUnderControlName + " control"
+ (tapped ? " tapped" : "") + (tapped ? " tapped" : "")
+ (tapped && attacking ? " and" : "") + (tapped && attacking ? " and" : "")
+ (attacking ? " attacking" : ""); + (attacking ? " attacking" : "");
@ -111,4 +115,11 @@ public class ReturnToBattlefieldUnderYourControlTargetEffect extends OneShotEffe
} }
return false; return false;
} }
public ReturnToBattlefieldUnderYourControlTargetEffect withReturnNames(String returnName, String returnUnderControlName) {
this.returnName = returnName;
this.returnUnderControlName = returnUnderControlName;
updateText();
return this;
}
} }