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

[Mobile] Fix planar conquest deck edit

Browse Source
This commit is contained in:
Anthony Calosa
2021-11-22 10:31:53 +08:00
parent 72bead4941
commit dac5d73955
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-adventure/src/main/java/forge/adventure/Main.java
View File

@@ -37,6 +37,7 @@ import java.nio.file.Paths;
isPortraitMode = true; isPortraitMode = true;
totalDeviceRAM = 0; totalDeviceRAM = 0;
GuiBase.setDeviceInfo("", "", 0, 0); GuiBase.setDeviceInfo("", "", 0, 0);
GuiBase.setIsAdventureMode(true);
} }

6
forge-gui-mobile/src/forge/deck/FDeckEditor.java
View File

@@ -16,6 +16,7 @@ import forge.deck.io.DeckPreferences;
import forge.gamemodes.limited.BoosterDraft; import forge.gamemodes.limited.BoosterDraft;
import forge.gamemodes.planarconquest.ConquestUtil; import forge.gamemodes.planarconquest.ConquestUtil;
import forge.gui.FThreads; import forge.gui.FThreads;
import forge.gui.GuiBase;
import forge.gui.card.CardPreferences; import forge.gui.card.CardPreferences;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.itemmanager.CardManager; import forge.itemmanager.CardManager;
@@ -768,7 +769,10 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
} }
protected void initialize() { 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() { protected boolean canAddCards() {

4
forge-gui/src/main/java/forge/gui/GuiBase.java
View File

@@ -7,6 +7,7 @@ public class GuiBase {
private static boolean propertyConfig = true; private static boolean propertyConfig = true;
private static boolean networkplay = false; private static boolean networkplay = false;
private static boolean isAndroidport = false; private static boolean isAndroidport = false;
private static boolean isAdventureMode = false;
private static boolean interrupted = false; private static boolean interrupted = false;
private static String deviceName = ""; private static String deviceName = "";
private static String androidRelease = ""; private static String androidRelease = "";
@@ -20,6 +21,9 @@ public class GuiBase {
public static void setIsAndroid(boolean value) { isAndroidport = value; } public static void setIsAndroid(boolean value) { isAndroidport = value; }
public static boolean isAndroid() { return isAndroidport; } 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 void setUsingAppDirectory(boolean value) { usingAppDirectory = value; }
public static boolean isUsingAppDirectory() { return usingAppDirectory; } public static boolean isUsingAppDirectory() { return usingAppDirectory; }