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

The enforced format, if any, now also determines whether your quest starting cardpool contains snow-lands or not.

Browse Source
This commit is contained in:
RumbleBBU
2012-10-19 05:39:25 +00:00
parent 981cf18a58
commit a5bff34e2d
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/forge/quest/data/QuestAssets.java
View File

@@ -165,10 +165,14 @@ public class QuestAssets {
/** /**
* Instantiates a new quest assets. * Instantiates a new quest assets.
*/ */
public QuestAssets() { public QuestAssets(GameFormatQuest useFormat) {
final QuestPreferences prefs = Singletons.getModel().getQuestPreferences(); final QuestPreferences prefs = Singletons.getModel().getQuestPreferences();
int snowLands = prefs.getPreferenceInt(QPref.STARTING_SNOW_LANDS);
if (useFormat != null && !useFormat.hasSnowLands()) {
snowLands = 0;
}
final ItemPoolView<CardPrinted> lands = QuestUtilCards.generateBasicLands( final ItemPoolView<CardPrinted> lands = QuestUtilCards.generateBasicLands(
prefs.getPreferenceInt(QPref.STARTING_BASIC_LANDS), prefs.getPreferenceInt(QPref.STARTING_SNOW_LANDS)); prefs.getPreferenceInt(QPref.STARTING_BASIC_LANDS), snowLands);
this.getCardPool().addAll(lands); this.getCardPool().addAll(lands);
} }

2
src/main/java/forge/quest/data/QuestData.java
View File

@@ -82,7 +82,7 @@ public final class QuestData {
} }
this.mode = mode2; this.mode = mode2;
this.achievements = new QuestAchievements(diff); this.achievements = new QuestAchievements(diff);
this.assets = new QuestAssets(); this.assets = new QuestAssets(format);
} }
/** /**

2
src/main/java/forge/quest/io/QuestDataIO.java
View File

@@ -185,7 +185,7 @@ public class QuestDataIO {
final int saveVersion = newData.getVersionNumber(); final int saveVersion = newData.getVersionNumber();
if (saveVersion < 3) { if (saveVersion < 3) {
QuestDataIO.setFinalField(QuestData.class, "assets", newData, new QuestAssets()); QuestDataIO.setFinalField(QuestData.class, "assets", newData, new QuestAssets(null));
final int diffIdx = Integer.parseInt(document.getElementsByTagName("diffIndex").item(0).getTextContent()); final int diffIdx = Integer.parseInt(document.getElementsByTagName("diffIndex").item(0).getTextContent());
QuestDataIO.setFinalField(QuestData.class, "achievements", newData, new QuestAchievements(diffIdx)); QuestDataIO.setFinalField(QuestData.class, "achievements", newData, new QuestAchievements(diffIdx));