Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

EDH Power level update (based on Saltiest EDHREC survey). Update for Full Art Face art.

Browse source
This commit is contained in:
spjspj 2021-09-11 23:32:34 +10:00
parent 4ada3f8ab9
commit 5bbcf03cb6
4 changed files with 433 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java
View file

@ -225,8 +225,9 @@ public abstract class CardRenderer {
// Call the template methods
drawBorder(g);
drawBackground(g);
lessOpaqueRulesTextBox = false;
drawArt(g);
drawFrame(g, attribs, image);
drawFrame(g, attribs, image, lessOpaqueRulesTextBox);
if (!cardView.isAbility()) {
drawOverlays(g);
drawCounters(g);
@ -241,7 +242,7 @@ public abstract class CardRenderer {
protected abstract void drawArt(Graphics2D g);
protected abstract void drawFrame(Graphics2D g, CardPanelAttributes attribs, BufferedImage image);
protected abstract void drawFrame(Graphics2D g, CardPanelAttributes attribs, BufferedImage image, boolean lessOpaqueRulesTextBox);
// Template methods that are possible to override, but unlikely to be
// overridden.
@ -318,7 +319,8 @@ public abstract class CardRenderer {
}
}
protected void drawFaceArtIntoRect(Graphics2D g, int x, int y, int w, int h, Rectangle2D artRect, boolean shouldPreserveAspect) {
private boolean lessOpaqueRulesTextBox = false;
protected void drawFaceArtIntoRect(Graphics2D g, int x, int y, int w, int h, int alternate_h, Rectangle2D artRect, boolean shouldPreserveAspect) {
// Perform a process to make sure that the art is scaled uniformly to fill the frame, cutting
// off the minimum amount necessary to make it completely fill the frame without "squashing" it.
double fullCardImgWidth = faceArtImage.getWidth();
@ -346,10 +348,18 @@ public abstract class CardRenderer {
RenderingHints.KEY_INTERPOLATION,
RenderingHints.VALUE_INTERPOLATION_BICUBIC);
g.setRenderingHints(rh);
g.drawImage(faceArtImage,
x, y,
(int) targetWidth, (int) targetHeight,
null);
if (fullCardImgWidth > fullCardImgHeight) {
g.drawImage(faceArtImage,
x, y,
(int) targetWidth, (int) targetHeight,
null);
} else {
g.drawImage(faceArtImage,
x, y,
(int) targetWidth, alternate_h, // alernate_h is roughly (targetWidth / 0.74)
null);
lessOpaqueRulesTextBox = true;
}
} catch (RasterFormatException e) {
// At very small card sizes we may encounter a problem with rounding error making the rect not fit
System.out.println(e);

36
Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java
View file

@ -450,9 +450,11 @@ public class ModernCardRenderer extends CardRenderer {
// Normal drawing of art from a source part of the card frame into the rect
if (useFaceArt) {
int alternate_height = cardHeight - boxHeight * 2 - totalContentInset;
drawFaceArtIntoRect(g,
totalContentInset + 1, totalContentInset + boxHeight,
contentWidth - 2, typeLineY - totalContentInset - boxHeight,
alternate_height,
sourceRect, shouldPreserveAspect);
} else if (!isZendikarFullArtLand()) {
drawArtIntoRect(g,
@ -464,14 +466,14 @@ public class ModernCardRenderer extends CardRenderer {
}
@Override
protected void drawFrame(Graphics2D g, CardPanelAttributes attribs, BufferedImage image) {
protected void drawFrame(Graphics2D g, CardPanelAttributes attribs, BufferedImage image, boolean lessOpaqueRulesTextBox) {
// Get the card colors to base the frame on
ObjectColor frameColors = getFrameObjectColor();
// Get the border paint
Color boxColor = getBoxColor(frameColors, cardView.getCardTypes(), attribs.isTransformed);
Color additionalBoxColor = getAdditionalBoxColor(frameColors, cardView.getCardTypes(), attribs.isTransformed);
Paint textboxPaint = getTextboxPaint(frameColors, cardView.getCardTypes(), cardWidth);
Paint textboxPaint = getTextboxPaint(frameColors, cardView.getCardTypes(), cardWidth, lessOpaqueRulesTextBox);
Paint borderPaint = getBorderPaint(frameColors, cardView.getCardTypes(), cardWidth);
// Special colors
@ -1765,21 +1767,29 @@ public class ModernCardRenderer extends CardRenderer {
}
}
private static Color getLessOpaqueColor(Color color, boolean lessOpaqueRulesTextBox) {
if (lessOpaqueRulesTextBox) {
Color lessOpaque = new Color (color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha() - 50);
return lessOpaque;
}
return color;
}
// Determine the border paint to use, based on an ObjectColors
protected static Paint getTextboxPaint(ObjectColor colors, Collection<CardType> types, int width) {
protected static Paint getTextboxPaint(ObjectColor colors, Collection<CardType> types, int width, boolean lessOpaqueRulesTextBox) {
if (colors.isMulticolored()) {
if (colors.getColorCount() == 2) {
List<ObjectColor> twoColors = colors.getColors();
Color[] translatedColors;
if (types.contains(CardType.LAND)) {
translatedColors = new Color[]{
getLandTextboxColor(twoColors.get(0)),
getLandTextboxColor(twoColors.get(1))
getLessOpaqueColor(getLandTextboxColor(twoColors.get(0)), lessOpaqueRulesTextBox),
getLessOpaqueColor(getLandTextboxColor(twoColors.get(1)), lessOpaqueRulesTextBox)
};
} else {
translatedColors = new Color[]{
getTextboxColor(twoColors.get(0)),
getTextboxColor(twoColors.get(1))
getLessOpaqueColor(getTextboxColor(twoColors.get(0)), lessOpaqueRulesTextBox),
getLessOpaqueColor(getTextboxColor(twoColors.get(1)), lessOpaqueRulesTextBox)
};
}
@ -1789,20 +1799,20 @@ public class ModernCardRenderer extends CardRenderer {
new float[]{0.4f, 0.6f},
translatedColors);
} else if (types.contains(CardType.LAND)) {
return LAND_TEXTBOX_GOLD;
return getLessOpaqueColor(LAND_TEXTBOX_GOLD, lessOpaqueRulesTextBox);
} else {
return TEXTBOX_GOLD;
return getLessOpaqueColor(TEXTBOX_GOLD, lessOpaqueRulesTextBox);
}
} else if (colors.isColorless()) {
if (types.contains(CardType.LAND)) {
return TEXTBOX_LAND;
return getLessOpaqueColor(TEXTBOX_LAND, lessOpaqueRulesTextBox);
} else {
return TEXTBOX_COLORLESS;
return getLessOpaqueColor(TEXTBOX_COLORLESS, lessOpaqueRulesTextBox);
}
} else if (types.contains(CardType.LAND)) {
return getLandTextboxColor(colors);
return getLessOpaqueColor(getLandTextboxColor(colors), lessOpaqueRulesTextBox);
} else {
return getTextboxColor(colors);
return getLessOpaqueColor(getTextboxColor(colors), lessOpaqueRulesTextBox);
}
}
}