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

deck format change

Browse source
This commit is contained in:
BetaSteward 2010-12-15 23:50:52 -05:00
parent 3cb1c2bf15
commit ba8532ea86
18 changed files with 127 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java
View file

@ -86,7 +86,7 @@ public class DeckGenerator {
File tmp = File.createTempFile("tempDeck" + UUID.randomUUID().toString(), ".dck");
tmp.createNewFile();
deck.setName("Generated-Deck-" + UUID.randomUUID());
deck.getDeckCardLists().save(tmp.getAbsolutePath());
Sets.saveDeck(tmp.getAbsolutePath(), deck.getDeckCardLists());
//JOptionPane.showMessageDialog(null, "Deck has been generated.");
return tmp.getAbsolutePath();
} catch (Exception e) {

5
Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
View file

@ -57,6 +57,7 @@ import java.lang.reflect.Constructor;
import java.util.UUID;
import java.util.logging.Level;
import java.util.logging.Logger;
import mage.sets.Sets;
/**
*
@ -300,7 +301,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
File file = fcSelectDeck.getSelectedFile();
try {
setCursor(new Cursor(Cursor.WAIT_CURSOR));
deck = Deck.load(DeckCardLists.load(file.getPath()), true);
deck = Deck.load(Sets.loadDeck(file.getPath()), true);
} catch (GameException ex) {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), ex.getMessage(), "Error loading deck", JOptionPane.ERROR_MESSAGE);
} catch (Exception ex) {
@ -330,7 +331,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
if (!fileName.endsWith(".dck"))
fileName += ".dck";
setCursor(new Cursor(Cursor.WAIT_CURSOR));
deck.getDeckCardLists().save(fileName);
Sets.saveDeck(fileName, deck.getDeckCardLists());
} catch (Exception ex) {
Logger.getLogger(DeckEditorPanel.class.getName()).log(Level.SEVERE, null, ex);
}

3
Mage.Client/src/main/java/mage/client/dialog/JoinTableDialog.java
View file

@ -43,6 +43,7 @@ import javax.swing.JOptionPane;
import mage.cards.decks.DeckCardLists;
import mage.client.remote.Session;
import mage.client.util.PhaseManager;
import mage.sets.Sets;
import mage.util.Logging;
/**
@ -138,7 +139,7 @@ public class JoinTableDialog extends MageDialog {
Session session = MageFrame.getSession();
try {
PhaseManager.getInstance().setName(this.newPlayerPanel.getPlayerName());
joined = session.joinTable(roomId, tableId, this.newPlayerPanel.getPlayerName(), DeckCardLists.load(this.newPlayerPanel.getDeckFile()));
joined = session.joinTable(roomId, tableId, this.newPlayerPanel.getPlayerName(), Sets.loadDeck(this.newPlayerPanel.getDeckFile()));
} catch (Exception ex) {
handleError(ex);
}

3
Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java
View file

@ -53,6 +53,7 @@ import mage.client.remote.Session;
import mage.client.table.TablePlayerPanel;
import mage.client.util.Event;
import mage.client.util.Listener;
import mage.sets.Sets;
import mage.util.Logging;
import mage.view.GameTypeView;
import mage.view.TableView;
@ -289,7 +290,7 @@ public class NewTableDialog extends MageDialog {
(MultiplayerAttackOption)this.cbAttackOption.getSelectedItem(),
(RangeOfInfluence)this.cbRange.getSelectedItem());
try {
if (session.joinTable(roomId, table.getTableId(), this.player1Panel.getPlayerName(), DeckCardLists.load(this.player1Panel.getDeckFile()))) {
if (session.joinTable(roomId, table.getTableId(), this.player1Panel.getPlayerName(), Sets.loadDeck(this.player1Panel.getDeckFile()))) {
for (TablePlayerPanel player: players) {
if (!player.getPlayerType().equals("Human")) {
if (!player.joinTable(roomId, table.getTableId())) {

5
Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
View file

@ -43,6 +43,7 @@ import java.util.logging.Logger;
import mage.cards.decks.DeckCardLists;
import mage.client.MageFrame;
import mage.client.cards.BigCard;
import mage.sets.Sets;
import mage.view.PlayerView;
/**
@ -156,13 +157,11 @@ public class PlayAreaPanel extends javax.swing.JPanel {
private void btnCheatActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCheatActionPerformed
try {
MageFrame.getSession().cheat(gameId, playerId, DeckCardLists.load("cheat.dck"));
MageFrame.getSession().cheat(gameId, playerId, Sets.loadDeck("cheat.dck"));
} catch (FileNotFoundException ex) {
Logger.getLogger(PlayAreaPanel.class.getName()).log(Level.SEVERE, null, ex);
} catch (IOException ex) {
Logger.getLogger(PlayAreaPanel.class.getName()).log(Level.SEVERE, null, ex);
} catch (ClassNotFoundException ex) {
Logger.getLogger(PlayAreaPanel.class.getName()).log(Level.SEVERE, null, ex);
}
}//GEN-LAST:event_btnCheatActionPerformed

3
Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.java
View file

@ -47,6 +47,7 @@ import mage.client.remote.Session;
import mage.client.util.Config;
import mage.client.util.Event;
import mage.client.util.Listener;
import mage.sets.Sets;
import mage.util.Logging;
/**
@ -81,7 +82,7 @@ public class TablePlayerPanel extends javax.swing.JPanel {
public boolean joinTable(UUID roomId, UUID tableId) throws FileNotFoundException, IOException, ClassNotFoundException {
if (!this.cbPlayerType.getSelectedItem().equals("Human")) {
return session.joinTable(roomId, tableId, this.newPlayerPanel.getPlayerName(), DeckCardLists.load(this.newPlayerPanel.getDeckFile()));
return session.joinTable(roomId, tableId, this.newPlayerPanel.getPlayerName(), Sets.loadDeck(this.newPlayerPanel.getDeckFile()));
}
return true;
}

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

@ -63,6 +63,7 @@ import mage.client.dialog.TableWaitingDialog;
import mage.client.remote.MageRemoteException;
import mage.client.remote.Session;
import mage.client.util.ButtonColumn;
import mage.sets.Sets;
import mage.util.Logging;
import mage.view.TableView;
@ -293,13 +294,13 @@ public class TablesPanel extends javax.swing.JPanel implements Observer {
roomId,
table.getTableId(),
"Human",
DeckCardLists.load("test.dck")
Sets.loadDeck("test.dck")
);
session.joinTable(
roomId,
table.getTableId(),
"Computer",
DeckCardLists.load("test.dck")
Sets.loadDeck("test.dck")
);
hideTables();
session.startGame(roomId, table.getTableId());