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

Fixes for old quests not working with tournaments.

Browse Source
This commit is contained in:
Krazy
2014-06-08 19:15:40 +00:00
parent c12aee1354
commit ea646ff9ad
5 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java
View File

@@ -117,7 +117,7 @@ public final class CEditorQuestLimited extends ACEditorBase<PaperCard, DeckGroup
return new DeckGroup("");
}
};
this.controller = new DeckController<DeckGroup>(questData0.getDraftDecks(), this, newCreator);
controller.getView().getDeckManager().setup(ItemManagerConfig.DRAFT_POOL);
controller.setModel(questData0.getDraftDecks().get(QuestEventDraft.DECK_NAME));
@@ -271,6 +271,7 @@ public final class CEditorQuestLimited extends ACEditorBase<PaperCard, DeckGroup
FModel.getQuest().save();
return true;
}
FModel.getQuest().save();
return false;
}

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

@@ -93,6 +93,7 @@ public enum CSubmenuQuestDraft implements ICDoc {
public void run() { CSubmenuQuestDraft.this.endTournamentAndAwardPrizes(); } });
QuestAchievements achievements = FModel.getQuest().getAchievements();
FModel.getQuest().getDraftDecks();
if (achievements == null) {
view.setMode(Mode.EMPTY);
@@ -533,10 +534,10 @@ public enum CSubmenuQuestDraft implements ICDoc {
QuestEventDraft draftEvent = SSubmenuQuestUtil.getDraftEvent();
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", FSkin.getImage(FSkinProp.ICO_WARNING).scale(2.0));
return;
}
}*/
boolean okayToEnter = FOptionPane.showOptionDialog("This tournament costs " + draftEvent.getEntryFee() + " credits to enter.\nAre you sure you wish to enter?", "Enter Draft Tournament?", FSkin.getImage(FSkinProp.ICO_QUEST_GOLD), new String[] { "Yes", "No" }, 1) == 0;
@@ -564,6 +565,8 @@ public enum CSubmenuQuestDraft implements ICDoc {
private void startTournament() {
FModel.getQuest().save();
String message = GameType.QuestDraft.getDecksFormat().getDeckConformanceProblem(FModel.getQuest().getAssets().getDraftDeckStorage().get(QuestEventDraft.DECK_NAME).getHumanDeck());
if (message != null && FModel.getPreferences().getPrefBoolean(FPref.ENFORCE_DECK_LEGALITY)) {
FOptionPane.showMessageDialog(message, "Deck Invalid");