From 1522baa97d1f8292a19ff8cb411f7e8947fc6a19 Mon Sep 17 00:00:00 2001 From: Agetian Date: Mon, 23 Apr 2018 07:31:39 +0300 Subject: [PATCH] - Adding Rat Colony to card limit exceptions in several places. --- .../forge/screens/deckeditor/controllers/ACEditorBase.java | 2 +- .../main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java | 2 +- forge-gui-mobile/src/forge/deck/FDeckEditor.java | 2 +- forge-gui/src/main/java/forge/quest/QuestSpellShop.java | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java index c83a5eff4ef..eacc8abf6d1 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java @@ -179,7 +179,7 @@ public abstract class ACEditorBase limitExceptions = Arrays.asList( - new String[]{"Relentless Rats", "Shadowborn Apostle"}); + new String[]{"Relentless Rats", "Shadowborn Apostle", "Rat Colony"}); /** * @return pool of additions allowed to deck diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java index d477155be8d..2f3c2c66a82 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java @@ -441,7 +441,7 @@ public enum VSubmenuQuestPrefs implements IVSubmenu { pnlShop.add(new PrefInput(QPref.PLAYSET_BASIC_LAND_SIZE, QuestPreferencesErrType.DIFFICULTY), fieldConstraints + ", wrap"); FLabel infiniteToKeep = new FLabel.Builder().text("Playset Size: Any Number").fontAlign(SwingConstants.RIGHT).build(); - infiniteToKeep.setToolTipText("The number of copies of Relentless Rats or Shadowborn Apostles to keep before selling extras."); + infiniteToKeep.setToolTipText("The number of copies of Relentless Rats or other similar cards with no limit to keep before selling extras."); pnlShop.add(infiniteToKeep, labelConstraints); pnlShop.add(new PrefInput(QPref.PLAYSET_ANY_NUMBER_SIZE, QuestPreferencesErrType.DIFFICULTY), fieldConstraints + ", wrap"); diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java index 404021778a2..c4b4bac6f3c 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java +++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java @@ -719,7 +719,7 @@ public class FDeckEditor extends TabPageScreen { protected abstract void buildMenu(final FDropDownMenu menu, final PaperCard card); private static final List limitExceptions = Arrays.asList( - new String[]{"Relentless Rats", "Shadowborn Apostle"}); + new String[]{"Relentless Rats", "Shadowborn Apostle", "Rat Colony"}); private ItemPool getAllowedAdditions(Iterable> itemsToAdd, boolean isAddSource) { ItemPool additions = new ItemPool(cardManager.getGenericType()); diff --git a/forge-gui/src/main/java/forge/quest/QuestSpellShop.java b/forge-gui/src/main/java/forge/quest/QuestSpellShop.java index 85cc71b6b10..2ec911003f8 100644 --- a/forge-gui/src/main/java/forge/quest/QuestSpellShop.java +++ b/forge-gui/src/main/java/forge/quest/QuestSpellShop.java @@ -345,7 +345,8 @@ public class QuestSpellShop { PaperCard card = (PaperCard)item.getKey(); int numToKeep = card.getRules().getType().isBasic() ? FModel.getQuestPreferences().getPrefInt(QPref.PLAYSET_BASIC_LAND_SIZE) : FModel.getQuestPreferences().getPrefInt(QPref.PLAYSET_SIZE); - if (card.getName().equals("Relentless Rats") || card.getName().equals("Shadowborn Apostle")) { + if (card.getName().equals("Relentless Rats") || card.getName().equals("Shadowborn Apostle") + || card.getName().equals("Rat Colony")) { numToKeep = FModel.getQuestPreferences().getPrefInt(QPref.PLAYSET_ANY_NUMBER_SIZE); } if (numToKeep < item.getValue()) {