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

rollback changes to Deck, ManaCost, StorageBase, CardPool

Browse Source
This commit is contained in:
Maxmtg
2014-01-13 18:21:29 +00:00
parent 10fd05478d
commit 42cf0def0f
8 changed files with 43 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
forge-game/src/main/java/forge/game/GameFormat.java
View File

@@ -21,10 +21,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
@@ -33,6 +30,7 @@ import com.google.common.collect.Lists;
import forge.StaticData;
import forge.card.CardEdition;
import forge.deck.Deck;
import forge.item.PaperCard;
import forge.item.IPaperCard;
import forge.util.FileSection;
@@ -73,6 +71,8 @@ public class GameFormat implements Comparable<GameFormat> {
this(fName, sets, bannedCards, 0);
}
public static final GameFormat NoFormat = new GameFormat("(none)", null, null, Integer.MAX_VALUE);
public GameFormat(final String fName, final Iterable<String> sets, final List<String> bannedCards, int compareIdx) {
this.index = compareIdx;
this.name = fName;
@@ -219,15 +219,8 @@ public class GameFormat implements Comparable<GameFormat> {
}
public static class Collection extends StorageBase<GameFormat> {
private final Map<String, Predicate<PaperCard>> formatPredicates;
public Collection(StorageReaderBase<GameFormat> reader) {
super("Format collections", reader);
formatPredicates = new HashMap<String, Predicate<PaperCard>>();
for (Entry<String, GameFormat> format : this.entrySet()) {
formatPredicates.put(format.getKey(), format.getValue().getFilterRules()); //allow reprints
}
}
public GameFormat getStandard() {
@@ -246,8 +239,13 @@ public class GameFormat implements Comparable<GameFormat> {
return this.map.get(format);
}
public Map<String, Predicate<PaperCard>> getFormatPredicates() {
return this.formatPredicates;
public GameFormat getFormatOfDeck(Deck deck) {
for(GameFormat gf : this) {
if ( Deck.createPredicate(gf.getFilterRules()).apply(deck) )
return gf;
}
return NoFormat;
}
}