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

- Unlocking Time Spiral in quest mode now automatically unlocks Time Spiral Timeshifted, unlocking Battle for Zendikar automatically unlocks Zendikar Expeditions.

Browse Source
This commit is contained in:
Agetian
2015-10-02 06:09:23 +00:00
parent 1cc361aa6d
commit c4c6f4eaf6
4 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-core/src/main/java/forge/card/CardEdition.java
View File

@@ -106,6 +106,7 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
private double foilChanceInBooster = 0; private double foilChanceInBooster = 0;
private boolean foilAlwaysInCommonSlot = false; private boolean foilAlwaysInCommonSlot = false;
private String additionalSheetForFoils = ""; private String additionalSheetForFoils = "";
private String additionalUnlockSet = "";
private final CardInSet[] cards; private final CardInSet[] cards;
@@ -159,6 +160,7 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
public double getFoilChanceInBooster() { return foilChanceInBooster; } public double getFoilChanceInBooster() { return foilChanceInBooster; }
public boolean getFoilAlwaysInCommonSlot() { return foilAlwaysInCommonSlot; } public boolean getFoilAlwaysInCommonSlot() { return foilAlwaysInCommonSlot; }
public String getAdditionalSheetForFoils() { return additionalSheetForFoils; } public String getAdditionalSheetForFoils() { return additionalSheetForFoils; }
public String getAdditionalUnlockSet() { return additionalUnlockSet; }
public CardInSet[] getCards() { return cards; } public CardInSet[] getCards() { return cards; }
/** The Constant fnGetName. */ /** The Constant fnGetName. */
@@ -292,9 +294,10 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
} }
res.foilChanceInBooster = section.getDouble("FoilChanceInBooster", 21.43F) / 100.0F; res.foilChanceInBooster = section.getDouble("FoilChanceInBooster", 21.43F) / 100.0F;
res.foilAlwaysInCommonSlot = section.getBoolean("FoilAlwaysInCommonSlot", true); res.foilAlwaysInCommonSlot = section.getBoolean("FoilAlwaysInCommonSlot", true);
res.additionalSheetForFoils = section.get("AdditionalSheetForFoils", ""); res.additionalSheetForFoils = section.get("AdditionalSheetForFoils", "");
res.additionalUnlockSet = section.get("AdditionalSetUnlockedInQuest", ""); // e.g. Time Spiral Timeshifted (TSB) for Time Spiral
return res; return res;
} }

1
forge-gui/res/editions/Battle for Zendikar.txt
View File

@@ -7,6 +7,7 @@ Type=Expansion
BoosterCovers=5 BoosterCovers=5
Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand BFZ Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand BFZ
AdditionalSheetForFoils=fromSheet("EXP Lands") AdditionalSheetForFoils=fromSheet("EXP Lands")
AdditionalSetUnlockedInQuest=EXP
[cards] [cards]
U Adverse Conditions U Adverse Conditions

1
forge-gui/res/editions/Time Spiral.txt
View File

@@ -6,6 +6,7 @@ Code2=TSP
Type=Expansion Type=Expansion
BoosterCovers=5 BoosterCovers=5
Booster=10 Common, 3 Uncommon, 1 Rare, 1 TimeShifted TSB Booster=10 Common, 3 Uncommon, 1 Rare, 1 TimeShifted TSB
AdditionalSetUnlockedInQuest=TSB
[cards] [cards]
C AEther Web C AEther Web

5
forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java
View File

@@ -184,6 +184,11 @@ public class QuestUtilUnlockSets {
IStorage<SealedProduct.Template> boosters = FModel.getMagicDb().getBoosters(); IStorage<SealedProduct.Template> boosters = FModel.getMagicDb().getBoosters();
qData.getFormat().unlockSet(unlockedSet.getCode()); qData.getFormat().unlockSet(unlockedSet.getCode());
String additionalSet = unlockedSet.getAdditionalUnlockSet();
if (!additionalSet.isEmpty()) {
qData.getFormat().unlockSet(additionalSet);
}
List<PaperCard> cardsWon = new ArrayList<PaperCard>(); List<PaperCard> cardsWon = new ArrayList<PaperCard>();
if (starters.contains(unlockedSet.getCode())) { if (starters.contains(unlockedSet.getCode())) {