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

- Somewhat better chances for generating Masterpieces; however, might still be a bit off (a bit much for KLD/AER and a bit small, perhaps, for EXP).

Browse Source
This commit is contained in:
Agetian
2017-07-19 05:06:10 +00:00
parent 3c1c6ea949
commit f14d795c0d
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-core/src/main/java/forge/card/BoosterGenerator.java
View File

@@ -21,6 +21,7 @@ import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import forge.StaticData; import forge.StaticData;
import forge.card.CardEdition.FoilType; import forge.card.CardEdition.FoilType;
import forge.item.IPaperCard; import forge.item.IPaperCard;
@@ -290,8 +291,17 @@ public class BoosterGenerator {
public static void addCardsFromExtraSheet(List<PaperCard> dest, String printSheetKey) { public static void addCardsFromExtraSheet(List<PaperCard> dest, String printSheetKey) {
PrintSheet extraSheet = getPrintSheet(printSheetKey); PrintSheet extraSheet = getPrintSheet(printSheetKey);
// try to determine the allowed rarity of the cards in dest
Set<CardRarity> allowedRarity = Sets.newHashSet();
if (!dest.isEmpty()) {
for (PaperCard inDest : dest) {
allowedRarity.add(inDest.getRarity());
}
}
for (PaperCard card : extraSheet.toFlatList()) { for (PaperCard card : extraSheet.toFlatList()) {
if (!dest.contains(card)) { if (!dest.contains(card) && allowedRarity.contains(card.getRarity())) {
dest.add(card); dest.add(card);
} }
} }