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

Fix a couple more issues with drafting

Browse Source
This commit is contained in:
drdev
2013-10-27 03:46:20 +00:00
parent e9e1caf9d1
commit 48013b9339
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java
View File

@@ -214,6 +214,7 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> {
finishedDraft.addAiDecks(computer); finishedDraft.addAiDecks(computer);
Singletons.getModel().getDecks().getDraft().add(finishedDraft); Singletons.getModel().getDecks().getDraft().add(finishedDraft);
CSubmenuDraft.SINGLETON_INSTANCE.update();
Singletons.getControl().setCurrentScreen(FScreen.DECK_EDITOR_DRAFT); Singletons.getControl().setCurrentScreen(FScreen.DECK_EDITOR_DRAFT);
CDeckEditorUI.SINGLETON_INSTANCE.setEditorController(new CEditorLimited(Singletons.getModel().getDecks().getDraft(), FScreen.DECK_EDITOR_DRAFT)); CDeckEditorUI.SINGLETON_INSTANCE.setEditorController(new CEditorLimited(Singletons.getModel().getDecks().getDraft(), FScreen.DECK_EDITOR_DRAFT));
@@ -255,10 +256,13 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> {
ccAddLabel = VCardCatalog.SINGLETON_INSTANCE.getBtnAdd().getText(); ccAddLabel = VCardCatalog.SINGLETON_INSTANCE.getBtnAdd().getText();
VCardCatalog.SINGLETON_INSTANCE.getBtnAdd().setText("Choose Card"); VCardCatalog.SINGLETON_INSTANCE.getBtnAdd().setText("Choose Card");
if (this.getDeckManager().getPool() == null) { //avoid showing next choice or resetting pool if just switching back to Draft screen
this.showChoices(this.boosterDraft.nextChoice()); this.showChoices(this.boosterDraft.nextChoice());
if (this.getDeckManager().getPool() == null) {
this.getDeckManager().setPool((Iterable<InventoryItem>) null); this.getDeckManager().setPool((Iterable<InventoryItem>) null);
} }
else {
this.showChoices(this.getCatalogManager().getPool());
}
//Remove buttons //Remove buttons
VCardCatalog.SINGLETON_INSTANCE.getBtnAdd4().setVisible(false); VCardCatalog.SINGLETON_INSTANCE.getBtnAdd4().setVisible(false);
@@ -289,8 +293,6 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> {
*/ */
@Override @Override
public void resetUIChanges() { public void resetUIChanges() {
CSubmenuDraft.SINGLETON_INSTANCE.update();
//Re-rename buttons //Re-rename buttons
VCardCatalog.SINGLETON_INSTANCE.getBtnAdd().setText(ccAddLabel); VCardCatalog.SINGLETON_INSTANCE.getBtnAdd().setText(ccAddLabel);