From 306f797bf2675c66cdf9850aea19cba1f5201dc6 Mon Sep 17 00:00:00 2001 From: Agetian Date: Fri, 19 May 2017 15:47:37 +0000 Subject: [PATCH] - Quest Draft Tournaments always run in "Simulate AI vs. AI Results" mode on mobile Forge, since this is the only mode that works correctly on Mobile without hanging the game (temporarily removed the relevant setting from Mobile Forge preferences page not to confuse the player). - If QDTs are improved to the degree where non-simulated matches can run correctly, this functionality can be restored. --- .../src/forge/screens/quest/QuestPrefsScreen.java | 5 +++-- .../src/forge/screens/quest/QuestTournamentsScreen.java | 2 +- forge-gui/src/main/java/forge/quest/QuestDraftUtils.java | 2 +- .../src/main/java/forge/quest/QuestTournamentController.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java index 39aab5193f5..9dd1c205232 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java @@ -92,8 +92,9 @@ public class QuestPrefsScreen extends FScreen { scroller.add(new PrefsOption("Playset Size: Any Number", QPref.PLAYSET_ANY_NUMBER_SIZE, PrefsGroup.SHOP)); //Quest Draft Tournament Preferences - scroller.add(new PrefsHeader("Quest Draft Tournaments", FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_EXPERT)); - scroller.add(new PrefsOption("Simulate AI vs. AI Results", QPref.SIMULATE_AI_VS_AI_RESULTS, PrefsGroup.DRAFT_TOURNAMENTS)); + //NOTE: -- currently this setting is ignored since only the AI vs. AI Simulation mode can be used on mobile without hanging the game. + //scroller.add(new PrefsHeader("Quest Draft Tournaments", FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_ALL)); + //scroller.add(new PrefsOption("Simulate AI vs. AI Results", QPref.SIMULATE_AI_VS_AI_RESULTS, PrefsGroup.DRAFT_TOURNAMENTS)); //Difficulty Adjustments (All) scroller.add(new PrefsHeader("Difficulty Adjustments (All)", FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_ALL)); diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java index 65371603a13..9cae409ad55 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java @@ -251,7 +251,7 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT @Override protected void startMatch() { - if (mode == Mode.TOURNAMENT_ACTIVE && FModel.getQuestPreferences().getPrefInt(QuestPreferences.QPref.SIMULATE_AI_VS_AI_RESULTS) == 1 && QuestDraftUtils.isNextMatchAIvsAI()) { + if (mode == Mode.TOURNAMENT_ACTIVE /*&& FModel.getQuestPreferences().getPrefInt(QuestPreferences.QPref.SIMULATE_AI_VS_AI_RESULTS) == 1*/ && QuestDraftUtils.isNextMatchAIvsAI()) { // Special handling for simulating AI vs. AI match outcome - do not invoke in background thread (since the match is not played out) // and instead revalidate right after the outcome is decided in order to refresh the tournament screen. controller.startNextMatch(); diff --git a/forge-gui/src/main/java/forge/quest/QuestDraftUtils.java b/forge-gui/src/main/java/forge/quest/QuestDraftUtils.java index def7f2ad765..fd31f16e819 100644 --- a/forge-gui/src/main/java/forge/quest/QuestDraftUtils.java +++ b/forge-gui/src/main/java/forge/quest/QuestDraftUtils.java @@ -275,7 +275,7 @@ public class QuestDraftUtils { if (nextMatch.hasHumanPlayer()) { waitForUserInput = true; } else { - if (FModel.getQuestPreferences().getPrefInt(QuestPreferences.QPref.SIMULATE_AI_VS_AI_RESULTS) == 1) { + if (FModel.getQuestPreferences().getPrefInt(QuestPreferences.QPref.SIMULATE_AI_VS_AI_RESULTS) == 1 || GuiBase.getInterface().isLibgdxPort()) { return; } gui.disableOverlay(); diff --git a/forge-gui/src/main/java/forge/quest/QuestTournamentController.java b/forge-gui/src/main/java/forge/quest/QuestTournamentController.java index 9c02f59c8da..2ace16ac4de 100644 --- a/forge-gui/src/main/java/forge/quest/QuestTournamentController.java +++ b/forge-gui/src/main/java/forge/quest/QuestTournamentController.java @@ -458,7 +458,7 @@ public class QuestTournamentController { return; } - if (FModel.getQuestPreferences().getPrefInt(QuestPreferences.QPref.SIMULATE_AI_VS_AI_RESULTS) == 1) { + if (FModel.getQuestPreferences().getPrefInt(QuestPreferences.QPref.SIMULATE_AI_VS_AI_RESULTS) == 1 || GuiBase.getInterface().isLibgdxPort()) { if (!QuestDraftUtils.injectRandomMatchOutcome(false)) { gui = GuiBase.getInterface().getNewGuiGame(); QuestDraftUtils.startNextMatch(gui);