External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 03:22:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
BetaSteward 2011-08-25 07:47:08 -04:00
commit b09de12f23
30 changed files with 636 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -106,7 +106,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
private static Session session; private static Session session;
private ConnectDialog connectDialog; private ConnectDialog connectDialog;
private ErrorDialog errorDialog; //private ErrorDialog errorDialog;
private static CallbackClient callbackClient; private static CallbackClient callbackClient;
private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class); private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class);
private JLabel title; private JLabel title;
@ -189,8 +189,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
callbackClient = new CallbackClientImpl(this); callbackClient = new CallbackClientImpl(this);
connectDialog = new ConnectDialog(); connectDialog = new ConnectDialog();
desktopPane.add(connectDialog, JLayeredPane.POPUP_LAYER); desktopPane.add(connectDialog, JLayeredPane.POPUP_LAYER);
errorDialog = new ErrorDialog(); //errorDialog = new ErrorDialog();
desktopPane.add(errorDialog, JLayeredPane.POPUP_LAYER); //desktopPane.add(errorDialog, JLayeredPane.POPUP_LAYER);
ui.addComponent(MageComponents.DESKTOP_PANE, desktopPane); ui.addComponent(MageComponents.DESKTOP_PANE, desktopPane);
try { try {
@ -839,13 +839,13 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
public void showErrorDialog(final String title, final String message) { public void showErrorDialog(final String title, final String message) {
if (SwingUtilities.isEventDispatchThread()) { if (SwingUtilities.isEventDispatchThread()) {
errorDialog.showDialog(title, message); //errorDialog.showDialog(title, message);
} }
else { else {
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
@Override @Override
public void run() { public void run() {
errorDialog.showDialog(title, message); //errorDialog.showDialog(title, message);
} }
}); });
} }

108
Mage.Client/src/main/java/mage/client/table/TablesPanel.form
View file

@ -17,12 +17,12 @@
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="jPanel1" alignment="1" max="32767" attributes="0"/> <Component id="jPanel1" alignment="1" max="32767" attributes="0"/>
<Component id="jSplitPane1" alignment="0" pref="721" max="32767" attributes="0"/> <Component id="jSplitPane1" alignment="0" pref="848" max="32767" attributes="0"/>
<Group type="103" rootIndex="1" groupAlignment="0" attributes="0"> <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
<Component id="jPanel2" max="32767" attributes="0"/> <Component id="jPanel2" pref="779" max="32767" attributes="0"/>
<EmptySpace pref="47" max="32767" attributes="0"/> <EmptySpace pref="69" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</Group> </Group>
@ -32,12 +32,12 @@
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="jPanel1" min="-2" max="-2" attributes="0"/> <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/> <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
<Component id="jSplitPane1" pref="532" max="32767" attributes="0"/> <Component id="jSplitPane1" pref="501" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/> <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
<Component id="jPanel2" min="-2" pref="25" max="-2" attributes="0"/> <Component id="jPanel2" min="-2" pref="25" max="-2" attributes="0"/>
</Group> </Group>
<Group type="103" rootIndex="1" groupAlignment="0" attributes="0"> <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="607" max="32767" attributes="0"/> <EmptySpace min="0" pref="576" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -55,7 +55,9 @@
<Component id="btnNewTournament" min="-2" max="-2" attributes="0"/> <Component id="btnNewTournament" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="btnQuickStart" min="-2" max="-2" attributes="0"/> <Component id="btnQuickStart" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="414" max="32767" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="chkShowCompleted" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="434" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -67,6 +69,7 @@
<Component id="btnNewTable" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="btnNewTable" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="btnQuickStart" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="btnQuickStart" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="btnNewTournament" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="btnNewTournament" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="chkShowCompleted" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace pref="16" max="32767" attributes="0"/> <EmptySpace pref="16" max="32767" attributes="0"/>
</Group> </Group>
@ -98,6 +101,12 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnNewTournamentActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnNewTournamentActionPerformed"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JCheckBox" name="chkShowCompleted">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Show Completed"/>
</Properties>
</Component>
</SubComponents> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPanel" name="jPanel2"> <Container class="javax.swing.JPanel" name="jPanel2">
@ -122,7 +131,7 @@
<Component id="jLabel2" pref="449" max="32767" attributes="0"/> <Component id="jLabel2" pref="449" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/> <Component id="jButton1" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="22" max="-2" attributes="0"/> <EmptySpace min="-2" pref="440" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -196,28 +205,85 @@
</Constraint> </Constraint>
</Constraints> </Constraints>
</Component> </Component>
<Container class="javax.swing.JScrollPane" name="jScrollPane1"> <Container class="javax.swing.JPanel" name="jPanel3">
<AuxValues>
<AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
</AuxValues>
<Constraints> <Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription"> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
<JSplitPaneConstraints position="left"/> <JSplitPaneConstraints position="left"/>
</Constraint> </Constraint>
</Constraints> </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> <Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jSplitPane2" alignment="0" pref="743" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jSplitPane2" alignment="0" pref="499" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
<SubComponents> <SubComponents>
<Component class="javax.swing.JTable" name="tableTables"> <Container class="javax.swing.JSplitPane" name="jSplitPane2">
<Properties> <Properties>
<Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor"> <Property name="orientation" type="int" value="0"/>
<Connection code="this.tableModel" type="code"/>
</Property>
<Property name="tableHeader" type="javax.swing.table.JTableHeader" editor="org.netbeans.modules.form.editors2.JTableHeaderEditor">
<TableHeader reorderingAllowed="true" resizingAllowed="true"/>
</Property>
</Properties> </Properties>
</Component>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
<SubComponents>
<Container class="javax.swing.JScrollPane" name="jScrollPane1">
<AuxValues>
<AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
<JSplitPaneConstraints position="left"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
<Component class="javax.swing.JTable" name="tableTables">
<Properties>
<Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="this.tableModel" type="code"/>
</Property>
<Property name="tableHeader" type="javax.swing.table.JTableHeader" editor="org.netbeans.modules.form.editors2.JTableHeaderEditor">
<TableHeader reorderingAllowed="true" resizingAllowed="true"/>
</Property>
</Properties>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JScrollPane" name="jScrollPane2">
<AuxValues>
<AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
<JSplitPaneConstraints position="right"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
<Component class="javax.swing.JTable" name="tableCompleted">
<Properties>
<Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
<Table columnCount="4" rowCount="4">
<Column editable="true" title="Title 1" type="java.lang.Object"/>
<Column editable="true" title="Title 2" type="java.lang.Object"/>
<Column editable="true" title="Title 3" type="java.lang.Object"/>
<Column editable="true" title="Title 4" type="java.lang.Object"/>
</Table>
</Property>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>
</Container>
</SubComponents> </SubComponents>
</Container> </Container>
</SubComponents> </SubComponents>

168
Mage.Client/src/main/java/mage/client/table/TablesPanel.java
View file

@ -274,21 +274,26 @@ public class TablesPanel extends javax.swing.JPanel {
btnNewTable = new javax.swing.JButton(); btnNewTable = new javax.swing.JButton();
btnQuickStart = new javax.swing.JButton(); btnQuickStart = new javax.swing.JButton();
btnNewTournament = new javax.swing.JButton(); btnNewTournament = new javax.swing.JButton();
chkShowCompleted = new javax.swing.JCheckBox();
jPanel2 = new javax.swing.JPanel(); jPanel2 = new javax.swing.JPanel();
jLabel1 = new javax.swing.JLabel(); jLabel1 = new javax.swing.JLabel();
jLabel2 = new javax.swing.JLabel(); jLabel2 = new javax.swing.JLabel();
jButton1 = new javax.swing.JButton(); jButton1 = new javax.swing.JButton();
jSplitPane1 = new javax.swing.JSplitPane(); jSplitPane1 = new javax.swing.JSplitPane();
chatPanel = new mage.client.chat.ChatPanel(true); chatPanel = new mage.client.chat.ChatPanel(true);
jPanel3 = new javax.swing.JPanel();
jSplitPane2 = new javax.swing.JSplitPane();
jScrollPane1 = new javax.swing.JScrollPane(); jScrollPane1 = new javax.swing.JScrollPane();
tableTables = new javax.swing.JTable(); tableTables = new javax.swing.JTable();
jScrollPane2 = new javax.swing.JScrollPane();
tableCompleted = new javax.swing.JTable();
btnNewTable.setText("New Match"); btnNewTable.setText("New Match");
btnNewTable.addActionListener(new java.awt.event.ActionListener() { btnNewTable.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
btnNewTableActionPerformed(evt); btnNewTableActionPerformed(evt);
} }
}); });
btnQuickStart.setText("Quick Start"); btnQuickStart.setText("Quick Start");
btnQuickStart.addActionListener(new java.awt.event.ActionListener() { btnQuickStart.addActionListener(new java.awt.event.ActionListener() {
@ -299,34 +304,40 @@ public class TablesPanel extends javax.swing.JPanel {
btnNewTournament.setText("New Tournament"); btnNewTournament.setText("New Tournament");
btnNewTournament.addActionListener(new java.awt.event.ActionListener() { btnNewTournament.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
btnNewTournamentActionPerformed(evt); btnNewTournamentActionPerformed(evt);
} }
}); });
chkShowCompleted.setSelected(true);
chkShowCompleted.setText("Show Completed");
javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout); jPanel1.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup( jPanel1Layout.setHorizontalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addComponent(btnNewTable) .addComponent(btnNewTable)
.addGap(6, 6, 6) .addGap(6, 6, 6)
.addComponent(btnNewTournament) .addComponent(btnNewTournament)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btnQuickStart) .addComponent(btnQuickStart)
.addContainerGap(414, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
); .addComponent(chkShowCompleted)
.addContainerGap(434, Short.MAX_VALUE))
);
jPanel1Layout.setVerticalGroup( jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(btnNewTable) .addComponent(btnNewTable)
.addComponent(btnQuickStart) .addComponent(btnQuickStart)
.addComponent(btnNewTournament)) .addComponent(btnNewTournament)
.addContainerGap(16, Short.MAX_VALUE)) .addComponent(chkShowCompleted))
); .addContainerGap(16, Short.MAX_VALUE))
);
jPanel2.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED)); jPanel2.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED));
jPanel2.setPreferredSize(new java.awt.Dimension(664, 39)); jPanel2.setPreferredSize(new java.awt.Dimension(664, 39));
@ -342,33 +353,33 @@ public class TablesPanel extends javax.swing.JPanel {
jButton1.setMinimumSize(new java.awt.Dimension(55, 25)); jButton1.setMinimumSize(new java.awt.Dimension(55, 25));
jButton1.setPreferredSize(new java.awt.Dimension(55, 25)); jButton1.setPreferredSize(new java.awt.Dimension(55, 25));
jButton1.addActionListener(new java.awt.event.ActionListener() { jButton1.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton1ActionPerformed(evt); jButton1ActionPerformed(evt);
} }
}); });
javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
jPanel2.setLayout(jPanel2Layout); jPanel2.setLayout(jPanel2Layout);
jPanel2Layout.setHorizontalGroup( jPanel2Layout.setHorizontalGroup(
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup() .addGroup(jPanel2Layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addComponent(jLabel1) .addComponent(jLabel1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, 449, Short.MAX_VALUE) .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, 449, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(22, 22, 22)) .addGap(440, 440, 440))
); );
jPanel2Layout.setVerticalGroup( jPanel2Layout.setVerticalGroup(
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup() .addGroup(jPanel2Layout.createSequentialGroup()
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel2) .addComponent(jLabel2)
.addComponent(jLabel1)) .addComponent(jLabel1))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
); );
jSplitPane1.setDividerSize(3); jSplitPane1.setDividerSize(3);
jSplitPane1.setResizeWeight(1.0); jSplitPane1.setResizeWeight(1.0);
@ -376,33 +387,63 @@ public class TablesPanel extends javax.swing.JPanel {
chatPanel.setMinimumSize(new java.awt.Dimension(100, 43)); chatPanel.setMinimumSize(new java.awt.Dimension(100, 43));
jSplitPane1.setRightComponent(chatPanel); jSplitPane1.setRightComponent(chatPanel);
jSplitPane2.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
tableTables.setModel(this.tableModel); tableTables.setModel(this.tableModel);
jScrollPane1.setViewportView(tableTables); jScrollPane1.setViewportView(tableTables);
jSplitPane1.setLeftComponent(jScrollPane1); jSplitPane2.setLeftComponent(jScrollPane1);
tableCompleted.setModel(new javax.swing.table.DefaultTableModel(
new Object [][] {
{null, null, null, null},
{null, null, null, null},
{null, null, null, null},
{null, null, null, null}
},
new String [] {
"Title 1", "Title 2", "Title 3", "Title 4"
}
));
jScrollPane2.setViewportView(tableCompleted);
jSplitPane2.setRightComponent(jScrollPane2);
javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
jPanel3.setLayout(jPanel3Layout);
jPanel3Layout.setHorizontalGroup(
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jSplitPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 743, Short.MAX_VALUE)
);
jPanel3Layout.setVerticalGroup(
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jSplitPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 499, Short.MAX_VALUE)
);
jSplitPane1.setLeftComponent(jPanel3);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout); this.setLayout(layout);
layout.setHorizontalGroup( layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jPanel1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(jPanel1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 721, Short.MAX_VALUE) .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 848, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addContainerGap() .addGap(0, 0, 0)
.addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, 779, Short.MAX_VALUE)
.addContainerGap(47, Short.MAX_VALUE))) .addContainerGap(69, Short.MAX_VALUE)))
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, 0) .addGap(0, 0, 0)
.addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 532, Short.MAX_VALUE) .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 501, Short.MAX_VALUE)
.addGap(0, 0, 0) .addGap(0, 0, 0)
.addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 607, Short.MAX_VALUE)) .addGap(0, 576, Short.MAX_VALUE))
); );
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
@ -456,13 +497,18 @@ public class TablesPanel extends javax.swing.JPanel {
private javax.swing.JButton btnNewTournament; private javax.swing.JButton btnNewTournament;
private javax.swing.JButton btnQuickStart; private javax.swing.JButton btnQuickStart;
private mage.client.chat.ChatPanel chatPanel; private mage.client.chat.ChatPanel chatPanel;
private javax.swing.JCheckBox chkShowCompleted;
private javax.swing.JButton jButton1; private javax.swing.JButton jButton1;
private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel2;
private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel1;
private javax.swing.JPanel jPanel2; private javax.swing.JPanel jPanel2;
private javax.swing.JPanel jPanel3;
private javax.swing.JScrollPane jScrollPane1; private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JScrollPane jScrollPane2;
private javax.swing.JSplitPane jSplitPane1; private javax.swing.JSplitPane jSplitPane1;
private javax.swing.JSplitPane jSplitPane2;
private javax.swing.JTable tableCompleted;
private javax.swing.JTable tableTables; private javax.swing.JTable tableTables;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables

1
Mage.Common/src/mage/interfaces/MageServer.java
View file

@ -91,6 +91,7 @@ public interface MageServer {
public void sendPlayerBoolean(UUID gameId, String sessionId, Boolean data) throws MageException; public void sendPlayerBoolean(UUID gameId, String sessionId, Boolean data) throws MageException;
public void sendPlayerInteger(UUID gameId, String sessionId, Integer data) throws MageException; public void sendPlayerInteger(UUID gameId, String sessionId, Integer data) throws MageException;
public void concedeGame(UUID gameId, String sessionId) throws MageException; public void concedeGame(UUID gameId, String sessionId) throws MageException;
//tournament methods //tournament methods
public void startTournament(String sessionId, UUID roomId, UUID tableId) throws MageException; public void startTournament(String sessionId, UUID roomId, UUID tableId) throws MageException;

3
Mage.Common/src/mage/view/TournamentPlayerView.java
View file

@ -29,9 +29,6 @@
package mage.view; package mage.view;
import java.io.Serializable; import java.io.Serializable;
import mage.game.tournament.Round;
import mage.game.tournament.Tournament;
import mage.game.tournament.TournamentPairing;
import mage.game.tournament.TournamentPlayer; import mage.game.tournament.TournamentPlayer;
/** /**

2
Mage.Server/src/main/java/mage/server/TableController.java
View file

@ -369,7 +369,7 @@ public class TableController {
UUID choosingPlayerId = match.getChooser(); UUID choosingPlayerId = match.getChooser();
match.endGame(); match.endGame();
table.endGame(); table.endGame();
// GameManager.getInstance().saveGame(match.getGame().getId()); GameManager.getInstance().saveGame(match.getGame().getId());
GameManager.getInstance().removeGame(match.getGame().getId()); GameManager.getInstance().removeGame(match.getGame().getId());
try { try {
if (!match.isMatchOver()) { if (!match.isMatchOver()) {

68
Mage.Sets/src/mage/sets/championsofkamigawa/VineKami.java Normal file
View file

@ -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.championsofkamigawa;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect;
import mage.abilities.keyword.SoulshiftAbility;
import mage.cards.CardImpl;
/**
*
* @author North
*/
public class VineKami extends CardImpl<VineKami> {
public VineKami(UUID ownerId) {
super(ownerId, 249, "Vine Kami", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{6}{G}");
this.expansionSetCode = "CHK";
this.subtype.add("Spirit");
this.color.setGreen(true);
this.power = new MageInt(4);
this.toughness = new MageInt(4);
// Vine Kami can't be blocked except by two or more creatures.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2)));
this.addAbility(new SoulshiftAbility(6));
}
public VineKami(final VineKami card) {
super(card);
}
@Override
public VineKami copy() {
return new VineKami(this);
}
}

2
Mage.Sets/src/mage/sets/magic2010/HowlOfTheNightPack.java
View file

@ -45,7 +45,7 @@ public class HowlOfTheNightPack extends CardImpl<HowlOfTheNightPack> {
private final static FilterControlledPermanent filter = new FilterControlledPermanent("for each Forest you control"); private final static FilterControlledPermanent filter = new FilterControlledPermanent("for each Forest you control");
static { static {
filter.getName().add("Forest"); filter.getSubtype().add("Forest");
} }
public HowlOfTheNightPack(UUID ownerId) { public HowlOfTheNightPack(UUID ownerId) {

2
Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java
View file

@ -45,7 +45,7 @@ public class SeismicStrike extends CardImpl<SeismicStrike> {
private final static FilterControlledPermanent filter = new FilterControlledPermanent("Mountains you control"); private final static FilterControlledPermanent filter = new FilterControlledPermanent("Mountains you control");
static { static {
filter.getName().add("Mountain"); filter.getSubtype().add("Mountain");
} }
public SeismicStrike(UUID ownerId) { public SeismicStrike(UUID ownerId) {

2
Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java
View file

@ -46,7 +46,7 @@ public class TendrilsOfCorruption extends CardImpl<TendrilsOfCorruption> {
private final static FilterControlledPermanent filter = new FilterControlledPermanent("Swamp you control"); private final static FilterControlledPermanent filter = new FilterControlledPermanent("Swamp you control");
static { static {
filter.getName().add("Swamp"); filter.getSubtype().add("Swamp");
} }
public TendrilsOfCorruption(UUID ownerId) { public TendrilsOfCorruption(UUID ownerId) {

1
Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java
View file

@ -96,6 +96,7 @@ class BloodlordOfVaasgothEffect extends ContinuousEffectImpl {
public BloodlordOfVaasgothEffect(final BloodlordOfVaasgothEffect effect) { public BloodlordOfVaasgothEffect(final BloodlordOfVaasgothEffect effect) {
super(effect); super(effect);
this.ability = effect.ability.copy();
} }
@Override @Override

13
Mage.Sets/src/mage/sets/magic2012/DungroveElder.java
View file

@ -30,13 +30,14 @@ package mage.sets.magic2012;
import java.util.UUID; import java.util.UUID;
import mage.Constants;
import mage.Constants.CardType; import mage.Constants.CardType;
import mage.Constants.Duration;
import mage.Constants.Rarity; import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect;
import mage.abilities.keyword.HexproofAbility; import mage.abilities.keyword.HexproofAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterControlledPermanent;
@ -47,21 +48,23 @@ import mage.filter.common.FilterControlledPermanent;
*/ */
public class DungroveElder extends CardImpl<DungroveElder> { public class DungroveElder extends CardImpl<DungroveElder> {
final static FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests"); final static FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control");
static { static {
filterLands.getName().add("Forest"); filterLands.getSubtype().add("Forest");
} }
public DungroveElder (UUID ownerId) { public DungroveElder (UUID ownerId) {
super(ownerId, 171, "Dungrove Elder", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}"); super(ownerId, 171, "Dungrove Elder", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}");
this.expansionSetCode = "M12"; this.expansionSetCode = "M12";
this.subtype.add("Treefolk"); this.subtype.add("Treefolk");
this.color.setGreen(true); this.color.setGreen(true);
this.power = new MageInt(0); this.power = new MageInt(0);
this.toughness = new MageInt(0); this.toughness = new MageInt(0);
this.addAbility(new HexproofAbility()); this.addAbility(new HexproofAbility());
this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filterLands), new PermanentsOnBattlefieldCount(filterLands), Constants.Duration.WhileOnBattlefield))); this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filterLands), Duration.EndOfGame)));
} }
public DungroveElder (final DungroveElder card) { public DungroveElder (final DungroveElder card) {

90
Mage.Sets/src/mage/sets/magic2012/StormbloodBerserker.java
View file

@ -27,88 +27,42 @@
*/ */
package mage.sets.magic2012; package mage.sets.magic2012;
import mage.Constants; import java.util.UUID;
import mage.Constants.CardType; import mage.Constants.CardType;
import mage.Constants.Rarity; import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect;
import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.BloodthirstAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.game.Game;
import mage.game.permanent.Permanent;
import java.util.UUID;
/** /**
* @author nantuko * @author nantuko
*/ */
public class StormbloodBerserker extends CardImpl<StormbloodBerserker> { public class StormbloodBerserker extends CardImpl<StormbloodBerserker> {
public StormbloodBerserker(UUID ownerId) { public StormbloodBerserker(UUID ownerId) {
super(ownerId, 156, "Stormblood Berserker", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{R}"); super(ownerId, 156, "Stormblood Berserker", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{R}");
this.expansionSetCode = "M12"; this.expansionSetCode = "M12";
this.subtype.add("Human"); this.subtype.add("Human");
this.subtype.add("Berserker"); this.subtype.add("Berserker");
this.color.setRed(true); this.color.setRed(true);
this.power = new MageInt(1); this.power = new MageInt(1);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
this.addAbility(new BloodthirstAbility(2)); this.addAbility(new BloodthirstAbility(2));
// Stormblood Berserker can't be blocked except by two or more creatures. // Stormblood Berserker can't be blocked except by two or more creatures.
this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new StormbloodBerserkerEffect())); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2)));
} }
public StormbloodBerserker(final StormbloodBerserker card) { public StormbloodBerserker(final StormbloodBerserker card) {
super(card); super(card);
} }
@Override
public StormbloodBerserker copy() {
return new StormbloodBerserker(this);
}
}
class StormbloodBerserkerEffect extends ContinuousEffectImpl<StormbloodBerserkerEffect> {
public StormbloodBerserkerEffect() {
super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit);
staticText = "{this} can't be blocked except by two or more creatures";
}
public StormbloodBerserkerEffect(final StormbloodBerserkerEffect effect) {
super(effect);
}
@Override
public StormbloodBerserkerEffect copy() {
return new StormbloodBerserkerEffect(this);
}
@Override
public boolean apply(Constants.Layer layer, Constants.SubLayer sublayer, Ability source, Game game) {
Permanent perm = game.getPermanent(source.getSourceId());
if (perm != null) {
switch (layer) {
case RulesEffects:
perm.setMinBlockedBy(2);
break;
}
return true;
}
return false;
}
@Override
public boolean apply(Game game, Ability source) {
return false;
}
@Override
public boolean hasLayer(Constants.Layer layer) {
return layer == Constants.Layer.RulesEffects;
}
@Override
public StormbloodBerserker copy() {
return new StormbloodBerserker(this);
}
} }

1
Mage.Sets/src/mage/sets/morningtide/RhysTheExiled.java
View file

@ -29,7 +29,6 @@ package mage.sets.morningtide;
import java.util.UUID; import java.util.UUID;
import com.sun.org.apache.bcel.internal.generic.NEW;
import mage.Constants; import mage.Constants;
import mage.Constants.CardType; import mage.Constants.CardType;
import mage.Constants.Rarity; import mage.Constants.Rarity;

2
Mage.Sets/src/mage/sets/newphyrexia/Lashwrithe.java
View file

@ -51,7 +51,7 @@ public class Lashwrithe extends CardImpl<Lashwrithe> {
private static final FilterLandPermanent filter = new FilterLandPermanent("Swamp you control"); private static final FilterLandPermanent filter = new FilterLandPermanent("Swamp you control");
static { static {
filter.getName().add("Swamp"); filter.getSubtype().add("Swamp");
filter.setTargetController(TargetController.YOU); filter.setTargetController(TargetController.YOU);
} }

53
Mage.Sets/src/mage/sets/riseoftheeldrazi/PathrazerOfUlamog.java
View file

@ -29,20 +29,13 @@ package mage.sets.riseoftheeldrazi;
import java.util.UUID; import java.util.UUID;
import mage.Constants.CardType; import mage.Constants.CardType;
import mage.Constants.Duration;
import mage.Constants.Layer;
import mage.Constants.Outcome;
import mage.Constants.Rarity; import mage.Constants.Rarity;
import mage.Constants.SubLayer;
import mage.Constants.Zone; import mage.Constants.Zone;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect;
import mage.abilities.keyword.AnnihilatorAbility; import mage.abilities.keyword.AnnihilatorAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.game.Game;
import mage.game.permanent.Permanent;
/** /**
* *
@ -59,7 +52,8 @@ public class PathrazerOfUlamog extends CardImpl<PathrazerOfUlamog> {
this.toughness = new MageInt(9); this.toughness = new MageInt(9);
this.addAbility(new AnnihilatorAbility(3)); this.addAbility(new AnnihilatorAbility(3));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PathrazerOfUlamogEffect())); // Pathrazer of Ulamog can't be blocked except by three or more creatures.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(3)));
} }
public PathrazerOfUlamog(final PathrazerOfUlamog card) { public PathrazerOfUlamog(final PathrazerOfUlamog card) {
@ -71,44 +65,3 @@ public class PathrazerOfUlamog extends CardImpl<PathrazerOfUlamog> {
return new PathrazerOfUlamog(this); return new PathrazerOfUlamog(this);
} }
} }
class PathrazerOfUlamogEffect extends ContinuousEffectImpl<PathrazerOfUlamogEffect> {
public PathrazerOfUlamogEffect() {
super(Duration.WhileOnBattlefield, Outcome.Benefit);
staticText = "{this} can't be blocked except by three or more creatures";
}
public PathrazerOfUlamogEffect(final PathrazerOfUlamogEffect effect) {
super(effect);
}
@Override
public PathrazerOfUlamogEffect copy() {
return new PathrazerOfUlamogEffect(this);
}
@Override
public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
Permanent perm = game.getPermanent(source.getSourceId());
if (perm != null) {
switch (layer) {
case RulesEffects:
perm.setMinBlockedBy(3);
break;
}
return true;
}
return false;
}
@Override
public boolean apply(Game game, Ability source) {
return false;
}
@Override
public boolean hasLayer(Layer layer) {
return layer == Layer.RulesEffects;
}
}

79
Mage.Sets/src/mage/sets/shadowmoor/HordeOfBoggarts.java Normal file
View file

@ -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.shadowmoor;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Duration;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect;
import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect;
import mage.cards.CardImpl;
import mage.filter.common.FilterControlledPermanent;
/**
*
* @author North
*/
public class HordeOfBoggarts extends CardImpl<HordeOfBoggarts> {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("red permanents you control");
static {
filter.getColor().setRed(true);
filter.setUseColor(true);
}
public HordeOfBoggarts(UUID ownerId) {
super(ownerId, 94, "Horde of Boggarts", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}");
this.expansionSetCode = "SHM";
this.subtype.add("Goblin");
this.color.setRed(true);
this.power = new MageInt(0);
this.toughness = new MageInt(0);
// Horde of Boggarts's power and toughness are each equal to the number of red permanents you control.
this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame)));
// Horde of Boggarts can't be blocked except by two or more creatures.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2)));
}
public HordeOfBoggarts(final HordeOfBoggarts card) {
super(card);
}
@Override
public HordeOfBoggarts copy() {
return new HordeOfBoggarts(this);
}
}

70
Mage.Sets/src/mage/sets/shardsofalara/KederektCreeper.java Normal file
View file

@ -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.shardsofalara;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect;
import mage.abilities.keyword.DeathtouchAbility;
import mage.cards.CardImpl;
/**
*
* @author North
*/
public class KederektCreeper extends CardImpl<KederektCreeper> {
public KederektCreeper(UUID ownerId) {
super(ownerId, 176, "Kederekt Creeper", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}{B}{R}");
this.expansionSetCode = "ALA";
this.subtype.add("Horror");
this.color.setRed(true);
this.color.setBlue(true);
this.color.setBlack(true);
this.power = new MageInt(2);
this.toughness = new MageInt(3);
this.addAbility(DeathtouchAbility.getInstance());
// Kederekt Creeper can't be blocked except by two or more creatures.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2)));
}
public KederektCreeper(final KederektCreeper card) {
super(card);
}
@Override
public KederektCreeper copy() {
return new KederektCreeper(this);
}
}

4
Mage.Sets/src/mage/sets/tenth/BlanchwoodArmor.java
View file

@ -52,7 +52,7 @@ public class BlanchwoodArmor extends CardImpl<BlanchwoodArmor> {
private final static FilterControlledPermanent filter = new FilterControlledPermanent("Forest you control"); private final static FilterControlledPermanent filter = new FilterControlledPermanent("Forest you control");
static { static {
filter.getName().add("Forest"); filter.getSubtype().add("Forest");
} }
public BlanchwoodArmor(UUID ownerId) { public BlanchwoodArmor(UUID ownerId) {
@ -66,8 +66,6 @@ public class BlanchwoodArmor extends CardImpl<BlanchwoodArmor> {
Ability ability = new EnchantAbility(auraTarget.getTargetName()); Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability); this.addAbility(ability);
this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Constants.Duration.WhileOnBattlefield))); this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Constants.Duration.WhileOnBattlefield)));
// Enchant creature
// Enchanted creature gets +1/+1 for each Forest you control.
} }
public BlanchwoodArmor(final BlanchwoodArmor card) { public BlanchwoodArmor(final BlanchwoodArmor card) {

2
Mage.Sets/src/mage/sets/tenth/Mortivore.java
View file

@ -44,7 +44,7 @@ import mage.filter.common.FilterCreatureCard;
/** /**
* *
* @author anonymous * @author Loki
*/ */
public class Mortivore extends CardImpl<Mortivore> { public class Mortivore extends CardImpl<Mortivore> {

2
Mage.Sets/src/mage/sets/tenth/Nightmare.java
View file

@ -49,7 +49,7 @@ public class Nightmare extends CardImpl<Nightmare> {
private final static FilterControlledPermanent filter = new FilterControlledPermanent("Swamps you control"); private final static FilterControlledPermanent filter = new FilterControlledPermanent("Swamps you control");
static { static {
filter.getName().add("Swamp"); filter.getSubtype().add("Swamp");
} }
public Nightmare(UUID ownerId) { public Nightmare(UUID ownerId) {

2
Mage.Sets/src/mage/sets/tenth/SpittingEarth.java
View file

@ -45,7 +45,7 @@ public class SpittingEarth extends CardImpl<SpittingEarth> {
private final static FilterControlledPermanent filter = new FilterControlledPermanent("Mountain you control"); private final static FilterControlledPermanent filter = new FilterControlledPermanent("Mountain you control");
static { static {
filter.getName().add("Mountain"); filter.getSubtype().add("Mountain");
} }
public SpittingEarth(UUID ownerId) { public SpittingEarth(UUID ownerId) {

66
Mage.Sets/src/mage/sets/tenth/ViashinoRunner.java Normal file
View file

@ -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.tenth;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.continious.CantBeBlockedByOneEffect;
import mage.cards.CardImpl;
/**
*
* @author North
*/
public class ViashinoRunner extends CardImpl<ViashinoRunner> {
public ViashinoRunner(UUID ownerId) {
super(ownerId, 245, "Viashino Runner", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}");
this.expansionSetCode = "10E";
this.subtype.add("Viashino");
this.color.setRed(true);
this.power = new MageInt(3);
this.toughness = new MageInt(2);
// Viashino Runner can't be blocked except by two or more creatures.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2)));
}
public ViashinoRunner(final ViashinoRunner card) {
super(card);
}
@Override
public ViashinoRunner copy() {
return new ViashinoRunner(this);
}
}

2
Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java
View file

@ -47,7 +47,7 @@ public class PrimalBellow extends CardImpl<PrimalBellow> {
private static final FilterLandPermanent filter = new FilterLandPermanent("Forest you control"); private static final FilterLandPermanent filter = new FilterLandPermanent("Forest you control");
static { static {
filter.getName().add("Forest"); filter.getSubtype().add("Forest");
filter.setTargetController(TargetController.YOU); filter.setTargetController(TargetController.YOU);
} }

2
Mage.Sets/src/mage/sets/zendikar/TimbermawLarva.java
View file

@ -48,7 +48,7 @@ public class TimbermawLarva extends CardImpl<TimbermawLarva> {
private static final FilterLandPermanent filter = new FilterLandPermanent("Forest you control"); private static final FilterLandPermanent filter = new FilterLandPermanent("Forest you control");
static { static {
filter.getName().add("Forest"); filter.getSubtype().add("Forest");
filter.setTargetController(TargetController.YOU); filter.setTargetController(TargetController.YOU);
} }

3
Mage/src/mage/abilities/Mode.java
View file

@ -27,6 +27,7 @@
*/ */
package mage.abilities; package mage.abilities;
import java.io.Serializable;
import java.util.UUID; import java.util.UUID;
import mage.abilities.effects.Effects; import mage.abilities.effects.Effects;
import mage.choices.Choices; import mage.choices.Choices;
@ -36,7 +37,7 @@ import mage.target.Targets;
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class Mode { public class Mode implements Serializable {
protected UUID id; protected UUID id;
protected Targets targets; protected Targets targets;

1
Mage/src/mage/abilities/effects/common/DamageTargetEffect.java
View file

@ -98,6 +98,7 @@ public class DamageTargetEffect extends OneShotEffect<DamageTargetEffect> {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
// game.getPermanent(source.getControllerId()).getName();
Permanent permanent = game.getPermanent(targetPointer.getFirst(source)); Permanent permanent = game.getPermanent(targetPointer.getFirst(source));
if (permanent != null) { if (permanent != null) {
permanent.damage(amount.calculate(game, source), source.getSourceId(), game, preventable, false); permanent.damage(amount.calculate(game, source), source.getSourceId(), game, preventable, false);

86
Mage/src/mage/abilities/effects/common/continious/CantBeBlockedByOneEffect.java Normal file
View file

@ -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.abilities.effects.common.continious;
import mage.Constants.Duration;
import mage.Constants.Layer;
import mage.Constants.Outcome;
import mage.Constants.SubLayer;
import mage.abilities.Ability;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.game.Game;
import mage.game.permanent.Permanent;
/**
*
* @author North
*/
public class CantBeBlockedByOneEffect extends ContinuousEffectImpl<CantBeBlockedByOneEffect> {
protected int amount;
public CantBeBlockedByOneEffect(int amount) {
super(Duration.WhileOnBattlefield, Outcome.Benefit);
this.amount = amount;
staticText = "{this} can't be blocked except by " + amount + " or more creatures";
}
public CantBeBlockedByOneEffect(final CantBeBlockedByOneEffect effect) {
super(effect);
this.amount = effect.amount;
}
@Override
public CantBeBlockedByOneEffect copy() {
return new CantBeBlockedByOneEffect(this);
}
@Override
public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
Permanent perm = game.getPermanent(source.getSourceId());
if (perm != null) {
switch (layer) {
case RulesEffects:
perm.setMinBlockedBy(amount);
break;
}
return true;
}
return false;
}
@Override
public boolean apply(Game game, Ability source) {
return false;
}
@Override
public boolean hasLayer(Layer layer) {
return layer == Layer.RulesEffects;
}
}

4
Mage/src/mage/game/Game.java
View file

@ -164,6 +164,10 @@ public interface Game extends MageItem, Serializable {
// game options // game options
public void setGameOptions(GameOptions options); public void setGameOptions(GameOptions options);
// game times
public Date getStartTime();
public Date getEndTime();
// game cheats (for tests only) // game cheats (for tests only)
public void cheat(UUID ownerId, Map<Zone, String> commands); public void cheat(UUID ownerId, Map<Zone, String> commands);
public void cheat(UUID ownerId, List<Card> library, List<Card> hand, List<PermanentCard> battlefield, List<Card> graveyard); public void cheat(UUID ownerId, List<Card> library, List<Card> hand, List<PermanentCard> battlefield, List<Card> graveyard);

19
Mage/src/mage/game/GameImpl.java
View file

@ -87,6 +87,9 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
protected Map<UUID, Card> gameCards = new HashMap<UUID, Card>(); protected Map<UUID, Card> gameCards = new HashMap<UUID, Card>();
protected Map<UUID, Card> lki = new HashMap<UUID, Card>(); protected Map<UUID, Card> lki = new HashMap<UUID, Card>();
protected GameState state; protected GameState state;
protected Date startTime;
protected Date endTime;
protected UUID startingPlayerId; protected UUID startingPlayerId;
protected UUID winnerId; protected UUID winnerId;
@ -279,6 +282,7 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
} }
if (remainingPlayers <= 1 || numLosers >= state.getPlayers().size() - 1) { if (remainingPlayers <= 1 || numLosers >= state.getPlayers().size() - 1) {
state.endGame(); state.endGame();
endTime = new Date();
return true; return true;
} }
return false; return false;
@ -338,6 +342,7 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
@Override @Override
public void start(UUID choosingPlayerId, GameOptions options) { public void start(UUID choosingPlayerId, GameOptions options) {
startTime = new Date();
init(choosingPlayerId, options.testMode); init(choosingPlayerId, options.testMode);
PlayerList players = state.getPlayerList(startingPlayerId); PlayerList players = state.getPlayerList(startingPlayerId);
Player player = getPlayer(players.get()); Player player = getPlayer(players.get());
@ -1167,10 +1172,16 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
} }
} }
public void clearGraveyard(UUID playerId) { @Override
public Date getStartTime() {
} return startTime;
}
@Override
public Date getEndTime() {
return endTime;
}
@Override @Override
public void setGameOptions(GameOptions options) { public void setGameOptions(GameOptions options) {
this.gameOptions = options; this.gameOptions = options;