external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
[Mobile] Add support for viewing both sides of facedown DFC

See merge request core-developers/forge!4102
This commit is contained in:
Michael Kamensky
2021-03-04 18:02:25 +00:00
parent 22a2263247 317a2ed7a4
commit 7adf6f7934
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/card/CardView.java
View File

@@ -36,6 +36,7 @@ import java.util.Set;
public class CardView extends GameEntityView { public class CardView extends GameEntityView {
private static final long serialVersionUID = -3624090829028979255L; private static final long serialVersionUID = -3624090829028979255L;
private Card cardbackup;
public static CardView get(Card c) { public static CardView get(Card c) {
return c == null ? null : c.getView(); return c == null ? null : c.getView();
@@ -46,6 +47,7 @@ public class CardView extends GameEntityView {
return s == null ? null : s.getView(); return s == null ? null : s.getView();
} }
public CardView getBackup() { return cardbackup == null ? null : getCardForUi(cardbackup.getPaperCard()); }
public static CardView getCardForUi(IPaperCard pc) { public static CardView getCardForUi(IPaperCard pc) {
return Card.getCardForUi(pc).getView(); return Card.getCardForUi(pc).getView();
} }
@@ -765,6 +767,10 @@ public class CardView extends GameEntityView {
updateZoneText(c); updateZoneText(c);
updateDamage(c); updateDamage(c);
if (cardbackup == null && !c.isFaceDown() && c.hasBackSide()) {
cardbackup = c.getCardForUi();
}
boolean isSplitCard = c.isSplitCard(); boolean isSplitCard = c.isSplitCard();
set(TrackableProperty.Cloned, c.isCloned()); set(TrackableProperty.Cloned, c.isCloned());
set(TrackableProperty.SplitCard, isSplitCard); set(TrackableProperty.SplitCard, isSplitCard);

6
forge-gui-mobile/src/forge/card/CardZoom.java
View File

@@ -180,6 +180,12 @@ public class CardZoom extends FOverlay {
return true; return true;
} }
if (flipIconBounds != null && flipIconBounds.contains(x, y)) { if (flipIconBounds != null && flipIconBounds.contains(x, y)) {
if (currentCard.isFaceDown() && currentCard.getBackup() != null) {
if (currentCard.getBackup().hasBackSide()) {
show(currentCard.getBackup());
return true;
}
}
if (!showBackSide) if (!showBackSide)
showAltState = !showAltState; showAltState = !showAltState;
else else