From db3074ceda06805637793a80bc8662057bb1318a Mon Sep 17 00:00:00 2001 From: spjspj Date: Mon, 26 Sep 2016 02:50:37 +1000 Subject: [PATCH 1/2] spjspj - experience.png resource (candidate for a more gooderer one..) --- .../src/main/resources/info/experience.png | Bin 0 -> 4445 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Mage.Client/src/main/resources/info/experience.png diff --git a/Mage.Client/src/main/resources/info/experience.png b/Mage.Client/src/main/resources/info/experience.png new file mode 100644 index 0000000000000000000000000000000000000000..180ef0f47a9727ee8ea27ed254d63004d6f4f23f GIT binary patch literal 4445 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 literal 0 HcmV?d00001 From 5671ab8ff7943b663ade2f45ea196af9f9f66e7e Mon Sep 17 00:00:00 2001 From: spjspj Date: Mon, 26 Sep 2016 02:58:59 +1000 Subject: [PATCH 2/2] spjspj - Add in energy/experience counters --- .../java/mage/client/game/PlayAreaPanel.java | 2 +- .../java/mage/client/game/PlayerPanelExt.java | 54 +++++++++++++++++-- 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java b/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java index e8001fee6cc..09de6a3d55e 100644 --- a/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java +++ b/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java @@ -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; /** diff --git a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java index fc494cdbe26..621dcd1208b 100644 --- a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java +++ b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java @@ -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); @@ -454,7 +458,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { } }); - // Grave count and open graveyard button + // Grave count and open graveyard button r = new Rectangle(21, 21); graveLabel.setToolTipText("Card Types: 0"); Image imageGrave = ImageHelper.getImageFromResources("/info/grave.png"); @@ -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;