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

Fixed land distribution for FRF. Basics have been removed entirely as per the real booster packs. Also cleaned up a bit of formatting.

Browse Source
This commit is contained in:
Krazy
2015-01-24 17:37:54 +00:00
parent b4a877ccbc
commit c0c4383953
2 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,6 +96,7 @@ public class BoosterGenerator {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static PrintSheet makeSheet(String sheetKey, Iterable<PaperCard> src) { public static PrintSheet makeSheet(String sheetKey, Iterable<PaperCard> src) {
PrintSheet ps = new PrintSheet(sheetKey); PrintSheet ps = new PrintSheet(sheetKey);
String[] sKey = TextUtil.splitWithParenthesis(sheetKey, ' ', 2); String[] sKey = TextUtil.splitWithParenthesis(sheetKey, ' ', 2);
Predicate<PaperCard> setPred = (Predicate<PaperCard>) (sKey.length > 1 ? IPaperCard.Predicates.printedInSets(sKey[1].split(" ")) : Predicates.alwaysTrue()); Predicate<PaperCard> setPred = (Predicate<PaperCard>) (sKey.length > 1 ? IPaperCard.Predicates.printedInSets(sKey[1].split(" ")) : Predicates.alwaysTrue());
@@ -106,35 +107,46 @@ public class BoosterGenerator {
// source replacement operators - if one is applied setPredicate will be ignored // source replacement operators - if one is applied setPredicate will be ignored
Iterator<String> itMod = operators.iterator(); Iterator<String> itMod = operators.iterator();
while(itMod.hasNext()) { while(itMod.hasNext()) {
String mainCode = itMod.next(); String mainCode = itMod.next();
if ( mainCode.regionMatches(true, 0, "fromSheet", 0, 9)) { // custom print sheet
if (mainCode.regionMatches(true, 0, "fromSheet", 0, 9)) { // custom print sheet
String sheetName = StringUtils.strip(mainCode.substring(9), "()\" "); String sheetName = StringUtils.strip(mainCode.substring(9), "()\" ");
src = StaticData.instance().getPrintSheets().get(sheetName).toFlatList(); src = StaticData.instance().getPrintSheets().get(sheetName).toFlatList();
setPred = Predicates.alwaysTrue(); setPred = Predicates.alwaysTrue();
} else if (mainCode.startsWith("promo")) { // get exactly the named cards, that's a tiny inlined print sheet } else if (mainCode.startsWith("promo")) { // get exactly the named cards, that's a tiny inlined print sheet
String list = StringUtils.strip(mainCode.substring(5), "() "); String list = StringUtils.strip(mainCode.substring(5), "() ");
String[] cardNames = TextUtil.splitWithParenthesis(list, ',', '"', '"'); String[] cardNames = TextUtil.splitWithParenthesis(list, ',', '"', '"');
List<PaperCard> srcList = new ArrayList<>(); List<PaperCard> srcList = new ArrayList<>();
for(String cardName: cardNames)
for(String cardName: cardNames) {
srcList.add(StaticData.instance().getCommonCards().getCard(cardName)); srcList.add(StaticData.instance().getCommonCards().getCard(cardName));
}
src = srcList; src = srcList;
setPred = Predicates.alwaysTrue(); setPred = Predicates.alwaysTrue();
} else } else {
continue; continue;
}
itMod.remove(); itMod.remove();
} }
// only special operators should remain by now - the ones that could not be turned into one predicate // only special operators should remain by now - the ones that could not be turned into one predicate
String mainCode = operators.isEmpty() ? null : operators.get(0).trim(); String mainCode = operators.isEmpty() ? null : operators.get(0).trim();
if( null == mainCode || mainCode.equalsIgnoreCase(BoosterSlots.ANY) ) { // no restriction on rarity if( null == mainCode || mainCode.equalsIgnoreCase(BoosterSlots.ANY) ) { // no restriction on rarity
Predicate<PaperCard> predicate = Predicates.and(setPred, extraPred); Predicate<PaperCard> predicate = Predicates.and(setPred, extraPred);
ps.addAll(Iterables.filter(src, predicate)); ps.addAll(Iterables.filter(src, predicate));
} else if ( mainCode.equalsIgnoreCase(BoosterSlots.UNCOMMON_RARE) ) { // for sets like ARN, where U1 cards are considered rare and U3 are uncommon } else if ( mainCode.equalsIgnoreCase(BoosterSlots.UNCOMMON_RARE) ) { // for sets like ARN, where U1 cards are considered rare and U3 are uncommon
Predicate<PaperCard> predicateRares = Predicates.and(setPred, IPaperCard.Predicates.Presets.IS_RARE, extraPred); Predicate<PaperCard> predicateRares = Predicates.and(setPred, IPaperCard.Predicates.Presets.IS_RARE, extraPred);
ps.addAll(Iterables.filter(src, predicateRares)); ps.addAll(Iterables.filter(src, predicateRares));
@@ -150,41 +162,48 @@ public class BoosterGenerator {
Predicate<PaperCard> predicateRare = Predicates.and( setPred, IPaperCard.Predicates.Presets.IS_RARE, extraPred); Predicate<PaperCard> predicateRare = Predicates.and( setPred, IPaperCard.Predicates.Presets.IS_RARE, extraPred);
ps.addAll(Iterables.filter(src, predicateRare), 2); ps.addAll(Iterables.filter(src, predicateRare), 2);
} else
} else {
throw new IllegalArgumentException("Booster generator: operator could not be parsed - " + mainCode); throw new IllegalArgumentException("Booster generator: operator could not be parsed - " + mainCode);
}
return ps; return ps;
} }
/** /**
* This method also modifies passed parameter * This method also modifies passed parameter
*/ */
private static Predicate<PaperCard> buildExtraPredicate(List<String> operators) { private static Predicate<PaperCard> buildExtraPredicate(List<String> operators) {
List<Predicate<PaperCard>> conditions = new ArrayList<>(); List<Predicate<PaperCard>> conditions = new ArrayList<>();
Iterator<String> itOp = operators.iterator(); Iterator<String> itOp = operators.iterator();
while(itOp.hasNext()) { while(itOp.hasNext()) {
String operator = itOp.next(); String operator = itOp.next();
if(StringUtils.isEmpty(operator)) { if(StringUtils.isEmpty(operator)) {
itOp.remove(); itOp.remove();
continue; continue;
} }
if(operator.endsWith("s")) if(operator.endsWith("s")) {
operator = operator.substring(0, operator.length()-1); operator = operator.substring(0, operator.length() - 1);
}
boolean invert = operator.charAt(0) == '!'; boolean invert = operator.charAt(0) == '!';
if( invert ) operator = operator.substring(1); if (invert) { operator = operator.substring(1); }
Predicate<PaperCard> toAdd = null; Predicate<PaperCard> toAdd = null;
if( operator.equalsIgnoreCase(BoosterSlots.DUAL_FACED_CARD) ) { toAdd = Predicates.compose(CardRulesPredicates.splitType(CardSplitType.Transform), PaperCard.FN_GET_RULES); if (operator.equalsIgnoreCase(BoosterSlots.DUAL_FACED_CARD)) { toAdd = Predicates.compose(CardRulesPredicates.splitType(CardSplitType.Transform), PaperCard.FN_GET_RULES);
} else if ( operator.equalsIgnoreCase(BoosterSlots.LAND) ) { toAdd = Predicates.compose(CardRulesPredicates.Presets.IS_LAND, PaperCard.FN_GET_RULES); } else if (operator.equalsIgnoreCase(BoosterSlots.LAND)) { toAdd = Predicates.compose(CardRulesPredicates.Presets.IS_LAND, PaperCard.FN_GET_RULES);
} else if ( operator.equalsIgnoreCase(BoosterSlots.BASIC_LAND)) { toAdd = IPaperCard.Predicates.Presets.IS_BASIC_LAND; } else if (operator.equalsIgnoreCase(BoosterSlots.BASIC_LAND)) { toAdd = IPaperCard.Predicates.Presets.IS_BASIC_LAND;
} else if ( operator.equalsIgnoreCase(BoosterSlots.TIME_SHIFTED)) { toAdd = IPaperCard.Predicates.Presets.IS_SPECIAL; } else if (operator.equalsIgnoreCase(BoosterSlots.TIME_SHIFTED)) { toAdd = IPaperCard.Predicates.Presets.IS_SPECIAL;
} else if ( operator.equalsIgnoreCase(BoosterSlots.MYTHIC)) { toAdd = IPaperCard.Predicates.Presets.IS_MYTHIC_RARE; } else if (operator.equalsIgnoreCase(BoosterSlots.MYTHIC)) { toAdd = IPaperCard.Predicates.Presets.IS_MYTHIC_RARE;
} else if ( operator.equalsIgnoreCase(BoosterSlots.RARE)) { toAdd = IPaperCard.Predicates.Presets.IS_RARE; } else if (operator.equalsIgnoreCase(BoosterSlots.RARE)) { toAdd = IPaperCard.Predicates.Presets.IS_RARE;
} else if ( operator.equalsIgnoreCase(BoosterSlots.UNCOMMON)) { toAdd = IPaperCard.Predicates.Presets.IS_UNCOMMON; } else if (operator.equalsIgnoreCase(BoosterSlots.UNCOMMON)) { toAdd = IPaperCard.Predicates.Presets.IS_UNCOMMON;
} else if ( operator.equalsIgnoreCase(BoosterSlots.COMMON)) { toAdd = IPaperCard.Predicates.Presets.IS_COMMON; } else if (operator.equalsIgnoreCase(BoosterSlots.COMMON)) { toAdd = IPaperCard.Predicates.Presets.IS_COMMON;
} else if ( operator.startsWith("name(") ) { } else if (operator.startsWith("name(")) {
operator = StringUtils.strip(operator.substring(4), "() "); operator = StringUtils.strip(operator.substring(4), "() ");
String[] cardNames = TextUtil.splitWithParenthesis(operator, ',', '"', '"'); String[] cardNames = TextUtil.splitWithParenthesis(operator, ',', '"', '"');
toAdd = IPaperCard.Predicates.names(Lists.newArrayList(cardNames)); toAdd = IPaperCard.Predicates.names(Lists.newArrayList(cardNames));
@@ -198,18 +217,25 @@ public class BoosterGenerator {
toAdd = IPaperCard.Predicates.names(Lists.newArrayList(cardNames)); toAdd = IPaperCard.Predicates.names(Lists.newArrayList(cardNames));
} }
if(toAdd == null) if (toAdd == null) {
continue; continue;
else } else {
itOp.remove(); itOp.remove();
}
if( invert ) if (invert) {
toAdd = Predicates.not(toAdd); toAdd = Predicates.not(toAdd);
}
conditions.add(toAdd); conditions.add(toAdd);
} }
if( conditions.isEmpty() )
if (conditions.isEmpty()) {
return Predicates.alwaysTrue(); return Predicates.alwaysTrue();
}
return Predicates.and(conditions); return Predicates.and(conditions);
} }

35
forge-gui/res/blockdata/printsheets.txt
View File

@@ -22,26 +22,21 @@
1 Maze's End|DGM 1 Maze's End|DGM
[FRF Lands] [FRF Lands]
2 Bloodstained Mire|KTK 4 Bloodstained Mire|KTK
2 Flooded Strand|KTK 4 Flooded Strand|KTK
2 Polluted Delta|KTK 4 Polluted Delta|KTK
2 Windswept Heath|KTK 4 Windswept Heath|KTK
2 Wooded Foothills|KTK 4 Wooded Foothills|KTK
10 Bloodfell Caves|FRF 45 Bloodfell Caves|FRF
10 Blossoming Sands|FRF 45 Blossoming Sands|FRF
10 Dismal Backwater|FRF 45 Dismal Backwater|FRF
10 Jungle Hollow|FRF 45 Jungle Hollow|FRF
10 Rugged Highlands|FRF 45 Rugged Highlands|FRF
10 Scoured Barrens|FRF 45 Scoured Barrens|FRF
10 Swiftwater Cliffs|FRF 45 Swiftwater Cliffs|FRF
10 Thornwood Falls|FRF 45 Thornwood Falls|FRF
10 Tranquil Cove|FRF 45 Tranquil Cove|FRF
10 Wind-Scarred Crag|FRF 45 Wind-Scarred Crag|FRF
25 Forest|FRF
25 Island|FRF
25 Mountain|FRF
25 Plains|FRF
25 Swamp|FRF
[GTC Boros Guild] [GTC Boros Guild]
1 Act of Treason|GTC 1 Act of Treason|GTC