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

- Adding Rat Colony to card limit exceptions in several places.

Browse Source
This commit is contained in:
Agetian
2018-04-23 07:31:39 +03:00
parent 30d4bb923b
commit 1522baa97d
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,7 +179,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
} }
private static final List<String> limitExceptions = Arrays.asList( private static final List<String> limitExceptions = Arrays.asList(
new String[]{"Relentless Rats", "Shadowborn Apostle"}); new String[]{"Relentless Rats", "Shadowborn Apostle", "Rat Colony"});
/** /**
* @return pool of additions allowed to deck * @return pool of additions allowed to deck

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java
View File

@@ -441,7 +441,7 @@ public enum VSubmenuQuestPrefs implements IVSubmenu<CSubmenuQuestPrefs> {
pnlShop.add(new PrefInput(QPref.PLAYSET_BASIC_LAND_SIZE, QuestPreferencesErrType.DIFFICULTY), fieldConstraints + ", wrap"); 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(); 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(infiniteToKeep, labelConstraints);
pnlShop.add(new PrefInput(QPref.PLAYSET_ANY_NUMBER_SIZE, QuestPreferencesErrType.DIFFICULTY), fieldConstraints + ", wrap"); pnlShop.add(new PrefInput(QPref.PLAYSET_ANY_NUMBER_SIZE, QuestPreferencesErrType.DIFFICULTY), fieldConstraints + ", wrap");

2
forge-gui-mobile/src/forge/deck/FDeckEditor.java
View File

@@ -719,7 +719,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
protected abstract void buildMenu(final FDropDownMenu menu, final PaperCard card); protected abstract void buildMenu(final FDropDownMenu menu, final PaperCard card);
private static final List<String> limitExceptions = Arrays.asList( private static final List<String> limitExceptions = Arrays.asList(
new String[]{"Relentless Rats", "Shadowborn Apostle"}); new String[]{"Relentless Rats", "Shadowborn Apostle", "Rat Colony"});
private ItemPool<PaperCard> getAllowedAdditions(Iterable<Entry<PaperCard, Integer>> itemsToAdd, boolean isAddSource) { private ItemPool<PaperCard> getAllowedAdditions(Iterable<Entry<PaperCard, Integer>> itemsToAdd, boolean isAddSource) {
ItemPool<PaperCard> additions = new ItemPool<PaperCard>(cardManager.getGenericType()); ItemPool<PaperCard> additions = new ItemPool<PaperCard>(cardManager.getGenericType());

3
forge-gui/src/main/java/forge/quest/QuestSpellShop.java
View File

@@ -345,7 +345,8 @@ public class QuestSpellShop {
PaperCard card = (PaperCard)item.getKey(); PaperCard card = (PaperCard)item.getKey();
int numToKeep = card.getRules().getType().isBasic() ? int numToKeep = card.getRules().getType().isBasic() ?
FModel.getQuestPreferences().getPrefInt(QPref.PLAYSET_BASIC_LAND_SIZE) : FModel.getQuestPreferences().getPrefInt(QPref.PLAYSET_SIZE); 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); numToKeep = FModel.getQuestPreferences().getPrefInt(QPref.PLAYSET_ANY_NUMBER_SIZE);
} }
if (numToKeep < item.getValue()) { if (numToKeep < item.getValue()) {