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 #4674 from spjspj/master

Browse source 
Have a faded life total over the avatar which glows then fades again …
This commit is contained in:
spjspj 2018-03-29 08:40:17 +11:00 committed by GitHub
commit bd29eaaa82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/components/HoverButton.java
View file

@ -52,7 +52,7 @@ public class HoverButton extends JPanel implements MouseListener {
private Command onHover = null; private Command onHover = null;
private Color textColor = Color.white; private Color textColor = Color.white;
private final Rectangle centerTextArea = new Rectangle(5, 18, 75, 40); 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; private final Color textBGColor = Color.black;
static final Font textFont = new Font("Arial", Font.PLAIN, 12); static final Font textFont = new Font("Arial", Font.PLAIN, 12);

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

@ -202,10 +202,11 @@ public class PlayerPanelExt extends javax.swing.JPanel {
if (playerLife > pastLife) { if (playerLife > pastLife) {
if (faderGainLife == null && doGainFade) { if (faderGainLife == null && doGainFade) {
doGainFade = false; doGainFade = false;
faderGainLife = new Timer(25, new ActionListener() { faderGainLife = new Timer(50, new ActionListener() {
public void actionPerformed(ActionEvent ae) { public void actionPerformed(ActionEvent ae) {
gainX++; 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(); avatar.repaint();
if (gainX >= 100) { if (gainX >= 100) {
avatar.setCenterColor(new Color(200, 190, 0, 180)); avatar.setCenterColor(new Color(200, 190, 0, 180));
@ -227,10 +228,11 @@ public class PlayerPanelExt extends javax.swing.JPanel {
} else if (playerLife < pastLife) { } else if (playerLife < pastLife) {
if (faderLoseLife == null && doLoseFade) { if (faderLoseLife == null && doLoseFade) {
doLoseFade = false; doLoseFade = false;
faderLoseLife = new Timer(25, new ActionListener() { faderLoseLife = new Timer(50, new ActionListener() {
public void actionPerformed(ActionEvent ae) { public void actionPerformed(ActionEvent ae) {
loseX++; 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(); avatar.repaint();
if (loseX >= 100) { if (loseX >= 100) {
avatar.setCenterColor(new Color(200, 190, 0, 180)); avatar.setCenterColor(new Color(200, 190, 0, 180));