From 3801813aa0cc9f0d9da172a98ec547e73b6d4ee7 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Fri, 1 Sep 2023 12:20:18 +0200 Subject: [PATCH] battle support --- .../forge/toolbox/imaging/FCardImageRenderer.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/imaging/FCardImageRenderer.java b/forge-gui-desktop/src/main/java/forge/toolbox/imaging/FCardImageRenderer.java index fb206283ff7..8892060c065 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/imaging/FCardImageRenderer.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/imaging/FCardImageRenderer.java @@ -184,7 +184,7 @@ public class FCardImageRenderer { if (!card.isSplitCard() && !card.isFlipCard()) { final CardStateView state = card.getState(card.isAdventureCard() ? false : altState); if ((state.isCreature() && !state.getKeywordKey().contains("Level up")) - || state.isPlaneswalker() || state.isVehicle()) + || state.isPlaneswalker() || state.isBattle() || state.isVehicle()) hasPTBox = true; } if (hasPTBox) { @@ -294,7 +294,7 @@ public class FCardImageRenderer { int headerHeight = NAME_SIZE + 2 * HEADER_PADDING; int typeBoxHeight = TYPE_SIZE + 2 * TYPE_PADDING; int ptBoxHeight = 0; - if (state.isCreature() || state.isPlaneswalker() || state.isVehicle()) { + if (state.isCreature() || state.isPlaneswalker() | state.isBattle() || state.isVehicle()) { //if P/T box needed, make room for it ptBoxHeight = headerHeight; } @@ -839,6 +839,12 @@ public class FCardImageRenderer { TEXT_COLOR = Color.WHITE; pieces.add(String.valueOf(state.getLoyalty())); } + else if (state.isBattle()) { + Color [] pwColor = { Color.BLACK }; + colors = pwColor; + TEXT_COLOR = Color.WHITE; + pieces.add(String.valueOf(state.getDefense())); + } else if (state.isVehicle()) { Color [] vhColor = { new Color(128, 96, 64) }; colors = vhColor; @@ -865,7 +871,7 @@ public class FCardImageRenderer { int arcWidth = h / 3; fillRoundColorBackground(g, colors, x, y, w, h, arcWidth, h); g.setStroke(new BasicStroke(BOX_LINE_THICKNESS)); - g.setColor(state.isPlaneswalker() ? Color.WHITE : Color.BLACK); + g.setColor(state.isPlaneswalker() || state.isBattle() ? Color.WHITE : Color.BLACK); g.drawRoundRect(x, y, w, h, arcWidth, h); x += (PT_BOX_WIDTH - totalPieceWidth) / 2;