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

DGM booster generation fixes

Browse Source
This commit is contained in:
Maxmtg
2014-02-11 04:50:12 +00:00
parent 7ab28b5226
commit c5923c31e9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,8 +62,8 @@ public class BoosterGenerator {
CardEdition edition = StaticData.instance().getEditions().get(template.getEdition()); CardEdition edition = StaticData.instance().getEditions().get(template.getEdition());
boolean hasFoil = edition != null && MyRandom.getRandom().nextDouble() < edition.getFoilChanceInBooster() && edition.getFoilType() != FoilType.NOT_SUPPORTED; boolean hasFoil = edition != null && MyRandom.getRandom().nextDouble() < edition.getFoilChanceInBooster() && edition.getFoilType() != FoilType.NOT_SUPPORTED;
boolean commonSlotFoil = !hasFoil ? false : edition.getFoilAlwaysInCommonSlot(); boolean foilAtEndOfPack = hasFoil && edition.getFoilAlwaysInCommonSlot();
String foilSlot = !hasFoil ? null : edition.getFoilAlwaysInCommonSlot() ? BoosterSlots.COMMON : Aggregates.random(template.getSlots()).getKey(); String foilSlot = !hasFoil ? null : foilAtEndOfPack ? BoosterSlots.COMMON : Aggregates.random(template.getSlots()).getKey();
for(Pair<String, Integer> slot : template.getSlots()) { for(Pair<String, Integer> slot : template.getSlots()) {
String slotType = slot.getLeft(); // add expansion symbol here? String slotType = slot.getLeft(); // add expansion symbol here?
@@ -73,19 +73,20 @@ public class BoosterGenerator {
String setCode = sType.length == 1 && template.getEdition() != null ? template.getEdition() : null; String setCode = sType.length == 1 && template.getEdition() != null ? template.getEdition() : null;
String sheetKey = StaticData.instance().getEditions().contains(setCode) ? slotType.trim() + " " + setCode: slotType.trim(); String sheetKey = StaticData.instance().getEditions().contains(setCode) ? slotType.trim() + " " + setCode: slotType.trim();
if ( slotType.equals(foilSlot)) boolean foilInThisSlot = slotType.startsWith(foilSlot);
if (foilInThisSlot)
numCards--; numCards--;
PrintSheet ps = getPrintSheet(sheetKey); PrintSheet ps = getPrintSheet(sheetKey);
result.addAll(ps.random(numCards, true)); result.addAll(ps.random(numCards, true));
sheetsUsed.add(ps); sheetsUsed.add(ps);
if (hasFoil && !commonSlotFoil && slotType.equals(foilSlot)) { if (hasFoil && foilInThisSlot && !foilAtEndOfPack) {
result.add(generateFoilCard(ps)); result.add(generateFoilCard(ps));
} }
} }
if (hasFoil && commonSlotFoil) { if (hasFoil && foilAtEndOfPack) {
PrintSheet foilSheet = Aggregates.random(sheetsUsed); PrintSheet foilSheet = Aggregates.random(sheetsUsed);
result.add(generateFoilCard(foilSheet)); result.add(generateFoilCard(foilSheet));
} }