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

Merge branch 'deck-editor' into 'master'

Browse Source 
improve how foiling is done

See merge request core-developers/forge!233
This commit is contained in:
Michael Kamensky
2018-02-19 04:27:28 +00:00
parent 96d1777132 f6bd725633
commit 21e682f54d
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
View File

@@ -510,10 +510,8 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
quantity = GuiChoose.getInteger("Choose a value for X", 1, -quantity, 20); quantity = GuiChoose.getInteger("Choose a value for X", 1, -quantity, 20);
if (quantity == null) { return; } if (quantity == null) { return; }
} }
// remove *quantity* instances of existing card
CDeckEditorUI.SINGLETON_INSTANCE.removeSelectedCards(false, quantity);
// get the currently selected card from the editor // get the currently selected card from the editor
CardManager cardManager = (CardManager) CDeckEditorUI.SINGLETON_INSTANCE.getCurrentEditorController().getCatalogManager(); CardManager cardManager = (CardManager) CDeckEditorUI.SINGLETON_INSTANCE.getCurrentEditorController().getDeckManager();
PaperCard existingCard = cardManager.getSelectedItem(); PaperCard existingCard = cardManager.getSelectedItem();
// make a foiled version based on the original // make a foiled version based on the original
PaperCard foiledCard = new PaperCard( PaperCard foiledCard = new PaperCard(
@@ -522,12 +520,11 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
existingCard.getRarity(), existingCard.getRarity(),
existingCard.getArtIndex(), existingCard.getArtIndex(),
true); true);
// bounce the new card through the inventory and *quantity* into the deck // remove *quantity* instances of existing card
cardManager.addItem(foiledCard, 1); CDeckEditorUI.SINGLETON_INSTANCE.removeSelectedCards(false, quantity);
// add *quantity* into the deck and set them as selected
cardManager.addItem(foiledCard, quantity);
cardManager.setSelectedItem(foiledCard); cardManager.setSelectedItem(foiledCard);
CDeckEditorUI.SINGLETON_INSTANCE.addSelectedCards(false, quantity);
// clean up the inventory
cardManager.removeItem(foiledCard, 1);
} }
}, true, shortcutModifiers == 0); }, true, shortcutModifiers == 0);
} }