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

Uses more reliable way to detect sets with all basic lands present

Browse Source
This commit is contained in:
Maxmtg
2013-06-16 21:41:40 +00:00
parent 56df11005b
commit 5506af61ab
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/card/CardEdition.java
View File

@@ -32,6 +32,7 @@ import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.Constant;
import forge.Singletons; import forge.Singletons;
import forge.game.GameFormat; import forge.game.GameFormat;
import forge.util.FileSection; import forge.util.FileSection;
@@ -247,7 +248,11 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
public static final Predicate<CardEdition> hasBasicLands = new Predicate<CardEdition>() { public static final Predicate<CardEdition> hasBasicLands = new Predicate<CardEdition>() {
@Override @Override
public boolean apply(CardEdition ed) { public boolean apply(CardEdition ed) {
return null != CardDb.instance().tryGetCard("Plains", ed.getCode(), 0); for(String landName : Constant.Color.BASIC_LANDS) {
if (null == CardDb.instance().tryGetCard(landName, ed.getCode(), 0))
return false;
}
return true;
}; };
}; };

9
src/main/java/forge/quest/QuestUtilCards.java
View File

@@ -98,9 +98,12 @@ public final class QuestUtilCards {
if (usedFormat != null) { if (usedFormat != null) {
List<String> availableEditions = usedFormat.getAllowedSetCodes(); List<String> availableEditions = usedFormat.getAllowedSetCodes();
for (String edition : availableEditions) {
if (null != db.tryGetCard("Plains", edition)) { for (String edCode : availableEditions) {
landCodes.add(edition); CardEdition ed = Singletons.getModel().getEditions().get(edCode);
// Duel decks might have only 2 types of basic lands
if( CardEdition.Predicates.hasBasicLands.apply(ed) ) {
landCodes.add(edCode);
} }
} }
if (usedFormat.isSetLegal("ICE")) { if (usedFormat.isSetLegal("ICE")) {