diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java index 2024a339a2f..15805b7e4aa 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java @@ -80,8 +80,6 @@ public enum CSubmenuQuestDraft implements ICDoc { new UiCommand() { @Override public void run() { CSubmenuQuestDraft.this.endTournamentAndAwardPrizes(); } }); - System.out.println(FModel.getQuest().getAchievements()); - if (FModel.getQuest().getAchievements().getDraftEvents().isEmpty()) { view.setMode(Mode.EMPTY); } else if (FModel.getQuest().getDraftDecks() == null || !FModel.getQuest().getDraftDecks().contains(QuestEventDraft.DECK_NAME)) { @@ -420,11 +418,11 @@ public enum CSubmenuQuestDraft implements ICDoc { QuestEventDraft draftEvent = SSubmenuQuestUtil.getDraftEvent(); - /*long creditsAvailable = FModel.getQuest().getAssets().getCredits(); + long creditsAvailable = FModel.getQuest().getAssets().getCredits(); if (creditsAvailable < draftEvent.getEntryFee()) { FOptionPane.showMessageDialog("You need " + NUMBER_FORMATTER.format(draftEvent.getEntryFee() - creditsAvailable) + " more credits to enter this tournament.", "Not Enough Credits"); return; - }*/ + } boolean okayToEnter = FOptionPane.showConfirmDialog("This tournament costs " + draftEvent.getEntryFee() + " credits to enter.\nAre you sure you wish to enter?", "Enter Draft Tournament?"); diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestDraftUtils.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestDraftUtils.java index 6b992185988..444c8c4ee33 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestDraftUtils.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestDraftUtils.java @@ -56,7 +56,7 @@ public class QuestDraftUtils { } switch (currentSet) { - + case 7: addMatchup(0, 1, draft); addMatchup(2, 3, draft); @@ -64,11 +64,30 @@ public class QuestDraftUtils { addMatchup(6, 7, draft); break; + case 8: + addMatchup(2, 3, draft); + addMatchup(4, 5, draft); + addMatchup(6, 7, draft); + break; + + case 9: + addMatchup(4, 5, draft); + addMatchup(6, 7, draft); + break; + + case 10: + addMatchup(6, 7, draft); + break; + case 11: addMatchup(8, 9, draft); addMatchup(10, 11, draft); break; + case 12: + addMatchup(10, 11, draft); + break; + case 13: addMatchup(12, 13, draft); break;