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

Edit deck stage of draft tournaments now persists between loading and saving quests.

Browse Source
This commit is contained in:
Krazy
2014-05-31 21:53:51 +00:00
parent 289e1c35c5
commit e05948fb99
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java
View File

@@ -66,7 +66,7 @@ public enum CSubmenuQuestDraft implements ICDoc {
if (FModel.getQuest().getDraftDecks() == null || !FModel.getQuest().getDraftDecks().contains(QuestEventDraft.DECK_NAME)) {
view.setMode(Mode.SELECT_TOURNAMENT);
} else if (!FModel.getQuest().getAchievements().isTournamentActive()) {
} else if (!FModel.getQuest().getAchievements().isTournamentStarted()) {
view.setMode(Mode.PREPARE_DECK);
} else {
view.setMode(Mode.TOURNAMENT_ACTIVE);
@@ -339,10 +339,21 @@ public enum CSubmenuQuestDraft implements ICDoc {
}
private void startTournament() {
boolean okayToStart = FOptionPane.showConfirmDialog("You will not be able to edit your deck once you start the tournament.\nAre you sure you wish to continue?", "Start Tournament?");
if (!okayToStart) {
return;
}
FModel.getQuest().getAchievements().setTournamentStarted(true);
FModel.getQuest().save();
VSubmenuQuestDraft.SINGLETON_INSTANCE.setMode(Mode.TOURNAMENT_ACTIVE);
VSubmenuQuestDraft.SINGLETON_INSTANCE.populate();
update();
// TODO All the stuff needed for the tournament itself
}
private Deck copyDeck(final Deck deck) {

11
forge-gui/src/main/java/forge/quest/data/QuestAchievements.java
View File

@@ -30,6 +30,8 @@ public class QuestAchievements {
private int winstreakCurrent = 0;
private int lost;
private boolean tournamentStarted = false;
// Difficulty - will store only index from now.
private int difficulty;
@@ -49,6 +51,7 @@ public class QuestAchievements {
drafts.remove(drafts.get(currentDraft));
currentDraft = -1;
winCountAtEndOfDraft = win;
tournamentStarted = false;
FModel.getQuest().save();
}
@@ -204,8 +207,8 @@ public class QuestAchievements {
return drafts;
}
public boolean isTournamentActive() {
return currentDraft >= 0;
public boolean isTournamentStarted() {
return currentDraft >= 0 && tournamentStarted;
}
public void generateNewTournaments() {
@@ -244,4 +247,8 @@ public class QuestAchievements {
return drafts.get(currentDraft);
}
public void setTournamentStarted(final boolean started) {
tournamentStarted = started;
}
}