From 47bfda351094d6268ee687fda2aa2fa3f0464d6f Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 4 Mar 2021 18:41:15 +0800 Subject: [PATCH 1/2] [Mobile] fix stack description --- forge-gui-mobile/src/forge/screens/match/views/VStack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge-gui-mobile/src/forge/screens/match/views/VStack.java b/forge-gui-mobile/src/forge/screens/match/views/VStack.java index cada29f48b3..5cd99ead01e 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VStack.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VStack.java @@ -405,7 +405,8 @@ public class VStack extends FDropDown { FONT, foreColor, x, y, w, h, y, h, true, Align.left, true); } else { - String trimFirst = TextUtil.fastReplace("\n" + text.substring(0, index) + text.substring(index + name.length()), "- -", "-"); + String modifier = (text.substring(0, index).length() > 0) ? "CARDNAME" : ""; + String trimFirst = TextUtil.fastReplace("\n" + text.substring(0, index) + modifier + text.substring(index + name.length()), "- -", "-"); String trimSecond = TextUtil.fastReplace(trimFirst, name+" "+cId, name); newtext = TextUtil.fastReplace(trimSecond, " "+cId, name); From e030e28d80ed48a8c778d0aedb51d71f75b18344 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Fri, 5 Mar 2021 01:53:14 +0800 Subject: [PATCH 2/2] [Mobile] Add support for viewing both sides of facedown DFC --- forge-game/src/main/java/forge/game/card/CardView.java | 6 ++++++ forge-gui-mobile/src/forge/card/CardZoom.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/forge-game/src/main/java/forge/game/card/CardView.java b/forge-game/src/main/java/forge/game/card/CardView.java index 1f109c48ed3..70f1caab37e 100644 --- a/forge-game/src/main/java/forge/game/card/CardView.java +++ b/forge-game/src/main/java/forge/game/card/CardView.java @@ -36,6 +36,7 @@ import java.util.Set; public class CardView extends GameEntityView { private static final long serialVersionUID = -3624090829028979255L; + private Card cardbackup; public static CardView get(Card c) { return c == null ? null : c.getView(); @@ -46,6 +47,7 @@ public class CardView extends GameEntityView { return s == null ? null : s.getView(); } + public CardView getBackup() { return cardbackup == null ? null : getCardForUi(cardbackup.getPaperCard()); } public static CardView getCardForUi(IPaperCard pc) { return Card.getCardForUi(pc).getView(); } @@ -765,6 +767,10 @@ public class CardView extends GameEntityView { updateZoneText(c); updateDamage(c); + if (cardbackup == null && !c.isFaceDown() && c.hasBackSide()) { + cardbackup = c.getCardForUi(); + } + boolean isSplitCard = c.isSplitCard(); set(TrackableProperty.Cloned, c.isCloned()); set(TrackableProperty.SplitCard, isSplitCard); diff --git a/forge-gui-mobile/src/forge/card/CardZoom.java b/forge-gui-mobile/src/forge/card/CardZoom.java index 9daeeb46f12..e0b72fea7ec 100644 --- a/forge-gui-mobile/src/forge/card/CardZoom.java +++ b/forge-gui-mobile/src/forge/card/CardZoom.java @@ -180,6 +180,12 @@ public class CardZoom extends FOverlay { return true; } if (flipIconBounds != null && flipIconBounds.contains(x, y)) { + if (currentCard.isFaceDown() && currentCard.getBackup() != null) { + if (currentCard.getBackup().hasBackSide()) { + show(currentCard.getBackup()); + return true; + } + } if (!showBackSide) showAltState = !showAltState; else