diff --git a/Mage.Client/src/main/java/mage/client/components/MageRoundPane.java b/Mage.Client/src/main/java/mage/client/components/MageRoundPane.java index da4afed58e..65fda45f64 100644 --- a/Mage.Client/src/main/java/mage/client/components/MageRoundPane.java +++ b/Mage.Client/src/main/java/mage/client/components/MageRoundPane.java @@ -27,7 +27,7 @@ public class MageRoundPane extends JPanel { private int X_OFFSET = 30; private int Y_OFFSET = 30; - private final Color defaultBackgroundColor = new Color(255, 255, 255, 200); + private final Color defaultBackgroundColor = new Color(141, 130, 112, 200); private Color backgroundColor = defaultBackgroundColor; private final int alpha = 0; private static Map SHADOW_IMAGE_CACHE; diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index 3597ba0b40..5d7ec878aa 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -916,33 +916,33 @@ public final class GamePanel extends javax.swing.JPanel { private void updateSkipButtons(boolean turn, boolean endOfTurn, boolean nextMain, boolean allTurns, boolean stack, boolean endStepBeforeYourStep) { if (turn) { //F4 - btnSkipToNextTurn.setBorder(new LineBorder(Color.red, BORDER_SIZE)); + btnSkipToNextTurn.setBorder(new LineBorder(Color.orange, BORDER_SIZE)); } else { btnSkipToNextTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); } if (endOfTurn) { // F5 - btnSkipToEndTurn.setBorder(new LineBorder(Color.red, BORDER_SIZE)); + btnSkipToEndTurn.setBorder(new LineBorder(Color.orange, BORDER_SIZE)); } else { btnSkipToEndTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); } if (nextMain) { // F7 - btnSkipToNextMain.setBorder(new LineBorder(Color.red, BORDER_SIZE)); + btnSkipToNextMain.setBorder(new LineBorder(Color.orange, BORDER_SIZE)); } else { btnSkipToNextMain.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); } if (stack) { // F8 - btnSkipStack.setBorder(new LineBorder(Color.red, BORDER_SIZE)); + btnSkipStack.setBorder(new LineBorder(Color.orange, BORDER_SIZE)); } else { btnSkipStack.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); } if (allTurns) { // F9 - btnSkipToYourTurn.setBorder(new LineBorder(Color.red, BORDER_SIZE)); + btnSkipToYourTurn.setBorder(new LineBorder(Color.orange, BORDER_SIZE)); } else { btnSkipToYourTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); } if (endStepBeforeYourStep) { // F11 - btnSkipToEndStepBeforeYourTurn.setBorder(new LineBorder(Color.red, BORDER_SIZE)); + btnSkipToEndStepBeforeYourTurn.setBorder(new LineBorder(Color.orange, BORDER_SIZE)); } else { btnSkipToEndStepBeforeYourTurn.setBorder(new EmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE)); } 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 67484a2f36..baf41b67ff 100644 --- a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java +++ b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java @@ -110,11 +110,11 @@ public class PlayerPanelExt extends javax.swing.JPanel { private static final int PANEL_HEIGHT_SMALL = 212; private static final int MANA_LABEL_SIZE_HORIZONTAL = 20; - private static final Border GREEN_BORDER = new LineBorder(Color.green, 3); + private static final Border GREEN_BORDER = new LineBorder(Color.white, 3); private static final Border RED_BORDER = new LineBorder(Color.red, 2); private static final Border EMPTY_BORDER = BorderFactory.createEmptyBorder(0, 0, 0, 0); - private final Color greenBackgroundColor = new Color(180, 255, 180, 200); - private final Color deadBackgroundColor = new Color(200, 180, 180, 200); + private final Color greenBackgroundColor = new Color(206, 192, 174, 200); + private final Color deadBackgroundColor = new Color(131, 94, 83, 200); private int avatarId = -1; private String flagName; @@ -430,7 +430,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { // Poison count poisonLabel.setText("0"); - r = new Rectangle(14, 14); + r = new Rectangle(18, 18); poisonLabel.setToolTipText("Poison"); Image imagePoison = ImageHelper.getImageFromResources("/info/poison.png"); BufferedImage resizedPoison = ImageHelper.getResizedImage(BufferedImageBuilder.bufferImage(imagePoison, BufferedImage.TYPE_INT_ARGB), r); @@ -650,8 +650,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { .addGap(9) .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(3) - .addComponent(poison, GroupLayout.PREFERRED_SIZE, 14, GroupLayout.PREFERRED_SIZE)) + .addComponent(poison, GroupLayout.PREFERRED_SIZE, 18, GroupLayout.PREFERRED_SIZE)) .addGroup(gl_panelBackground.createSequentialGroup() .addGap(2) .addComponent(btnWhiteMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE)) @@ -720,7 +719,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { .addComponent(avatar, Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 80, Short.MAX_VALUE)) // .addGroup(gl_panelBackground.createSequentialGroup() // .addComponent(avatarFlag, GroupLayout.PREFERRED_SIZE, 16, GroupLayout.PREFERRED_SIZE)) - .addGap(14)) + .addGap(8)) .addGroup(gl_panelBackground.createSequentialGroup() .addGap(6) .addComponent(zonesPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE) @@ -734,7 +733,7 @@ public class PlayerPanelExt extends javax.swing.JPanel { .addPreferredGap(ComponentPlacement.RELATED) .addComponent(btnPlayer) .addComponent(timerLabel) - .addGap(1) + .addGap(2) // Life & Hand .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) .addGroup(gl_panelBackground.createSequentialGroup() @@ -749,15 +748,15 @@ public class PlayerPanelExt extends javax.swing.JPanel { // Poison .addGroup(gl_panelBackground.createParallelGroup(Alignment.LEADING) .addGroup(gl_panelBackground.createSequentialGroup() - .addGap(4) - .addComponent(poison, GroupLayout.PREFERRED_SIZE, 14, GroupLayout.PREFERRED_SIZE) + .addGap(2) + .addComponent(poison, GroupLayout.PREFERRED_SIZE, 18, GroupLayout.PREFERRED_SIZE) .addGap(4) .addComponent(btnWhiteMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) .addGap(2) .addComponent(btnBlueMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) .addGap(2) .addComponent(btnBlackMana, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) - .addGap(5) + .addGap(3) .addComponent(grave, GroupLayout.PREFERRED_SIZE, 21, GroupLayout.PREFERRED_SIZE) ) .addGroup(gl_panelBackground.createSequentialGroup() diff --git a/Mage.Client/src/main/resources/buttons/blank.png b/Mage.Client/src/main/resources/buttons/blank.png index 3dcfd35323..d61587dfe5 100644 Binary files a/Mage.Client/src/main/resources/buttons/blank.png and b/Mage.Client/src/main/resources/buttons/blank.png differ diff --git a/Mage.Client/src/main/resources/buttons/cancel_skip.png b/Mage.Client/src/main/resources/buttons/cancel_skip.png index c418d5d63e..30755df931 100644 Binary files a/Mage.Client/src/main/resources/buttons/cancel_skip.png and b/Mage.Client/src/main/resources/buttons/cancel_skip.png differ diff --git a/Mage.Client/src/main/resources/buttons/concede.png b/Mage.Client/src/main/resources/buttons/concede.png index 4f56f52b94..f0795a00ca 100644 Binary files a/Mage.Client/src/main/resources/buttons/concede.png and b/Mage.Client/src/main/resources/buttons/concede.png differ diff --git a/Mage.Client/src/main/resources/buttons/skip_all.png b/Mage.Client/src/main/resources/buttons/skip_all.png index 9af7be0c78..53c01378ad 100644 Binary files a/Mage.Client/src/main/resources/buttons/skip_all.png and b/Mage.Client/src/main/resources/buttons/skip_all.png differ diff --git a/Mage.Client/src/main/resources/buttons/skip_stack.png b/Mage.Client/src/main/resources/buttons/skip_stack.png index 40597cfb64..06816b1f39 100644 Binary files a/Mage.Client/src/main/resources/buttons/skip_stack.png and b/Mage.Client/src/main/resources/buttons/skip_stack.png differ diff --git a/Mage.Client/src/main/resources/buttons/skip_to_end.png b/Mage.Client/src/main/resources/buttons/skip_to_end.png index 7325a90b1f..86df3bcf7c 100644 Binary files a/Mage.Client/src/main/resources/buttons/skip_to_end.png and b/Mage.Client/src/main/resources/buttons/skip_to_end.png differ diff --git a/Mage.Client/src/main/resources/buttons/skip_to_main.png b/Mage.Client/src/main/resources/buttons/skip_to_main.png index 8aec79da18..0d1b2bf115 100644 Binary files a/Mage.Client/src/main/resources/buttons/skip_to_main.png and b/Mage.Client/src/main/resources/buttons/skip_to_main.png differ diff --git a/Mage.Client/src/main/resources/buttons/skip_to_previous_end.png b/Mage.Client/src/main/resources/buttons/skip_to_previous_end.png index f5f737d8f4..2e93fd55bb 100644 Binary files a/Mage.Client/src/main/resources/buttons/skip_to_previous_end.png and b/Mage.Client/src/main/resources/buttons/skip_to_previous_end.png differ diff --git a/Mage.Client/src/main/resources/buttons/skip_turn.png b/Mage.Client/src/main/resources/buttons/skip_turn.png index 4c35eda03e..c7c3bfe393 100644 Binary files a/Mage.Client/src/main/resources/buttons/skip_turn.png and b/Mage.Client/src/main/resources/buttons/skip_turn.png differ diff --git a/Mage.Client/src/main/resources/buttons/stop_watching.png b/Mage.Client/src/main/resources/buttons/stop_watching.png index 717de1f96e..c45a5f639f 100644 Binary files a/Mage.Client/src/main/resources/buttons/stop_watching.png and b/Mage.Client/src/main/resources/buttons/stop_watching.png differ diff --git a/Mage.Client/src/main/resources/buttons/switch_hands.png b/Mage.Client/src/main/resources/buttons/switch_hands.png index 9c1dab456d..b38e20b929 100644 Binary files a/Mage.Client/src/main/resources/buttons/switch_hands.png and b/Mage.Client/src/main/resources/buttons/switch_hands.png differ diff --git a/Mage.Client/src/main/resources/info/command_zone.png b/Mage.Client/src/main/resources/info/command_zone.png index a992c555d5..33dbba8c5d 100644 Binary files a/Mage.Client/src/main/resources/info/command_zone.png and b/Mage.Client/src/main/resources/info/command_zone.png differ diff --git a/Mage.Client/src/main/resources/info/exile.png b/Mage.Client/src/main/resources/info/exile.png index 6f0fe92cc3..1cf37dadf1 100644 Binary files a/Mage.Client/src/main/resources/info/exile.png and b/Mage.Client/src/main/resources/info/exile.png differ diff --git a/Mage.Client/src/main/resources/info/grave.png b/Mage.Client/src/main/resources/info/grave.png index b2678b09ca..71ea1f4b5c 100644 Binary files a/Mage.Client/src/main/resources/info/grave.png and b/Mage.Client/src/main/resources/info/grave.png differ diff --git a/Mage.Client/src/main/resources/info/hand.png b/Mage.Client/src/main/resources/info/hand.png index 04482b29c7..59d8955516 100644 Binary files a/Mage.Client/src/main/resources/info/hand.png and b/Mage.Client/src/main/resources/info/hand.png differ diff --git a/Mage.Client/src/main/resources/info/library.png b/Mage.Client/src/main/resources/info/library.png index 9cb19eb172..f799e808aa 100644 Binary files a/Mage.Client/src/main/resources/info/library.png and b/Mage.Client/src/main/resources/info/library.png differ diff --git a/Mage.Client/src/main/resources/info/life.png b/Mage.Client/src/main/resources/info/life.png index a3b5045ff2..e4c8e45f96 100644 Binary files a/Mage.Client/src/main/resources/info/life.png and b/Mage.Client/src/main/resources/info/life.png differ diff --git a/Mage.Client/src/main/resources/info/poison.png b/Mage.Client/src/main/resources/info/poison.png index 888091bd1a..181a479be6 100644 Binary files a/Mage.Client/src/main/resources/info/poison.png and b/Mage.Client/src/main/resources/info/poison.png differ