github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move the custom set flag to setType.

Browse source
This commit is contained in:
Lymia Aluysia 2016-09-24 15:58:43 -05:00
parent d678fc1a59
commit e5af2b843b
No known key found for this signature in database
GPG key ID: DB2E204C989251F7
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/cards/ExpansionSet.java
View file

@ -68,8 +68,6 @@ public abstract class ExpansionSet implements Serializable {
protected String packageName; protected String packageName;
protected int maxCardNumberInBooster; // used to ommit cards with collector numbers beyond the regular cards in a set for boosters protected int maxCardNumberInBooster; // used to ommit cards with collector numbers beyond the regular cards in a set for boosters
protected boolean isCustomSet = false;
protected final EnumMap<Rarity, List<CardInfo>> savedCards; protected final EnumMap<Rarity, List<CardInfo>> savedCards;
public ExpansionSet(String name, String code, String packageName, Date releaseDate, SetType setType) { public ExpansionSet(String name, String code, String packageName, Date releaseDate, SetType setType) {
@ -376,7 +374,7 @@ public abstract class ExpansionSet implements Serializable {
return null; return null;
} }
public boolean isCustomSet() { return isCustomSet; } public boolean isCustomSet() { return setType == SetType.CUSTOM_SET; }
public void removeSavedCards() { public void removeSavedCards() {
savedCards.clear(); savedCards.clear();

2
Mage/src/main/java/mage/cards/Sets.java
View file

@ -73,7 +73,7 @@ public class Sets extends HashMap<String, ExpansionSet> {
public void addSet(ExpansionSet set) { public void addSet(ExpansionSet set) {
if(containsKey(set.getCode())) throw new IllegalArgumentException("Set code "+set.getCode()+" already exists."); if(containsKey(set.getCode())) throw new IllegalArgumentException("Set code "+set.getCode()+" already exists.");
this.put(set.getCode(), set); this.put(set.getCode(), set);
if(set.isCustomSet) customSets.add(set.getCode()); if(set.isCustomSet()) customSets.add(set.getCode());
} }
public static boolean isCustomSet(String setCode) { public static boolean isCustomSet(String setCode) {

3
Mage/src/main/java/mage/constants/SetType.java
View file

@ -11,7 +11,8 @@ public enum SetType {
SUPPLEMENTAL("Supplemental"), SUPPLEMENTAL("Supplemental"),
SUPPLEMENTAL_STANDARD_LEGAL("Standard Legal Supplemental"), SUPPLEMENTAL_STANDARD_LEGAL("Standard Legal Supplemental"),
PROMOTIONAL("Promotional"), PROMOTIONAL("Promotional"),
JOKESET("Joke Set"); JOKESET("Joke Set"),
CUSTOM_SET("Unofficial Set");
private final String text; private final String text;