Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

[Client]Improve load cards for graveyard

Browse source
This commit is contained in:
Plopman 2013-11-28 22:54:40 +01:00
parent 6ad969f735
commit eb0183b79d
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -1252,6 +1252,14 @@ public final class GamePanel extends javax.swing.JPanel {
return session; return session;
} }
public Map<String, Card> getLoadedCards() {
return loadedCards;
}
public void setLoadedCards(Map<String, Card> loadedCards) {
this.loadedCards = loadedCards;
}
public FeedbackPanel getFeedbackPanel() { public FeedbackPanel getFeedbackPanel() {
return feedbackPanel; return feedbackPanel;
} }

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

@ -361,6 +361,8 @@ public class PlayerPanelExt extends javax.swing.JPanel {
poison = new ImagePanel(resizedPoison, ImagePanel.ACTUAL); poison = new ImagePanel(resizedPoison, ImagePanel.ACTUAL);
poison.setToolTipText("Poison"); poison.setToolTipText("Poison");
poison.setOpaque(false); poison.setOpaque(false);
// Library
r = new Rectangle(19, 19); r = new Rectangle(19, 19);
libraryLabel.setToolTipText("Library"); libraryLabel.setToolTipText("Library");
Image imageLibrary = ImageHelper.getImageFromResources("/info/library.png"); Image imageLibrary = ImageHelper.getImageFromResources("/info/library.png");
@ -404,6 +406,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
zonesPanel.setSize(100, 20); zonesPanel.setSize(100, 20);
zonesPanel.setLayout(null); zonesPanel.setLayout(null);
//
image = ImageHelper.getImageFromResources("/info/command_zone.png"); image = ImageHelper.getImageFromResources("/info/command_zone.png");
r = new Rectangle(21, 21); r = new Rectangle(21, 21);
resized = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(image, BufferedImage.TYPE_INT_ARGB), r); resized = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(image, BufferedImage.TYPE_INT_ARGB), r);
@ -675,7 +678,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
graveyard = new ShowCardsDialog(); graveyard = new ShowCardsDialog();
}*/ }*/
//graveyard.loadCards(player.getName() + " graveyard", player.getGraveyard(), bigCard, Config.dimensions, gameId, false); //graveyard.loadCards(player.getName() + " graveyard", player.getGraveyard(), bigCard, Config.dimensions, gameId, false);
DialogManager.getManager(gameId).showGraveyardDialog(CardsViewUtil.convertSimple(player.getGraveyard()), bigCard, gameId); DialogManager.getManager(gameId).showGraveyardDialog(CardsViewUtil.convertSimple(player.getGraveyard(), MageFrame.getGame(gameId).getLoadedCards()), bigCard, gameId);
} }
private void btnCommandZoneActionPerformed(java.awt.event.ActionEvent evt) { private void btnCommandZoneActionPerformed(java.awt.event.ActionEvent evt) {