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

Can now continue interrupted tournaments.

Browse Source 
Now enforcing credit requirements for entry to tournaments.
This commit is contained in:
Krazy
2014-06-01 05:08:13 +00:00
parent d7da319aa5
commit 3d19965896
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,8 +80,6 @@ public enum CSubmenuQuestDraft implements ICDoc {
new UiCommand() { @Override new UiCommand() { @Override
public void run() { CSubmenuQuestDraft.this.endTournamentAndAwardPrizes(); } }); public void run() { CSubmenuQuestDraft.this.endTournamentAndAwardPrizes(); } });
System.out.println(FModel.getQuest().getAchievements());
if (FModel.getQuest().getAchievements().getDraftEvents().isEmpty()) { if (FModel.getQuest().getAchievements().getDraftEvents().isEmpty()) {
view.setMode(Mode.EMPTY); view.setMode(Mode.EMPTY);
} else if (FModel.getQuest().getDraftDecks() == null || !FModel.getQuest().getDraftDecks().contains(QuestEventDraft.DECK_NAME)) { } 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(); QuestEventDraft draftEvent = SSubmenuQuestUtil.getDraftEvent();
/*long creditsAvailable = FModel.getQuest().getAssets().getCredits(); long creditsAvailable = FModel.getQuest().getAssets().getCredits();
if (creditsAvailable < draftEvent.getEntryFee()) { if (creditsAvailable < draftEvent.getEntryFee()) {
FOptionPane.showMessageDialog("You need " + NUMBER_FORMATTER.format(draftEvent.getEntryFee() - creditsAvailable) + " more credits to enter this tournament.", "Not Enough Credits"); FOptionPane.showMessageDialog("You need " + NUMBER_FORMATTER.format(draftEvent.getEntryFee() - creditsAvailable) + " more credits to enter this tournament.", "Not Enough Credits");
return; return;
}*/ }
boolean okayToEnter = FOptionPane.showConfirmDialog("This tournament costs " + draftEvent.getEntryFee() + " credits to enter.\nAre you sure you wish to enter?", "Enter Draft Tournament?"); boolean okayToEnter = FOptionPane.showConfirmDialog("This tournament costs " + draftEvent.getEntryFee() + " credits to enter.\nAre you sure you wish to enter?", "Enter Draft Tournament?");

21
forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestDraftUtils.java
View File

@@ -56,7 +56,7 @@ public class QuestDraftUtils {
} }
switch (currentSet) { switch (currentSet) {
case 7: case 7:
addMatchup(0, 1, draft); addMatchup(0, 1, draft);
addMatchup(2, 3, draft); addMatchup(2, 3, draft);
@@ -64,11 +64,30 @@ public class QuestDraftUtils {
addMatchup(6, 7, draft); addMatchup(6, 7, draft);
break; 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: case 11:
addMatchup(8, 9, draft); addMatchup(8, 9, draft);
addMatchup(10, 11, draft); addMatchup(10, 11, draft);
break; break;
case 12:
addMatchup(10, 11, draft);
break;
case 13: case 13:
addMatchup(12, 13, draft); addMatchup(12, 13, draft);
break; break;