Remove basic lands from boosters that are not supposed to have them. Implement the timeshifted slot of Time Spiral boosters.

TODO: Planar Chaos with its "planeshifted" card slots

Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java

@@ -15,8 +15,8 @@ public class ChampionsOfKamigawa extends ExpansionSet {
         super("Champions of Kamigawa", "CHK", "mage.sets.championsofkamigawa",  new GregorianCalendar(2004, 9, 1).getTime(), SetType.EXPANSION);
         this.blockName = "Kamigawa";
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/ClassicSixthEdition.java

@@ -47,8 +47,8 @@ public class ClassicSixthEdition extends ExpansionSet {
     private ClassicSixthEdition() {
         super("Classic Sixth Edition", "6ED", "mage.sets.classicsixthedition", new GregorianCalendar(1999, 3, 28).getTime(), SetType.CORE);
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/FifthEdition.java

@@ -15,11 +15,11 @@ public class FifthEdition extends ExpansionSet {
     private FifthEdition() {
         super("Fifth Edition", "5ED", "mage.sets.fifthedition", new GregorianCalendar(1997, 3, 1).getTime(), SetType.CORE);
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
     this.ratioBoosterMythic = 0;
     }
 
-}
+}

Mage.Sets/src/mage/sets/FourthEdition.java

@@ -47,8 +47,8 @@ public class FourthEdition extends ExpansionSet {
     private FourthEdition() {
         super("Fourth Edition", "4ED", "mage.sets.fourthedition", new GregorianCalendar(1995, 3, 1).getTime(), SetType.CORE);
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/FutureSight.java

@@ -49,8 +49,8 @@ public class FutureSight extends ExpansionSet {
         this.parentSet = TimeSpiral.getInstance();
         this.hasBasicLands = false;
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/IceAge.java

@@ -48,8 +48,8 @@ public class IceAge extends ExpansionSet {
         super("Ice Age", "ICE", "mage.sets.iceage", new GregorianCalendar(1995, 5, 1).getTime(), SetType.EXPANSION);
         this.blockName = "Ice Age";
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/Invasion.java

@@ -46,10 +46,10 @@ public class Invasion extends ExpansionSet {
         super("Invasion", "INV", "mage.sets.invasion", new GregorianCalendar(2000, 9, 2).getTime(), SetType.EXPANSION);
         this.blockName = "Invasion";
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;
     }
-}
+}

Mage.Sets/src/mage/sets/Judgment.java

@@ -49,10 +49,10 @@ public class Judgment extends ExpansionSet {
         this.parentSet = Odyssey.getInstance();
         this.hasBasicLands = false;
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;
     }
-}
+}

Mage.Sets/src/mage/sets/Legends.java

@@ -48,8 +48,8 @@ public class Legends extends ExpansionSet {
         super("Legends", "LEG", "mage.sets.legends", new GregorianCalendar(1994, 5, 1).getTime(), SetType.EXPANSION);
         this.hasBasicLands = false;
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/LimitedEditionAlpha.java

@@ -20,8 +20,8 @@ public class LimitedEditionAlpha extends ExpansionSet {
     private LimitedEditionAlpha() {
         super("Limited Edition Alpha", "LEA", "mage.sets.limitedalpha", new GregorianCalendar(1993, 7, 1).getTime(), SetType.CORE);
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/LimitedEditionBeta.java

@@ -20,8 +20,8 @@ public class LimitedEditionBeta extends ExpansionSet {
     private LimitedEditionBeta() {
         super("Limited Edition Beta", "LEB", "mage.sets.limitedbeta", new GregorianCalendar(1993, 9, 1).getTime(), SetType.CORE);
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/Lorwyn.java

@@ -47,8 +47,8 @@ public class Lorwyn extends ExpansionSet {
         super("Lorwyn", "LRW", "mage.sets.lorwyn", new GregorianCalendar(2007, 9, 12).getTime(), SetType.EXPANSION);
         this.blockName = "Lorwyn";
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/MercadianMasques.java

@@ -48,8 +48,8 @@ public class MercadianMasques extends ExpansionSet {
         super("Mercadian Masques", "MMQ", "mage.sets.mercadianmasques", new GregorianCalendar(1999, 8, 25).getTime(), SetType.EXPANSION);
         this.blockName = "Masques";
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/Mirage.java

@@ -47,8 +47,8 @@ public class Mirage extends ExpansionSet {
         super("Mirage", "MIR", "mage.sets.mirage", new GregorianCalendar(1996, 8, 21).getTime(), SetType.EXPANSION);
         this.blockName = "Mirage";
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/Mirrodin.java

@@ -16,8 +16,8 @@ public class Mirrodin extends ExpansionSet {
         super("Mirrodin", "MRD", "mage.sets.mirrodin", new GregorianCalendar(2003, 9, 2).getTime(), SetType.EXPANSION);
         this.blockName = "Mirrodin";
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/Odyssey.java

@@ -47,8 +47,8 @@ public class Odyssey extends ExpansionSet {
         super("Odyssey", "ODY", "mage.sets.odyssey", new GregorianCalendar(2001, 9, 22).getTime(), SetType.EXPANSION);
         this.blockName = "Odyssey";
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/Onslaught.java

@@ -16,10 +16,10 @@ public class Onslaught extends ExpansionSet {
         super("Onslaught", "ONS", "mage.sets.onslaught", new GregorianCalendar(2002, 10, 7).getTime(), SetType.EXPANSION);
         this.blockName = "Onslaught";
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;
     }
-}
+}

Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java

@@ -48,8 +48,8 @@ public class RavnicaCityOfGuilds extends ExpansionSet {
         super("Ravnica: City of Guilds", "RAV", "mage.sets.ravnica", new GregorianCalendar(2005, 9, 24).getTime(), SetType.EXPANSION);
         this.blockName = "Ravnica";
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/RevisedEdition.java

@@ -20,8 +20,8 @@ public class RevisedEdition extends ExpansionSet {
     private RevisedEdition() {
         super("Revised Edition", "3ED", "mage.sets.revisededition", new GregorianCalendar(1994, 3, 1).getTime(), SetType.CORE);
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/Shadowmoor.java

@@ -47,8 +47,8 @@ public class Shadowmoor extends ExpansionSet {
         super("Shadowmoor", "SHM", "mage.sets.shadowmoor", new GregorianCalendar(2008, 4, 2).getTime(), SetType.EXPANSION);
         this.blockName = "Shadowmoor";
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/Tempest.java

@@ -16,8 +16,8 @@ public class Tempest extends ExpansionSet {
         super("Tempest", "TMP", "mage.sets.tempest", new GregorianCalendar(1997, 9, 1).getTime(), SetType.EXPANSION);
         this.blockName = "Tempest";
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/TimeSpiral.java

@@ -1,9 +1,13 @@
 package mage.sets;
 
-import mage.cards.ExpansionSet;
-import mage.constants.SetType;
-
 import java.util.GregorianCalendar;
+import java.util.List;
+import mage.cards.Card;
+import mage.cards.ExpansionSet;
+import mage.cards.repository.CardCriteria;
+import mage.cards.repository.CardRepository;
+import mage.constants.Rarity;
+import mage.constants.SetType;
 
 public class TimeSpiral extends ExpansionSet {
 
@@ -17,10 +21,19 @@ public class TimeSpiral extends ExpansionSet {
         super("Time Spiral", "TSP", "mage.sets.timespiral", new GregorianCalendar(2006, 9, 9).getTime(), SetType.EXPANSION);
         this.blockName = "Time Spiral";
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 11;
+        this.numBoosterCommon = 10;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;
     }
+
+    @Override
+    public List<Card> createBooster() {
+        List<Card> booster = super.createBooster();
+        CardCriteria criteria = new CardCriteria();
+        criteria.rarities(Rarity.SPECIAL).setCodes("TSB");
+        addToBooster(booster, CardRepository.instance.findCards(criteria));
+        return booster;
+    }
 }

Mage.Sets/src/mage/sets/UrzasDestiny.java

@@ -49,8 +49,8 @@ public class UrzasDestiny extends ExpansionSet {
         this.parentSet = UrzasSaga.getInstance();
         this.hasBasicLands = false;
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/UrzasLegacy.java

@@ -51,8 +51,8 @@ public class UrzasLegacy extends ExpansionSet {
         this.parentSet = UrzasSaga.getInstance();
         this.hasBasicLands = false;
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/UrzasSaga.java

@@ -48,8 +48,8 @@ public class UrzasSaga extends ExpansionSet {
         super("Urza's Saga", "USG", "mage.sets.urzassaga", new GregorianCalendar(1998, 10, 1).getTime(), SetType.EXPANSION);
         this.blockName = "Urza";
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage.Sets/src/mage/sets/Weatherlight.java

@@ -51,8 +51,8 @@ public class Weatherlight extends ExpansionSet {
         this.parentSet = Mirage.getInstance();
         this.hasBasicLands = false;
         this.hasBoosters = true;
-        this.numBoosterLands = 1;
+        this.numBoosterLands = 0;
-        this.numBoosterCommon = 10;
+        this.numBoosterCommon = 11;
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 0;

Mage/src/mage/cards/ExpansionSet.java

@@ -257,7 +257,7 @@ public abstract class ExpansionSet implements Serializable {
         }
     }
 
-    private void addToBooster(List<Card> booster, List<CardInfo> cards) {
+    protected void addToBooster(List<Card> booster, List<CardInfo> cards) {
         if (!cards.isEmpty()) {
             CardInfo cardInfo = cards.remove(rnd.nextInt(cards.size()));
             if (cardInfo != null) {