From dac5d7395529e3c30ff895c6ddfd1cfe52e40651 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Mon, 22 Nov 2021 10:31:53 +0800
Subject: [PATCH] [Mobile] Fix planar conquest deck edit

---
 forge-adventure/src/main/java/forge/adventure/Main.java | 1 +
 forge-gui-mobile/src/forge/deck/FDeckEditor.java        | 6 +++++-
 forge-gui/src/main/java/forge/gui/GuiBase.java          | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/forge-adventure/src/main/java/forge/adventure/Main.java b/forge-adventure/src/main/java/forge/adventure/Main.java
index cf858088814..1c8a7994541 100644
--- a/forge-adventure/src/main/java/forge/adventure/Main.java
+++ b/forge-adventure/src/main/java/forge/adventure/Main.java
@@ -37,6 +37,7 @@ import java.nio.file.Paths;
         isPortraitMode = true;
         totalDeviceRAM = 0;
         GuiBase.setDeviceInfo("", "", 0, 0);
+        GuiBase.setIsAdventureMode(true);
 
     }
 
diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java
index 6e11ea051ca..04e97b50be8 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java
@@ -16,6 +16,7 @@ import forge.deck.io.DeckPreferences;
 import forge.gamemodes.limited.BoosterDraft;
 import forge.gamemodes.planarconquest.ConquestUtil;
 import forge.gui.FThreads;
+import forge.gui.GuiBase;
 import forge.gui.card.CardPreferences;
 import forge.item.PaperCard;
 import forge.itemmanager.CardManager;
@@ -768,7 +769,10 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
         }
 
         protected void initialize() {
-            cardManager.setup(config);
+            if (GuiBase.isAdventureMode())
+                cardManager.setup(config);
+            else //fix planar conquest deck editor and maybe others...
+                cardManager.setup(config, parentScreen.getColOverrides(config));
         }
 
         protected boolean canAddCards() {
diff --git a/forge-gui/src/main/java/forge/gui/GuiBase.java b/forge-gui/src/main/java/forge/gui/GuiBase.java
index b10afbacfce..87717870332 100644
--- a/forge-gui/src/main/java/forge/gui/GuiBase.java
+++ b/forge-gui/src/main/java/forge/gui/GuiBase.java
@@ -7,6 +7,7 @@ public class GuiBase {
     private static boolean propertyConfig = true;
     private static boolean networkplay = false;
     private static boolean isAndroidport = false;
+    private static boolean isAdventureMode = false;
     private static boolean interrupted = false;
     private static String deviceName = "";
     private static String androidRelease = "";
@@ -20,6 +21,9 @@ public class GuiBase {
     public static void setIsAndroid(boolean value) { isAndroidport = value; }
     public static boolean isAndroid() { return isAndroidport; }
 
+    public static void setIsAdventureMode(boolean value) { isAdventureMode = value; }
+    public static boolean isAdventureMode() { return isAdventureMode; }
+
     public static void setUsingAppDirectory(boolean value) { usingAppDirectory = value; }
     public static boolean isUsingAppDirectory() { return usingAppDirectory; }