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

Added foil basic lands to FRF boosters and updated the way foil cards are generated to account for multiple cards in printsheets. There should now be a more equal distribution of foil rarity.

Browse Source
This commit is contained in:
Krazy
2015-01-24 18:27:14 +00:00
parent 31d1d7da8c
commit f3a30793c5
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,11 @@ public class BoosterGenerator {
return StaticData.instance().getCommonCards().getFoiled(sheet.random(1, true).get(0)); return StaticData.instance().getCommonCards().getFoiled(sheet.random(1, true).get(0));
} }
private static PaperCard generateFoilCard(List<PaperCard> cardList) {
Collections.shuffle(cardList);
return StaticData.instance().getCommonCards().getFoiled(cardList.get(0));
}
public static List<PaperCard> getBoosterPack(SealedProduct.Template template) { public static List<PaperCard> getBoosterPack(SealedProduct.Template template) {
List<PaperCard> result = new ArrayList<>(); List<PaperCard> result = new ArrayList<>();
List<PrintSheet> sheetsUsed = new ArrayList<>(); List<PrintSheet> sheetsUsed = new ArrayList<>();
@@ -87,8 +92,15 @@ public class BoosterGenerator {
} }
if (hasFoil && foilAtEndOfPack) { if (hasFoil && foilAtEndOfPack) {
PrintSheet foilSheet = Aggregates.random(sheetsUsed); List<PaperCard> foilCards = new ArrayList<>();
result.add(generateFoilCard(foilSheet)); for (PrintSheet printSheet : sheetsUsed) {
for (PaperCard card : printSheet.toFlatList()) {
if (!foilCards.contains(card)) {
foilCards.add(card);
}
}
}
result.add(generateFoilCard(foilCards));
} }
return result; return result;

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

@@ -38,6 +38,13 @@
45 Tranquil Cove|FRF 45 Tranquil Cove|FRF
45 Wind-Scarred Crag|FRF 45 Wind-Scarred Crag|FRF
[FRF Basic Lands]
1 Swamp|FRF
1 Plains|FRF
1 Forest|FRF
1 Mountain|FRF
1 Island|FRF
[GTC Boros Guild] [GTC Boros Guild]
1 Act of Treason|GTC 1 Act of Treason|GTC
1 Aerial Maneuver|GTC 1 Aerial Maneuver|GTC

2
forge-gui/res/editions/Fate Reforged.txt
View File

@@ -4,7 +4,7 @@ Date=2015-01-23
Name=Fate Reforged Name=Fate Reforged
Type=Expansion Type=Expansion
BoosterCovers=3 BoosterCovers=3
Booster=10 Common:!land, 3 Uncommon, 1 RareMythic, 1 fromSheet("FRF Lands") Booster=10 Common:!land, 3 Uncommon, 1 RareMythic, 1 fromSheet("FRF Lands"), 0 fromSheet("FRF Basic Lands")
[cards] [cards]
M Ugin, the Spirit Dragon M Ugin, the Spirit Dragon