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

acquire booster edition once

Browse Source
This commit is contained in:
Maxmtg
2014-02-08 17:07:15 +00:00
parent 2b4e935373
commit 9500b3d951
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,39 +61,34 @@ public class BoosterGenerator {
return cachedSheets.get(key); return cachedSheets.get(key);
} }
private static final String getFoilSlot(SealedProduct.Template booster) { private static final String getFoilSlot(CardEdition edition, SealedProduct.Template booster) {
String setCode = booster.getEdition() != null ? booster.getEdition() : null; if (edition == null) {
CardEdition set = setCode != null ? StaticData.instance().getEditions().getEditionByCodeOrThrow(setCode) : null; return null; // null == no foil is generated
String foilSlot; } else if (edition.getFoilAlwaysInCommonSlot()) {
return BoosterSlots.COMMON;
if (set == null || set.getFoilType() == FoilType.NOT_SUPPORTED) {
foilSlot = null; // null == no foil is generated
}
else if (set.getFoilAlwaysInCommonSlot()) {
foilSlot = BoosterSlots.COMMON;
} else { } else {
foilSlot = Aggregates.random(booster.getSlots()).getKey(); return Aggregates.random(booster.getSlots()).getKey();
} }
return foilSlot;
} }
private static final PaperCard generateFoilCard(PrintSheet sheet) { private static final PaperCard generateFoilCard(PrintSheet sheet) {
return StaticData.instance().getCommonCards().getFoiled(sheet.random(1, true).get(0)); return StaticData.instance().getCommonCards().getFoiled(sheet.random(1, true).get(0));
} }
public static final List<PaperCard> getBoosterPack(SealedProduct.Template booster) { public static final List<PaperCard> getBoosterPack(SealedProduct.Template template) {
List<PaperCard> result = new ArrayList<PaperCard>(); List<PaperCard> result = new ArrayList<PaperCard>();
List<PrintSheet> sheetsUsed = new ArrayList<PrintSheet>(); List<PrintSheet> sheetsUsed = new ArrayList<PrintSheet>();
String foilSlot = getFoilSlot(booster); CardEdition edition = StaticData.instance().getEditions().get(template.getEdition());
boolean hasFoil = MyRandom.getRandom().nextInt(100) <= StaticData.instance().getEditions().getEditionByCodeOrThrow(booster.getEdition()).getFoilChanceInBooster(); String foilSlot = getFoilSlot(edition, template);
for(Pair<String, Integer> slot : booster.getSlots()) { boolean hasFoil = edition != null && MyRandom.getRandom().nextInt(100) <= edition.getFoilChanceInBooster() && edition.getFoilType() != FoilType.NOT_SUPPORTED;
for(Pair<String, Integer> slot : template.getSlots()) {
String slotType = slot.getLeft(); // add expansion symbol here? String slotType = slot.getLeft(); // add expansion symbol here?
int numCards = slot.getRight().intValue(); int numCards = slot.getRight().intValue();
String[] sType = TextUtil.splitWithParenthesis(slotType, ' '); String[] sType = TextUtil.splitWithParenthesis(slotType, ' ');
String setCode = sType.length == 1 && booster.getEdition() != null ? booster.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();
PrintSheet ps = getPrintSheet(sheetKey); PrintSheet ps = getPrintSheet(sheetKey);