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

fix bugs in minimal set calculation.

Browse Source 
added that column to itemmanager
This commit is contained in:
Maxmtg
2014-01-25 16:29:56 +00:00
parent 7d2cc8fac5
commit 11c205f0c9
5 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-core/src/main/java/forge/card/CardDb.java
View File

@@ -214,15 +214,15 @@ public final class CardDb implements ICardDatabase {
List<PaperCard> cards = this.allCardsByName.get(cardName);
int sz = cards.size();
if( fromSet == SetPreference.Earliest ) {
if( fromSet == SetPreference.Latest ) {
for(int i = 0 ; i < sz ; i++)
if( printedBefore == null || editions.get(cards.get(i).getEdition()).getDate().after(printedBefore) )
return cards.get(i);
return null;
} else if( fromSet == SetPreference.Latest || fromSet == null || fromSet == SetPreference.Random ) {
} else if( fromSet == SetPreference.Earliest || fromSet == null || fromSet == SetPreference.Random ) {
for(int i = sz - 1 ; i >= 0 ; i--)
if( printedBefore == null || editions.get(cards.get(i).getEdition()).getDate().after(printedBefore) ) {
if( fromSet == SetPreference.Latest )
if( fromSet == SetPreference.Earliest )
return cards.get(i);
return cards.get(MyRandom.getRandom().nextInt(i+1));
}

11
forge-core/src/main/java/forge/card/CardEdition.java
View File

@@ -420,12 +420,15 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
minEditions.add(cp.getEdition());
}
CardEdition earliestOne = null;
for(CardEdition ed : getOrderedEditions()) {
if( minEditions.contains(ed.getCode()) )
earliestOne = ed;
if( minEditions.contains(ed.getCode()) && ( ed.getType() == Type.CORE || ed.getType() == Type.EXPANSION ) )
return ed;
}
return earliestOne;
for(CardEdition ed : getOrderedEditions()) {
if(minEditions.contains(ed.getCode()))
return ed;
}
return UNKNOWN;
}
}
public static class Predicates {