From 938ac3598173f7eab37f6f68a9502f0eb59f0aca Mon Sep 17 00:00:00 2001 From: spjspj Date: Thu, 29 Mar 2018 00:28:56 +1100 Subject: [PATCH] Have a faded life total over the avatar which glows then fades again reddish for damage and bluish for life gain. --- .../main/java/mage/client/components/HoverButton.java | 2 +- .../src/main/java/mage/client/game/PlayerPanelExt.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/components/HoverButton.java b/Mage.Client/src/main/java/mage/client/components/HoverButton.java index 5292a148d8..863cb49109 100644 --- a/Mage.Client/src/main/java/mage/client/components/HoverButton.java +++ b/Mage.Client/src/main/java/mage/client/components/HoverButton.java @@ -52,7 +52,7 @@ public class HoverButton extends JPanel implements MouseListener { private Command onHover = null; private Color textColor = Color.white; private final Rectangle centerTextArea = new Rectangle(5, 18, 75, 40); - private Color centerTextColor = Color.YELLOW; + private Color centerTextColor = new Color(200, 190, 0, 180); private final Color textBGColor = Color.black; static final Font textFont = new Font("Arial", Font.PLAIN, 12); 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 9f0c976711..ed4b0d8a97 100644 --- a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java +++ b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java @@ -202,10 +202,11 @@ public class PlayerPanelExt extends javax.swing.JPanel { if (playerLife > pastLife) { if (faderGainLife == null && doGainFade) { doGainFade = false; - faderGainLife = new Timer(25, new ActionListener() { + faderGainLife = new Timer(50, new ActionListener() { public void actionPerformed(ActionEvent ae) { gainX++; - avatar.setCenterColor(new Color(2 * gainX, 190, 255, 250 - gainX)); + int alpha = Math.max(250 - gainX, 180); + avatar.setCenterColor(new Color(2 * gainX, 190, 255, alpha)); avatar.repaint(); if (gainX >= 100) { avatar.setCenterColor(new Color(200, 190, 0, 180)); @@ -227,10 +228,11 @@ public class PlayerPanelExt extends javax.swing.JPanel { } else if (playerLife < pastLife) { if (faderLoseLife == null && doLoseFade) { doLoseFade = false; - faderLoseLife = new Timer(25, new ActionListener() { + faderLoseLife = new Timer(50, new ActionListener() { public void actionPerformed(ActionEvent ae) { loseX++; - avatar.setCenterColor(new Color(250 - loseX / 2, 140 + loseX / 2, 0, 250 - loseX)); + int alpha = Math.max(250 - loseX, 180); + avatar.setCenterColor(new Color(250 - loseX / 2, 140 + loseX / 2, 0, alpha)); avatar.repaint(); if (loseX >= 100) { avatar.setCenterColor(new Color(200, 190, 0, 180));