mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 11:18:01 +00:00
Make loading quest work better
This commit is contained in:
@@ -46,7 +46,7 @@ public class HomeScreen extends FScreen {
|
||||
addButton("Quest Mode", new FEventHandler() {
|
||||
@Override
|
||||
public void handleEvent(FEvent e) {
|
||||
QuestMenu.launchQuestMode();
|
||||
QuestMenu.launchQuestMode(false);
|
||||
}
|
||||
}, true);
|
||||
addButton("Gauntlets", new FEventHandler() {
|
||||
|
||||
@@ -167,7 +167,7 @@ public class LoadQuestScreen extends FScreen {
|
||||
FModel.getQuestPreferences().setPref(QPref.CURRENT_QUEST,
|
||||
lstQuests.getSelectedQuest().getName() + ".dat");
|
||||
FModel.getQuestPreferences().save();
|
||||
QuestMenu.launchQuestMode();
|
||||
QuestMenu.launchQuestMode(true);
|
||||
}
|
||||
|
||||
private void renameQuest(final QuestData quest) {
|
||||
|
||||
@@ -536,7 +536,7 @@ public class NewQuestScreen extends FScreen {
|
||||
FModel.getQuestPreferences().setPref(QPref.CURRENT_QUEST, questName + ".dat");
|
||||
FModel.getQuestPreferences().save();
|
||||
|
||||
QuestMenu.launchQuestMode(); //launch quest mode for new quest
|
||||
QuestMenu.launchQuestMode(true); //launch quest mode for new quest
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats {
|
||||
private QuestMenu() {
|
||||
}
|
||||
|
||||
public static void launchQuestMode() {
|
||||
public static void launchQuestMode(final boolean fromQuestChange) {
|
||||
//attempt to load current quest
|
||||
final File dirQuests = new File(ForgeConstants.QUEST_SAVE_DIR);
|
||||
final String questname = FModel.getQuestPreferences().getPref(QPref.CURRENT_QUEST);
|
||||
@@ -128,11 +128,16 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats {
|
||||
@Override
|
||||
public void run() {
|
||||
FModel.getQuest().load(QuestDataIO.loadData(data));
|
||||
duelsScreen.update();
|
||||
challengesScreen.update();
|
||||
tournamentsScreen.update();
|
||||
decksScreen.refreshDecks();
|
||||
Forge.openScreen(duelsScreen); //TODO: Consider opening most recent quest view
|
||||
if (fromQuestChange) {
|
||||
duelsScreen.update();
|
||||
challengesScreen.update();
|
||||
tournamentsScreen.update();
|
||||
decksScreen.refreshDecks();
|
||||
Forge.back();
|
||||
}
|
||||
else {
|
||||
Forge.openScreen(duelsScreen); //TODO: Consider opening most recent quest view
|
||||
}
|
||||
}
|
||||
});
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user