From 0e65ad2ebf7353d54fcdcdec55eef14bceaf10d2 Mon Sep 17 00:00:00 2001 From: myk Date: Tue, 5 Feb 2013 10:36:35 +0000 Subject: [PATCH] Sell lands down to 50 when selling all extras in the card shop --- .../gui/deckeditor/controllers/CEditorQuestCardShop.java | 9 +++++---- .../java/forge/gui/deckeditor/views/VCurrentDeck.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java b/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java index 3ede1b13992..f852f848fbb 100644 --- a/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java +++ b/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java @@ -431,15 +431,16 @@ public final class CEditorQuestCardShop extends ACEditorBase> cardsToRemove = new LinkedList>(); for (Map.Entry item : getTableDeck().getCards()) { - if (4 < item.getValue() && CardRarity.BasicLand != ((CardPrinted)item.getKey()).getRarity()) { - cardsToRemove.add(Pair.of(item.getKey(), item.getValue() - 4)); + int numToKeep = CardRarity.BasicLand == ((CardPrinted)item.getKey()).getRarity() ? 50 : 4; + if (numToKeep < item.getValue()) { + cardsToRemove.add(Pair.of(item.getKey(), item.getValue() - numToKeep)); } } removeCards(cardsToRemove); diff --git a/src/main/java/forge/gui/deckeditor/views/VCurrentDeck.java b/src/main/java/forge/gui/deckeditor/views/VCurrentDeck.java index 7f51f96870c..4a79796f902 100644 --- a/src/main/java/forge/gui/deckeditor/views/VCurrentDeck.java +++ b/src/main/java/forge/gui/deckeditor/views/VCurrentDeck.java @@ -86,7 +86,7 @@ public enum VCurrentDeck implements IVDoc, ITableContainer { private final FLabel btnRemove = new FLabel.Builder() .fontSize(14) .text("Remove card") - .tooltip("Remove selected card to current deck (or double click the row)") + .tooltip("Remove selected card from current deck (or double click the row or hit the spacebar)") .icon(FSkin.getIcon(FSkin.InterfaceIcons.ICO_MINUS)) .iconScaleAuto(false).hoverable(true).build();