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

Merge pull request #2375 from spjspj/master

Browse source 
spjspj - experience.png resource (candidate for a more gooderer one..)
This commit is contained in:
spjspj 2016-09-26 02:59:32 +10:00 committed by GitHub
commit ffa7d38aed
3 changed files with 50 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,7 @@ public class PlayAreaPanel extends javax.swing.JPanel {
private JCheckBoxMenuItem allowViewHandCardsMenuItem;
private JCheckBoxMenuItem holdPriorityMenuItem;
public static final int PANEL_HEIGHT = 242;
public static final int PANEL_HEIGHT = 262;
public static final int PANEL_HEIGHT_SMALL = 190;
/**

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

@ -106,8 +106,8 @@ public class PlayerPanelExt extends javax.swing.JPanel {
private static final String DEFAULT_AVATAR_PATH = "/avatars/" + DEFAULT_AVATAR_ID + ".jpg";
private static final int PANEL_WIDTH = 94;
private static final int PANEL_HEIGHT = 242;
private static final int PANEL_HEIGHT_SMALL = 212;
private static final int PANEL_HEIGHT = 262;
private static final int PANEL_HEIGHT_SMALL = 232;
private static final int MANA_LABEL_SIZE_HORIZONTAL = 20;
private static final Border GREEN_BORDER = new LineBorder(Color.green, 3);
@ -193,6 +193,8 @@ public class PlayerPanelExt extends javax.swing.JPanel {
}
lifeLabel.setText(Integer.toString(playerLife));
poisonLabel.setText(Integer.toString(player.getCounters().getCount(CounterType.POISON)));
energyLabel.setText(Integer.toString(player.getCounters().getCount(CounterType.ENERGY)));
experienceLabel.setText(Integer.toString(player.getCounters().getCount(CounterType.EXPERIENCE)));
handLabel.setText(Integer.toString(player.getHandCount()));
int libraryCards = player.getLibraryCount();
if (libraryCards > 99) {
@ -380,6 +382,8 @@ public class PlayerPanelExt extends javax.swing.JPanel {
lifeLabel = new JLabel();
handLabel = new JLabel();
poisonLabel = new JLabel();
energyLabel = new JLabel();
experienceLabel = new JLabel();
graveLabel = new JLabel();
libraryLabel = new JLabel();
setOpaque(false);
@ -501,8 +505,8 @@ public class PlayerPanelExt extends javax.swing.JPanel {
});
zonesPanel = new JPanel();
zonesPanel.setPreferredSize(new Dimension(100, 20));
zonesPanel.setSize(100, 20);
zonesPanel.setPreferredSize(new Dimension(100, 60));
zonesPanel.setSize(100, 60);
zonesPanel.setLayout(null);
zonesPanel.setOpaque(false);
@ -524,6 +528,41 @@ public class PlayerPanelExt extends javax.swing.JPanel {
cheat.setBounds(28, 0, 25, 21);
zonesPanel.add(cheat);
energyExperiencePanel = new JPanel();
energyExperiencePanel.setPreferredSize(new Dimension(100, 20));
energyExperiencePanel.setSize(100, 20);
energyExperiencePanel.setLayout(null);
energyExperiencePanel.setOpaque(false);
// Energy count
energyLabel.setText("0");
r = new Rectangle(18, 18);
energyLabel.setToolTipText("Energy");
Image imageEnergy = ImageHelper.getImageFromResources("/info/energy.png");
BufferedImage resizedEnergy = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(imageEnergy, BufferedImage.TYPE_INT_ARGB), r);
energy = new ImagePanel(resizedEnergy, ImagePanel.ACTUAL);
energy.setToolTipText("Energy");
energy.setOpaque(false);
// Experience count
experienceLabel.setText("0");
r = new Rectangle(18, 18);
experienceLabel.setToolTipText("Experience");
Image imageExperience = ImageHelper.getImageFromResources("/info/experience.png");
BufferedImage resizedExperience = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(imageExperience, BufferedImage.TYPE_INT_ARGB), r);
experience = new ImagePanel(resizedExperience, ImagePanel.ACTUAL);
experience.setToolTipText("Experience");
experience.setOpaque(false);
energy.setBounds(5, 22, 21, 21);
zonesPanel.add(energy);
energyLabel.setBounds(27, 22, 21, 21);
zonesPanel.add(energyLabel);
experience.setBounds(48, 22, 21, 21);
zonesPanel.add(experience);
experienceLabel.setBounds(69, 22, 21, 21);
zonesPanel.add(experienceLabel);
btnPlayer = new JButton();
btnPlayer.setText("Player");
btnPlayer.setVisible(false);
@ -895,6 +934,8 @@ public class PlayerPanelExt extends javax.swing.JPanel {
private JButton btnPlayer;
private ImagePanel life;
private ImagePanel poison;
private ImagePanel energy;
private ImagePanel experience;
private ImagePanel hand;
private HoverButton grave;
private HoverButton library;
@ -906,6 +947,8 @@ public class PlayerPanelExt extends javax.swing.JPanel {
private JLabel handLabel;
private JLabel libraryLabel;
private JLabel poisonLabel;
private JLabel energyLabel;
private JLabel experienceLabel;
private JLabel graveLabel;
private JLabel exileLabel;
private boolean changedFontLibrary;
@ -914,6 +957,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
private boolean changedFontExile;
private JPanel zonesPanel;
private JPanel energyExperiencePanel;
private HoverButton exileZone;
private HoverButton commandZone;
private HoverButton enchantPlayerViewZone;

BIN
Mage.Client/src/main/resources/info/experience.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.3 KiB