From c4c6f4eaf6c066a8db5430b68f995d618aa9ddfe Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Fri, 2 Oct 2015 06:09:23 +0000
Subject: [PATCH] - Unlocking Time Spiral in quest mode now automatically
 unlocks Time Spiral Timeshifted, unlocking Battle for Zendikar automatically
 unlocks Zendikar Expeditions.

---
 forge-core/src/main/java/forge/card/CardEdition.java         | 5 ++++-
 forge-gui/res/editions/Battle for Zendikar.txt               | 1 +
 forge-gui/res/editions/Time Spiral.txt                       | 1 +
 forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java | 5 +++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java
index 5dc06f08457..fdcd7107759 100644
--- a/forge-core/src/main/java/forge/card/CardEdition.java
+++ b/forge-core/src/main/java/forge/card/CardEdition.java
@@ -106,6 +106,7 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
     private double foilChanceInBooster = 0;
     private boolean foilAlwaysInCommonSlot = false;
     private String additionalSheetForFoils = "";
+    private String additionalUnlockSet = "";
     private final CardInSet[] cards;
 
 
@@ -159,6 +160,7 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
     public double getFoilChanceInBooster() { return foilChanceInBooster; }
     public boolean getFoilAlwaysInCommonSlot() { return foilAlwaysInCommonSlot; }
     public String getAdditionalSheetForFoils() { return additionalSheetForFoils; }
+    public String getAdditionalUnlockSet() { return additionalUnlockSet; }
     public CardInSet[] getCards() { return cards; }
 
     /** 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.foilAlwaysInCommonSlot = section.getBoolean("FoilAlwaysInCommonSlot", true);
-
             res.additionalSheetForFoils = section.get("AdditionalSheetForFoils", "");
 
+            res.additionalUnlockSet = section.get("AdditionalSetUnlockedInQuest", ""); // e.g. Time Spiral Timeshifted (TSB) for Time Spiral
+
             return res;
         }
 
diff --git a/forge-gui/res/editions/Battle for Zendikar.txt b/forge-gui/res/editions/Battle for Zendikar.txt
index 4cb294ea2d9..cd10fae069d 100644
--- a/forge-gui/res/editions/Battle for Zendikar.txt	
+++ b/forge-gui/res/editions/Battle for Zendikar.txt	
@@ -7,6 +7,7 @@ Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand BFZ
 AdditionalSheetForFoils=fromSheet("EXP Lands")
+AdditionalSetUnlockedInQuest=EXP
 
 [cards]
 U Adverse Conditions
diff --git a/forge-gui/res/editions/Time Spiral.txt b/forge-gui/res/editions/Time Spiral.txt
index 46d2c4721c0..275c75fe577 100644
--- a/forge-gui/res/editions/Time Spiral.txt	
+++ b/forge-gui/res/editions/Time Spiral.txt	
@@ -6,6 +6,7 @@ Code2=TSP
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 Rare, 1 TimeShifted TSB
+AdditionalSetUnlockedInQuest=TSB
 
 [cards]
 C AEther Web
diff --git a/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java b/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java
index 528e7f26fe3..53c96bb4f22 100644
--- a/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java
+++ b/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java
@@ -184,6 +184,11 @@ public class QuestUtilUnlockSets {
         IStorage<SealedProduct.Template> boosters = FModel.getMagicDb().getBoosters();
         qData.getFormat().unlockSet(unlockedSet.getCode());
 
+        String additionalSet = unlockedSet.getAdditionalUnlockSet();
+        if (!additionalSet.isEmpty()) {
+            qData.getFormat().unlockSet(additionalSet);
+        }
+
         List<PaperCard> cardsWon = new ArrayList<PaperCard>();
 
         if (starters.contains(unlockedSet.getCode())) {