github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2018-02-28 17:25:24 +01:00
commit 86287f71c8
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Client/src/main/java/org/mage/card/arcane/CardRendererUtils.java
View file

@ -119,12 +119,11 @@ public final class CardRendererUtils {
g.drawOval(x + 1 + w - bevel * 2, y + 1, bevel * 2 - 3, h - 3);
// The big circle in the middle.. (diameter=2+1/4 of height) - 3/4 above line, 1/2 below 0.75 + .5 + 1= 2.25 = 9/4
g.drawOval(x + w / 2 - h - h/8, y - 3*h/4, 9*h/4, 9*h/4);
g.drawOval(x + w / 2 - h - h / 8, y - 3 * h / 4, 9 * h / 4, 9 * h / 4);
g.drawRect(x + bevel, y, w - 2 * bevel, h - 1);
g.drawRect(x + 1 + bevel, y + 1, w - 2 * bevel - 2, h - 3);
g.setPaint(fill);
g.setPaint(fill);
g.setColor(abitbrighter(g.getColor()));
g.drawLine(x + 1 + bevel, y + 1, x + 1 + bevel + w - 2 * bevel - 2, y + 1);
g.setPaint(fill);
@ -135,7 +134,7 @@ public final class CardRendererUtils {
g.fillOval(x + 2 + w - bevel * 2, y + 2, bevel * 2 - 4, h - 4);
g.fillRect(x + bevel, y + 2, w - 2 * bevel, h - 4);
g.fillOval(x + w / 2 - h - h/8, y - 3*h/4, 9*h/4, 9*h/4);
g.fillOval(x + w / 2 - h - h / 8, y - 3 * h / 4, 9 * h / 4, 9 * h / 4);
}
// Get the width of a mana cost rendered with ManaSymbols.draw

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

@ -525,7 +525,7 @@ public class ModernCardRenderer extends CardRenderer {
} else {
int x = totalContentInset;
int y = typeLineY + boxHeight + (cardHeight - typeLineY - boxHeight - 4 - borderWidth * 3) / 2 - contentInset;
int w = contentWidth - 2;
int w = contentWidth;
int h = boxHeight - 4;
CardRendererUtils.drawZendikarLandBox(g,
@ -533,7 +533,7 @@ public class ModernCardRenderer extends CardRenderer {
contentInset,
borderPaint, boxColor);
drawTypeLine(g, getCardSuperTypeLine(),
totalContentInset + 2, typeLineY + boxHeight + (cardHeight - typeLineY - boxHeight - 4 - borderWidth * 3) / 2 - contentInset,
totalContentInset + contentInset, typeLineY + boxHeight + (cardHeight - typeLineY - boxHeight - 4 - borderWidth * 3) / 2 - contentInset,
contentWidth / 2 - boxHeight, boxHeight - 4, false);
drawTypeLine(g, getCardSubTypeLine(),
totalContentInset + 4 * contentWidth / 7 + boxHeight, typeLineY + boxHeight + (cardHeight - typeLineY - boxHeight - 4 - borderWidth * 3) / 2 - contentInset,
@ -663,13 +663,13 @@ public class ModernCardRenderer extends CardRenderer {
curve.lineTo(x + topxdelta, y);
Path2D.Double innercurve = new Path2D.Double();
innercurve.moveTo(x + topxdelta, y+1);
innercurve.quadTo(x+1, y + endydelta / 2, x+1, y + endydelta);
innercurve.lineTo(x+1, y2-1);
innercurve.lineTo(x2-1, y2-1);
innercurve.lineTo(x2-1, y + endydelta);
innercurve.quadTo(x2-1, y + endydelta / 2, x2 - topxdelta, y+1);
innercurve.lineTo(x + topxdelta, y+1);
innercurve.moveTo(x + topxdelta, y + 1);
innercurve.quadTo(x + 1, y + endydelta / 2, x + 1, y + endydelta);
innercurve.lineTo(x + 1, y2 - 1);
innercurve.lineTo(x2 - 1, y2 - 1);
innercurve.lineTo(x2 - 1, y + endydelta);
innercurve.quadTo(x2 - 1, y + endydelta / 2, x2 - topxdelta, y + 1);
innercurve.lineTo(x + topxdelta, y + 1);
Rectangle2D r = curve.getBounds2D();
int minX = (int) r.getX();
@ -969,7 +969,8 @@ public class ModernCardRenderer extends CardRenderer {
} else // Big circle in the middle for Zendikar lands
{
if (allRules.size() == 1) {
drawBasicManaSymbol(g, x + w / 2 - h - h / 8, y - 3 * h / 4, 9 * h / 4, 9 * h / 4, ((TextboxBasicManaRule) allRules.get(0)).getBasicManaSymbol());
// Size of mana symbol = 9/4 * h, 3/4h above line
drawBasicManaSymbol(g, x + w / 2 - 9 * h / 8 + 1, y - 3 * h / 4, 9 * h / 4, 9 * h / 4, ((TextboxBasicManaRule) allRules.get(0)).getBasicManaSymbol());
return;
} else {
if (allRules.size() > 1) {