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

- Added an override mechanism to allow the game to correctly detect "large small" sets that have over 200 cards in them but that are treated as the small set of the block, e.g. Eldritch Moon.

Browse Source 
- Fixes SOI and EMN/SOI booster draft generation in quest draft tournaments,
This commit is contained in:
Agetian
2016-07-18 08:40:52 +00:00
parent 649c715346
commit 93b404e8f6
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,6 +124,7 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
private String slotReplaceCommonWith = "Common"; private String slotReplaceCommonWith = "Common";
private String additionalSheetForFoils = ""; private String additionalSheetForFoils = "";
private String additionalUnlockSet = ""; private String additionalUnlockSet = "";
private boolean smallSetOverride = false;
private final CardInSet[] cards; private final CardInSet[] cards;
private int boosterArts = 1; private int boosterArts = 1;
@@ -182,6 +183,7 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
public String getSlotReplaceCommonWith() { return slotReplaceCommonWith; } public String getSlotReplaceCommonWith() { return slotReplaceCommonWith; }
public String getAdditionalSheetForFoils() { return additionalSheetForFoils; } public String getAdditionalSheetForFoils() { return additionalSheetForFoils; }
public String getAdditionalUnlockSet() { return additionalUnlockSet; } public String getAdditionalUnlockSet() { return additionalUnlockSet; }
public boolean getSmallSetOverride() { return smallSetOverride; }
public CardInSet[] getCards() { return cards; } public CardInSet[] getCards() { return cards; }
public static final Function<CardEdition, String> FN_GET_CODE = new Function<CardEdition, String>() { public static final Function<CardEdition, String> FN_GET_CODE = new Function<CardEdition, String>() {
@@ -230,7 +232,7 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
} }
public boolean isLargeSet() { public boolean isLargeSet() {
return cards.length > 200; return cards.length > 200 && !smallSetOverride;
} }
public int getCntBoosterPictures() { public int getCntBoosterPictures() {
@@ -335,6 +337,8 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
res.additionalUnlockSet = section.get("AdditionalSetUnlockedInQuest", ""); // e.g. Time Spiral Timeshifted (TSB) for Time Spiral res.additionalUnlockSet = section.get("AdditionalSetUnlockedInQuest", ""); // e.g. Time Spiral Timeshifted (TSB) for Time Spiral
res.smallSetOverride = section.getBoolean("TreatAsSmallSet", false); // for "small" sets with over 200 cards (e.g. Eldritch Moon)
return res; return res;
} }

3
forge-gui/res/editions/Eldritch Moon.txt
View File

@@ -8,6 +8,7 @@ MciCode=emn
BoosterCovers=3 BoosterCovers=3
Booster=9 Common:!dfc, 3 Uncommon:!dfc, 1 RareMythic:!dfc, 1 dfc:!Rare:!Mythic, 1 BasicLand SOI Booster=9 Common:!dfc, 3 Uncommon:!dfc, 1 RareMythic:!dfc, 1 dfc:!Rare:!Mythic, 1 BasicLand SOI
ChanceReplaceCommonWith=.125F dfc:RareMythic ChanceReplaceCommonWith=.125F dfc:RareMythic
TreatAsSmallSet=true
[cards] [cards]
1 U Abundant Maw 1 U Abundant Maw
@@ -214,4 +215,4 @@ ChanceReplaceCommonWith=.125F dfc:RareMythic
202 U Thirsting Axe 202 U Thirsting Axe
203 R Geier Reach Sanitarium 203 R Geier Reach Sanitarium
204 R Hanweir Battlements 204 R Hanweir Battlements
205 U Nephalia Academy 205 U Nephalia Academy