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

GUI: improved rendering of Saga and Case cards (#11762)

Browse source 
Co-authored-by: Matthew Wilson <matthew_w@vaadin.com>
This commit is contained in:
Matthew Wilson 2024-02-06 10:33:11 +02:00 • committed by GitHub
parent c4e0d64428
commit e1968a6b5f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 41 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -171,6 +171,7 @@ public class ModernCardRenderer extends CardRenderer {
protected static final float TYPE_LINE_Y_FRAC = 0.57f; // x cardHeight protected static final float TYPE_LINE_Y_FRAC = 0.57f; // x cardHeight
protected static final float TYPE_LINE_Y_FRAC_TOKEN = 0.70f; protected static final float TYPE_LINE_Y_FRAC_TOKEN = 0.70f;
protected static final float TYPE_LINE_Y_FRAC_FULL_ART = 0.74f; protected static final float TYPE_LINE_Y_FRAC_FULL_ART = 0.74f;
protected static final float TYPE_LINE_Y_FRAC_BOTTOM = 0.89f;
protected int typeLineY; protected int typeLineY;
// Possible sizes of rules text font // Possible sizes of rules text font
@ -329,6 +330,10 @@ public class ModernCardRenderer extends CardRenderer {
rect = new Rectangle2D.Float(.0f, .0f, 1.0f, 1.0f); rect = new Rectangle2D.Float(.0f, .0f, 1.0f, 1.0f);
} else if (cardView.getFrameStyle().isFullArt() || (cardView.isToken())) { } else if (cardView.getFrameStyle().isFullArt() || (cardView.isToken())) {
rect = new Rectangle2D.Float(.079f, .11f, .84f, .63f); rect = new Rectangle2D.Float(.079f, .11f, .84f, .63f);
} else if (cardView.getSubTypes().contains(SubType.SAGA)) {
rect = ArtRect.SAGA.rect;
} else if (cardView.getSubTypes().contains(SubType.CASE)) {
rect = ArtRect.CASE.rect;
} else { } else {
rect = ArtRect.NORMAL.rect; rect = ArtRect.NORMAL.rect;
} }
@ -340,6 +345,9 @@ public class ModernCardRenderer extends CardRenderer {
return TYPE_LINE_Y_FRAC_TOKEN; return TYPE_LINE_Y_FRAC_TOKEN;
} else if (cardView.getFrameStyle().isFullArt()) { } else if (cardView.getFrameStyle().isFullArt()) {
return TYPE_LINE_Y_FRAC_FULL_ART; return TYPE_LINE_Y_FRAC_FULL_ART;
} else if (cardView.getSubTypes().contains(SubType.SAGA) ||
cardView.getSubTypes().contains(SubType.CASE)) {
return TYPE_LINE_Y_FRAC_BOTTOM;
} else { } else {
return TYPE_LINE_Y_FRAC; return TYPE_LINE_Y_FRAC;
} }
@ -424,6 +432,16 @@ public class ModernCardRenderer extends CardRenderer {
contentWidth - 2, typeLineY - totalContentInset - boxHeight, contentWidth - 2, typeLineY - totalContentInset - boxHeight,
alternate_height, alternate_height,
sourceRect, shouldPreserveAspect); sourceRect, shouldPreserveAspect);
} else if (cardView.getSubTypes().contains(SubType.SAGA)) {
drawArtIntoRect(g,
contentWidth / 2 + totalContentInset + 1, totalContentInset + boxHeight,
contentWidth / 2 - 1, typeLineY - totalContentInset - boxHeight,
sourceRect, false);
} else if (cardView.getSubTypes().contains(SubType.CASE)) {
drawArtIntoRect(g,
totalContentInset + 1, totalContentInset + boxHeight,
contentWidth / 2 - 1, typeLineY - totalContentInset - boxHeight,
sourceRect, false);
} else if (!isZendikarFullArtLand()) { } else if (!isZendikarFullArtLand()) {
drawArtIntoRect(g, drawArtIntoRect(g,
totalContentInset + 1, totalContentInset + boxHeight, totalContentInset + 1, totalContentInset + boxHeight,
@ -474,7 +492,13 @@ public class ModernCardRenderer extends CardRenderer {
g.setPaint(textboxPaint); g.setPaint(textboxPaint);
} }
if (!isZenUst) { if (cardView.getSubTypes().contains(SubType.SAGA)) {
g.fillRect(totalContentInset + 2, totalContentInset + boxHeight,
contentWidth / 2 - 2, typeLineY - totalContentInset - boxHeight + 2);
} else if (cardView.getSubTypes().contains(SubType.CASE)) {
g.fillRect(contentWidth / 2 + totalContentInset + 1, totalContentInset + boxHeight,
contentWidth / 2 - 2, typeLineY - totalContentInset - boxHeight + 2);
} else if (!isZenUst) {
if (cardView.getCardTypes().contains(CardType.LAND)) { if (cardView.getCardTypes().contains(CardType.LAND)) {
int total_height_of_box = cardHeight - borderWidth * 3 - typeLineY - 2 - boxHeight; int total_height_of_box = cardHeight - borderWidth * 3 - typeLineY - 2 - boxHeight;
@ -669,6 +693,14 @@ public class ModernCardRenderer extends CardRenderer {
drawUSTCurves(g, image, x, y, w, h, drawUSTCurves(g, image, x, y, w, h,
0, 0, 0, 0,
additionalBoxColor, borderPaint); additionalBoxColor, borderPaint);
} else if (cardView.getSubTypes().contains(SubType.SAGA)) {
drawRulesText(g, textboxKeywords, textboxRules,
totalContentInset + 4, totalContentInset + boxHeight + 2,
contentWidth / 2 - 8, typeLineY - totalContentInset - boxHeight - 6, false);
} else if (cardView.getSubTypes().contains(SubType.CASE)) {
drawRulesText(g, textboxKeywords, textboxRules,
contentWidth / 2 + totalContentInset + 4, totalContentInset + boxHeight + 2,
contentWidth / 2 - 8, typeLineY - totalContentInset - boxHeight - 6, false);
} else if (!isZenUst) { } else if (!isZenUst) {
drawRulesText(g, textboxKeywords, textboxRules, drawRulesText(g, textboxKeywords, textboxRules,
totalContentInset + 2, typeLineY + boxHeight + 2, totalContentInset + 2, typeLineY + boxHeight + 2,

5
Mage.Common/src/main/java/mage/view/CardView.java
View file

@ -527,6 +527,7 @@ public class CardView extends SimpleCardView {
// Determine what part of the art to slice out for spells on the stack which originate // Determine what part of the art to slice out for spells on the stack which originate
// from a split, fuse, or aftermath split card. // from a split, fuse, or aftermath split card.
// Modal double faces cards draws as normal cards // Modal double faces cards draws as normal cards
// Sagas and cases have completely different layouts
SpellAbilityType ty = spell.getSpellAbility().getSpellAbilityType(); SpellAbilityType ty = spell.getSpellAbility().getSpellAbilityType();
if (ty == SpellAbilityType.SPLIT_RIGHT || ty == SpellAbilityType.SPLIT_LEFT || ty == SpellAbilityType.SPLIT_FUSED) { if (ty == SpellAbilityType.SPLIT_RIGHT || ty == SpellAbilityType.SPLIT_LEFT || ty == SpellAbilityType.SPLIT_FUSED) {
// Needs a special art rect // Needs a special art rect
@ -547,6 +548,10 @@ public class CardView extends SimpleCardView {
artRect = ArtRect.SPLIT_LEFT; artRect = ArtRect.SPLIT_LEFT;
} }
} }
} else if (spell.getSubtype().contains(SubType.SAGA)) {
artRect = ArtRect.SAGA;
} else if (spell.getSubtype().contains(SubType.CASE)) {
artRect = ArtRect.CASE;
} }
// show for modal spell, which mode was chosen // show for modal spell, which mode was chosen

4
Mage/src/main/java/mage/cards/ArtRect.java
View file

@ -11,7 +11,9 @@ public enum ArtRect {
AFTERMATH_BOTTOM(new Rectangle2D.Double(0.546, 0.562, 0.272, 0.346)), AFTERMATH_BOTTOM(new Rectangle2D.Double(0.546, 0.562, 0.272, 0.346)),
SPLIT_LEFT(new Rectangle2D.Double(0.152, 0.539, 0.386, 0.400)), SPLIT_LEFT(new Rectangle2D.Double(0.152, 0.539, 0.386, 0.400)),
SPLIT_RIGHT(new Rectangle2D.Double(0.152, 0.058, 0.386, 0.400)), SPLIT_RIGHT(new Rectangle2D.Double(0.152, 0.058, 0.386, 0.400)),
SPLIT_FUSED(null); SPLIT_FUSED(null),
SAGA(new Rectangle2D.Double(0.497, 0.11, 0.426, 0.727)),
CASE(new Rectangle2D.Double(0.069, 0.11, 0.426, 0.727));
public final Rectangle2D rect; public final Rectangle2D rect;