External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix retro card P/T text

Browse source 
* damage text formats properly
* boosted/reduced p/t changes colors appropriately
This commit is contained in:
jmlundeen 2025-04-29 12:13:15 -05:00
parent 99850c7442
commit 5e07c2d603
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage.Client/src/main/java/org/mage/card/arcane/RetroCardRenderer.java
View file

@ -326,7 +326,7 @@ public class RetroCardRenderer extends CardRenderer {
innerContentWidth - 4, (int) ((cardHeight - borderWidth * 2) * 0.32f)); innerContentWidth - 4, (int) ((cardHeight - borderWidth * 2) * 0.32f));
// Draw the bottom right stuff // Draw the bottom right stuff
drawBottomRight(g, borderPaint, boxColor); drawBottomRight(g, attribs, borderPaint, boxColor);
} }
private void drawInsetFrame(Graphics2D g2, int x, int y, int width, int height, Paint borderPaint, boolean isLand) { private void drawInsetFrame(Graphics2D g2, int x, int y, int width, int height, Paint borderPaint, boolean isLand) {
@ -540,7 +540,7 @@ public class RetroCardRenderer extends CardRenderer {
} }
// Draw the P/T and/or Loyalty boxes // Draw the P/T and/or Loyalty boxes
protected void drawBottomRight(Graphics2D g, Paint borderPaint, Color fill) { protected void drawBottomRight(Graphics2D g, CardPanelAttributes attribs, Paint borderPaint, Color fill) {
// No bottom right for abilities // No bottom right for abilities
if (cardView.isAbility()) { if (cardView.isAbility()) {
return; return;
@ -583,7 +583,8 @@ public class RetroCardRenderer extends CardRenderer {
// Draw text // Draw text
Color defaultTextColor = Color.black; Color defaultTextColor = Color.black;
boolean defaultTextLight = true; boolean defaultTextLight = cardView.getColor().isMulticolored() || cardView.getColor().equals(ObjectColor.RED)
|| cardView.getColor().equals(ObjectColor.COLORLESS);
g.setFont(ptTextFont); g.setFont(ptTextFont);
// real PT info // real PT info
@ -608,7 +609,7 @@ public class RetroCardRenderer extends CardRenderer {
g.setColor(defaultTextColor); g.setColor(defaultTextColor);
// Advance // Advance
curY -= boxHeight; curY -= ptBoxHeight;
} }
// Is it a walker? (But don't draw the box if it's a non-permanent view // Is it a walker? (But don't draw the box if it's a non-permanent view
@ -712,14 +713,14 @@ public class RetroCardRenderer extends CardRenderer {
// does it have damage on it? // does it have damage on it?
if ((cardView instanceof PermanentView) && ((PermanentView) cardView).getDamage() > 0) { if ((cardView instanceof PermanentView) && ((PermanentView) cardView).getDamage() > 0) {
int x = cardWidth - partBoxWidth - borderWidth; int x = cardWidth - partBoxWidth - borderWidth;
int y = curY - boxHeight; int y = curY - ptBoxHeight;
String damage = String.valueOf(((PermanentView) cardView).getDamage()); String damage = String.valueOf(((PermanentView) cardView).getDamage());
g.setFont(ptTextFont); g.setFont(ptTextFont);
int txWidth = g.getFontMetrics().stringWidth(damage); int txWidth = g.getFontMetrics().stringWidth(damage);
g.setColor(Color.red); g.setColor(Color.red);
g.fillRect(x, y, partBoxWidth, boxHeight); g.fillRect(x, y, partBoxWidth, ptBoxHeight);
g.setColor(Color.white); g.setColor(Color.white);
g.drawRect(x, y, partBoxWidth, boxHeight); g.drawRect(x, y, partBoxWidth, ptBoxHeight);
g.drawString(damage, x + (partBoxWidth - txWidth) / 2, curY - 1); g.drawString(damage, x + (partBoxWidth - txWidth) / 2, curY - 1);
} }
} }