From 6210fdd9fc30115507b23e857be3c75e88e890e8 Mon Sep 17 00:00:00 2001
From: friarsol <zenchristo@gmail.com>
Date: Fri, 23 Jul 2021 22:46:58 -0400
Subject: [PATCH] Move FatPacks to editions file

---
 .../src/main/java/forge/StaticData.java       | 10 ---
 .../src/main/java/forge/card/CardEdition.java | 18 +++-
 .../src/main/java/forge/item/FatPack.java     | 56 ++-----------
 .../main/java/forge/item/SealedProduct.java   |  2 +-
 forge-gui/res/blockdata/fatpacks.txt          | 84 -------------------
 forge-gui/res/editions/Aether Revolt.txt      |  2 +
 forge-gui/res/editions/Alara Reborn.txt       |  2 +
 forge-gui/res/editions/Amonkhet.txt           |  2 +
 forge-gui/res/editions/Apocalypse.txt         |  1 +
 forge-gui/res/editions/Avacyn Restored.txt    |  2 +
 .../res/editions/Battle for Zendikar.txt      |  2 +
 .../res/editions/Betrayers of Kamigawa.txt    |  1 +
 forge-gui/res/editions/Born of the Gods.txt   |  2 +
 .../res/editions/Champions of Kamigawa.txt    |  1 +
 forge-gui/res/editions/Coldsnap.txt           |  2 +
 forge-gui/res/editions/Conflux.txt            |  2 +
 forge-gui/res/editions/Dark Ascension.txt     |  2 +
 forge-gui/res/editions/Darksteel.txt          |  1 +
 forge-gui/res/editions/Dissension.txt         |  2 +
 forge-gui/res/editions/Dominaria.txt          |  2 +
 forge-gui/res/editions/Dragon's Maze.txt      |  2 +
 forge-gui/res/editions/Dragons of Tarkir.txt  |  2 +
 forge-gui/res/editions/Eldritch Moon.txt      |  2 +
 forge-gui/res/editions/Eventide.txt           |  2 +
 forge-gui/res/editions/Fate Reforged.txt      |  2 +
 forge-gui/res/editions/Fifth Dawn.txt         |  1 +
 forge-gui/res/editions/Future Sight.txt       |  2 +
 forge-gui/res/editions/Gatecrash.txt          |  2 +
 forge-gui/res/editions/Guildpact.txt          |  2 +
 forge-gui/res/editions/Guilds of Ravnica.txt  |  2 +
 .../res/editions/Hour of Devastation.txt      |  2 +
 .../res/editions/Ikoria Lair of Behemoths.txt |  1 +
 forge-gui/res/editions/Innistrad.txt          |  2 +
 forge-gui/res/editions/Invasion.txt           |  1 +
 forge-gui/res/editions/Ixalan.txt             |  2 +
 forge-gui/res/editions/Journey into Nyx.txt   |  2 +
 forge-gui/res/editions/Judgment.txt           |  1 +
 forge-gui/res/editions/Kaladesh.txt           |  2 +
 forge-gui/res/editions/Kaldheim.txt           |  1 +
 forge-gui/res/editions/Khans of Tarkir.txt    |  2 +
 forge-gui/res/editions/Legions.txt            |  1 +
 forge-gui/res/editions/Lorwyn.txt             |  2 +
 forge-gui/res/editions/M19 Gift Pack.txt      |  2 +-
 forge-gui/res/editions/Magic 2010.txt         |  2 +
 forge-gui/res/editions/Magic 2011.txt         |  2 +
 forge-gui/res/editions/Magic 2012.txt         |  2 +
 forge-gui/res/editions/Magic 2013.txt         |  2 +
 forge-gui/res/editions/Magic 2014.txt         |  2 +
 forge-gui/res/editions/Magic 2015.txt         |  2 +
 forge-gui/res/editions/Magic 2019.txt         |  2 +
 forge-gui/res/editions/Magic 2020.txt         |  1 +
 forge-gui/res/editions/Magic 2021.txt         |  1 +
 forge-gui/res/editions/Magic Origins.txt      |  2 +
 forge-gui/res/editions/Mercadian Masques.txt  |  4 +-
 forge-gui/res/editions/Mirrodin Besieged.txt  |  2 +
 forge-gui/res/editions/Mirrodin.txt           |  1 +
 forge-gui/res/editions/Morningtide.txt        |  2 +
 forge-gui/res/editions/Nemesis.txt            |  3 +-
 forge-gui/res/editions/New Phyrexia.txt       |  2 +
 forge-gui/res/editions/Ninth Edition.txt      |  2 +
 .../res/editions/Oath of the Gatewatch.txt    |  2 +
 forge-gui/res/editions/Odyssey.txt            |  1 +
 forge-gui/res/editions/Onslaught.txt          |  2 +
 forge-gui/res/editions/Planar Chaos.txt       |  2 +
 forge-gui/res/editions/Planeshift.txt         |  1 +
 forge-gui/res/editions/Prophecy.txt           |  3 +-
 forge-gui/res/editions/Ravnica Allegiance.txt |  2 +
 .../res/editions/Ravnica City of Guilds.txt   |  2 +
 forge-gui/res/editions/Return to Ravnica.txt  |  2 +
 .../res/editions/Rise of the Eldrazi.txt      |  2 +
 forge-gui/res/editions/Rivals of Ixalan.txt   |  2 +
 .../res/editions/Saviors of Kamigawa.txt      |  1 +
 forge-gui/res/editions/Scars of Mirrodin.txt  |  2 +
 forge-gui/res/editions/Scourge.txt            |  1 +
 forge-gui/res/editions/Shadowmoor.txt         |  2 +
 .../res/editions/Shadows over Innistrad.txt   |  2 +
 forge-gui/res/editions/Shards of Alara.txt    |  2 +
 .../editions/Strixhaven School of Mages.txt   |  1 +
 forge-gui/res/editions/Tenth Edition.txt      |  2 +
 .../res/editions/Theros Beyond Death.txt      |  1 +
 forge-gui/res/editions/Theros.txt             |  2 +
 forge-gui/res/editions/Throne of Eldraine.txt |  2 +
 .../res/editions/Time Spiral Timeshifted.txt  |  2 +
 forge-gui/res/editions/Time Spiral.txt        |  2 +
 forge-gui/res/editions/Torment.txt            |  1 +
 forge-gui/res/editions/War of the Spark.txt   |  2 +
 forge-gui/res/editions/Worldwake.txt          |  2 +
 forge-gui/res/editions/Zendikar Rising.txt    |  1 +
 forge-gui/res/editions/Zendikar.txt           |  2 +
 89 files changed, 174 insertions(+), 147 deletions(-)
 delete mode 100644 forge-gui/res/blockdata/fatpacks.txt

diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java
index 4dc8e927706..6dd7ad72253 100644
--- a/forge-core/src/main/java/forge/StaticData.java
+++ b/forge-core/src/main/java/forge/StaticData.java
@@ -52,8 +52,6 @@ public class StaticData {
     private IStorage<SealedProduct.Template> boosters;
     private IStorage<SealedProduct.Template> specialBoosters;
     private IStorage<SealedProduct.Template> tournaments;
-    private IStorage<FatPack.Template> fatPacks;
-    private IStorage<BoosterBox.Template> boosterBoxes;
     private IStorage<PrintSheet> printSheets;
 
     private static StaticData lastInstance = null;
@@ -239,14 +237,6 @@ public class StaticData {
         }
     }
 
-    // TODO Remove these in favor of them being associated to the Edition
-    /** @return {@link forge.util.storage.IStorage}<{@link forge.item.SealedProduct.Template}> */
-    public IStorage<FatPack.Template> getFatPacks() {
-        if (fatPacks == null)
-            fatPacks = new StorageBase<>("Fat packs", new FatPack.Template.Reader(blockDataFolder + "fatpacks.txt"));
-        return fatPacks;
-    }
-
     /** @return {@link forge.util.storage.IStorage}<{@link forge.item.SealedProduct.Template}> */
     public final IStorage<SealedProduct.Template> getTournamentPacks() {
         if (tournaments == null)
diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java
index 533f425c466..fdceecf16ef 100644
--- a/forge-core/src/main/java/forge/card/CardEdition.java
+++ b/forge-core/src/main/java/forge/card/CardEdition.java
@@ -102,6 +102,16 @@ public final class CardEdition implements Comparable<CardEdition> {
             }
         }
 
+        public String getFatPackDefault() {
+            switch (this) {
+                case CORE:
+                case EXPANSION:
+                    return "10";
+                default:
+                    return "0";
+            }
+        }
+
         public String toString(){
             String[] names = TextUtil.splitWithParenthesis(this.name().toLowerCase(), '_');
             for (int i = 0; i < names.length; i++)
@@ -260,6 +270,8 @@ public final class CardEdition implements Comparable<CardEdition> {
     // SealedProduct
     private String prerelease = null;
     private int boosterBoxCount = 36;
+    private int fatPackCount = 10;
+    private String fatPackExtraSlots = "";
 
     // Booster/draft info
     private boolean smallSetOverride = false;
@@ -350,6 +362,8 @@ public final class CardEdition implements Comparable<CardEdition> {
 
     public String getPrerelease() { return prerelease; }
     public int getBoosterBoxCount() { return boosterBoxCount; }
+    public int getFatPackCount() { return fatPackCount; }
+    public String getFatPackExtraSlots() { return fatPackExtraSlots; }
 
     public FoilType getFoilType() { return foilType; }
     public double getFoilChanceInBooster() { return foilChanceInBooster; }
@@ -635,6 +649,8 @@ public final class CardEdition implements Comparable<CardEdition> {
             res.type = enumType;
             res.prerelease = section.get("Prerelease", null);
             res.boosterBoxCount = Integer.parseInt(section.get("BoosterBox", enumType.getBoosterBoxDefault()));
+            res.fatPackCount = Integer.parseInt(section.get("FatPack", enumType.getFatPackDefault()));
+            res.fatPackExtraSlots = section.get("FatPackExtraSlots", "");
 
             switch(section.get("foil", "newstyle").toLowerCase()) {
                 case "notsupported":
@@ -852,7 +868,7 @@ public final class CardEdition implements Comparable<CardEdition> {
         private static class CanMakeFatPack implements Predicate<CardEdition> {
             @Override
             public boolean apply(final CardEdition subject) {
-                return StaticData.instance().getFatPacks().contains(subject.getCode());
+                return subject.getFatPackCount() > 0;
             }
         }
 
diff --git a/forge-core/src/main/java/forge/item/FatPack.java b/forge-core/src/main/java/forge/item/FatPack.java
index 2ee80d07309..3d0f65a3b7b 100644
--- a/forge-core/src/main/java/forge/item/FatPack.java
+++ b/forge-core/src/main/java/forge/item/FatPack.java
@@ -18,10 +18,8 @@
 
 package forge.item;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.google.common.base.Function;
@@ -30,16 +28,17 @@ import forge.ImageKeys;
 import forge.StaticData;
 import forge.card.CardEdition;
 import forge.item.generation.BoosterGenerator;
-import forge.util.TextUtil;
-import forge.util.storage.StorageReaderFile;
 
 public class FatPack extends BoxedProduct {
     public static final Function<CardEdition, FatPack> FN_FROM_SET = new Function<CardEdition, FatPack>() {
         @Override
-        public FatPack apply(final CardEdition arg1) {
-            FatPack.Template d = StaticData.instance().getFatPacks().get(arg1.getCode());
+        public FatPack apply(final CardEdition edition) {
+            int boosters = edition.getFatPackCount();
+            if (boosters <= 0) { return null; }
+
+            FatPack.Template d = new Template(edition);
             if (d == null) { return null; }
-            return new FatPack(arg1.getName(), d, d.cntBoosters);
+            return new FatPack(edition.getName(), d, d.cntBoosters);
         }
     };
 
@@ -68,17 +67,6 @@ public class FatPack extends BoxedProduct {
         return BoosterGenerator.getBoosterPack(fpData);
     }
 
-    /*@Override
-    protected List<PaperCard> generate() {
-        List<PaperCard> result = new ArrayList<PaperCard>();
-        for (int i = 0; i < fpData.getCntBoosters(); i++) {
-            result.addAll(super.generate());
-        }
-        // Add any extra cards that may come in the fatpack after Boosters
-        result.addAll(BoosterGenerator.getBoosterPack(fpData));
-        return result;
-    }*/
-
     @Override
     public final Object clone() {
         return new FatPack(name, fpData, fpData.cntBoosters);
@@ -92,38 +80,12 @@ public class FatPack extends BoxedProduct {
     public static class Template extends SealedProduct.Template {
         private final int cntBoosters;
 
-
         public int getCntBoosters() { return cntBoosters; }
 
-        private Template(String edition, int boosters, Iterable<Pair<String, Integer>> itrSlots)
-        {
-            super(edition, itrSlots);
-            cntBoosters = boosters;
-        }
+        private Template(CardEdition edition) {
+            super(edition.getCode(), edition.getFatPackExtraSlots());
 
-        public static final class Reader extends StorageReaderFile<Template> {
-            public Reader(String pathname) {
-                super(pathname, FN_GET_NAME);
-            }
-
-            @Override
-            protected Template read(String line, int i) {
-                String[] headAndData = TextUtil.split(line, ':', 2);
-                final String edition = headAndData[0];
-                final String[] data = TextUtil.splitWithParenthesis(headAndData[1], ',');
-                int nBoosters = 6;
-
-                List<Pair<String, Integer>> slots = new ArrayList<>();
-                for(String slotDesc : data) {
-                    String[] kv = TextUtil.split(slotDesc, ' ', 2);
-                    if (kv[1].startsWith("Booster"))
-                        nBoosters = Integer.parseInt(kv[0]);
-                    else
-                        slots.add(ImmutablePair.of(kv[1], Integer.parseInt(kv[0])));
-                }
-
-                return new FatPack.Template(edition, nBoosters, slots);
-            }
+            cntBoosters = edition.getFatPackCount();
         }
         
         @Override
diff --git a/forge-core/src/main/java/forge/item/SealedProduct.java b/forge-core/src/main/java/forge/item/SealedProduct.java
index 1d19504be22..469d0e9ab0b 100644
--- a/forge-core/src/main/java/forge/item/SealedProduct.java
+++ b/forge-core/src/main/java/forge/item/SealedProduct.java
@@ -60,7 +60,7 @@ public abstract class SealedProduct implements InventoryItemFromSet {
     public SealedProduct(String name0, Template boosterData) {
         if (null == name0)       { throw new IllegalArgumentException("name0 must not be null");       }
         if (null == boosterData) {
-            throw new IllegalArgumentException("boosterData must not be null");
+            throw new IllegalArgumentException("boosterData for " + name0 + " must not be null");
         }
         contents = boosterData;
         name = name0;
diff --git a/forge-gui/res/blockdata/fatpacks.txt b/forge-gui/res/blockdata/fatpacks.txt
deleted file mode 100644
index 8cea55a24af..00000000000
--- a/forge-gui/res/blockdata/fatpacks.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-MMQ: 6 Boosters, 30 BasicLands 
-NMS: 6 Boosters
-PCY: 6 Boosters
-INV: 6 Boosters
-PLS: 6 Boosters
-APC: 6 Boosters
-ODY: 6 Boosters
-TOR: 6 Boosters
-JUD: 6 Boosters
-ONS: 9 Boosters, 30 BasicLands 
-LGN: 6 Boosters
-SCG: 6 Boosters
-MRD: 6 Boosters
-DST: 6 Boosters
-5DN: 6 Boosters
-CHK: 6 Boosters
-BOK: 6 Boosters
-SOK: 6 Boosters
-9ED: 6 Boosters, 40 BasicLands 
-RAV: 6 Boosters, 40 BasicLands 
-GPT: 6 Boosters, 40 BasicLands RAV
-DIS: 6 Boosters, 40 BasicLands RAV
-CSP: 6 Boosters, 40 BasicLands 
-TSP: 6 Boosters, 40 BasicLands 
-PLC: 6 Boosters, 40 BasicLands TSP
-FUT: 6 Boosters, 40 BasicLands TSP
-10E: 6 Boosters, 40 BasicLands 
-LRW: 6 Boosters, 40 BasicLands 
-MOR: 6 Boosters, 40 BasicLands LRW
-SHM: 8 Boosters, 40 BasicLands 
-EVE: 8 Boosters, 40 BasicLands SHM
-ALA: 8 Boosters, 40 BasicLands 
-CFX: 8 Boosters, 40 BasicLands ALA
-ARB: 8 Boosters, 40 BasicLands ALA
-M10: 8 Boosters, 40 BasicLands 
-ZEN: 8 Boosters, 40 BasicLands 
-WWK: 8 Boosters, 40 BasicLands ZEN
-ROE: 8 Boosters, 40 BasicLands 
-M11: 8 Boosters, 40 BasicLands 
-SOM: 8 Boosters, 40 BasicLands 
-MBS: 9 Boosters, 80 BasicLands MBS
-NPH: 9 Boosters, 80 BasicLands NPH
-M12: 9 Boosters, 80 BasicLands 
-ISD: 9 Boosters, 70 BasicLands 
-DKA: 9 Boosters, 70 BasicLands ISD
-AVR: 9 Boosters, 80 BasicLands 
-M13: 9 Boosters, 80 BasicLands 
-RTR: 9 Boosters, 80 BasicLands 
-GTC: 9 Boosters, 80 BasicLands RTR
-DGM: 9 Boosters, 80 BasicLands RTR
-M14: 9 Boosters, 80 BasicLands 
-THS: 9 Boosters, 80 BasicLands 
-BNG: 9 Boosters, 80 BasicLands THS
-JOU: 9 Boosters, 80 BasicLands THS
-M15: 9 Boosters, 80 BasicLands
-KTK: 9 Boosters, 80 BasicLands 
-FRF: 9 Boosters, 80 BasicLands
-DTK: 9 Boosters, 80 BasicLands 
-ORI: 9 Boosters, 80 BasicLands
-BFZ: 9 Boosters, 80 BasicLands
-OGW: 9 Boosters, 66 BasicLands BFZ, 14 name("Wastes")
-SOI: 9 Boosters, 80 BasicLands
-EMN: 9 Boosters, 80 BasicLands SOI
-KLD: 10 Boosters, 80 BasicLands
-AER: 10 Boosters, 80 BasicLands KLD
-AKH: 10 Boosters, 80 BasicLands
-HOU: 10 Boosters, 80 BasicLands
-XLN: 10 Boosters, 80 BasicLands
-RIX: 10 Boosters, 80 BasicLands
-DOM: 10 Boosters, 80 BasicLands
-M19: 10 Boosters, 80 BasicLands
-GRN: 10 Boosters, 80 BasicLands
-RNA: 10 Boosters, 80 BasicLands
-WAR: 10 Boosters, 80 BasicLands
-ELD: 10 Boosters, 40 BasicLands
-#needs to be 20 BasicLands, 20 Foil BasicLands, 1 Piper of the Swarm+|ELD|3
-THB: 10 Boosters, 40 BasicLands
-#needs to be 20 BasicLands, 20 Foil BasicLands, 1 Arasta of the Endless Web+|THB|3
-IKO: 10 Boosters, 40 BasicLands
-#needs to be 20 BasicLands, 20 Foil BasicLands, 1 Colossification+|IKO|3
-M21: 10 Boosters, 40 BasicLands
-#needs to be 20 BasicLands, 20 Foil BasicLands, 1 Pack Leader+|M21|3
-ZNR: 10 Boosters, 40 BasicLands
-#needs to be 20 BasicLands, 20 Foil BasicLands, 1 Charix, the Raging Isle+|ZNR|3
\ No newline at end of file
diff --git a/forge-gui/res/editions/Aether Revolt.txt b/forge-gui/res/editions/Aether Revolt.txt
index 69c7707871a..ef5f2f742be 100644
--- a/forge-gui/res/editions/Aether Revolt.txt	
+++ b/forge-gui/res/editions/Aether Revolt.txt	
@@ -8,6 +8,8 @@ MciCode=aer
 BoosterCovers=3
 Booster=10 Common:fromSheet("AER cards"), 3 Uncommon:fromSheet("AER cards"), 1 RareMythic:fromSheet("AER cards"), 1 BasicLand KLD
 AdditionalSheetForFoils=fromSheet("AER Aether Revolt Inventions")
+FatPack=10
+FatPackExtraSlots=80 BasicLands KLD
 AdditionalSetUnlockedInQuest=MPS_KLD
 ScryfallCode=AER
 
diff --git a/forge-gui/res/editions/Alara Reborn.txt b/forge-gui/res/editions/Alara Reborn.txt
index 10d39942a03..ddd06ceed6d 100644
--- a/forge-gui/res/editions/Alara Reborn.txt	
+++ b/forge-gui/res/editions/Alara Reborn.txt	
@@ -7,6 +7,8 @@ MciCode=arb
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand ALA
+FatPack=8
+FatPackExtraSlots=40 BasicLands ALA
 ScryfallCode=ARB
 
 [cards]
diff --git a/forge-gui/res/editions/Amonkhet.txt b/forge-gui/res/editions/Amonkhet.txt
index 280058c2403..498103a57c5 100644
--- a/forge-gui/res/editions/Amonkhet.txt
+++ b/forge-gui/res/editions/Amonkhet.txt
@@ -8,6 +8,8 @@ MciCode=akh
 BoosterCovers=5
 Booster=10 Common:!fromSheet("AKH Planeswalker Decks and Toolkit"), 3 Uncommon:!fromSheet("AKH Planeswalker Decks and Toolkit"), 1 RareMythic:!fromSheet("AKH Planeswalker Decks and Toolkit"), 1 BasicLand AKH
 AdditionalSheetForFoils=fromSheet("MPS Amonkhet Invocations")
+FatPack=10
+FatPackExtraSlots=80 BasicLands
 AdditionalSetUnlockedInQuest=MPS_AKH
 ChaosDraftThemes=GRAVEYARD_MATTERS
 ScryfallCode=AKH
diff --git a/forge-gui/res/editions/Apocalypse.txt b/forge-gui/res/editions/Apocalypse.txt
index c58aa184fd2..893d3ee1ac1 100644
--- a/forge-gui/res/editions/Apocalypse.txt
+++ b/forge-gui/res/editions/Apocalypse.txt
@@ -7,6 +7,7 @@ MciCode=ap
 Type=Expansion
 BoosterCovers=1
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 Foil=OldStyle
 FoilAlwaysInCommonSlot=False
 ScryfallCode=APC
diff --git a/forge-gui/res/editions/Avacyn Restored.txt b/forge-gui/res/editions/Avacyn Restored.txt
index c16f437bf3b..8081a342531 100644
--- a/forge-gui/res/editions/Avacyn Restored.txt	
+++ b/forge-gui/res/editions/Avacyn Restored.txt	
@@ -7,6 +7,8 @@ MciCode=avr
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+FatPack=9
+FatPackExtraSlots=80 BasicLands
 ChaosDraftThemes=GRAVEYARD_MATTERS
 ScryfallCode=AVR
 
diff --git a/forge-gui/res/editions/Battle for Zendikar.txt b/forge-gui/res/editions/Battle for Zendikar.txt
index 5e29e5e43a3..2c1a3c25163 100644
--- a/forge-gui/res/editions/Battle for Zendikar.txt	
+++ b/forge-gui/res/editions/Battle for Zendikar.txt	
@@ -7,6 +7,8 @@ MciCode=bfz
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand BFZ
+FatPack=9
+FatPackExtraSlots=80 BasicLands
 AdditionalSheetForFoils=fromSheet("EXP Lands")
 AdditionalSetUnlockedInQuest=EXP
 ScryfallCode=BFZ
diff --git a/forge-gui/res/editions/Betrayers of Kamigawa.txt b/forge-gui/res/editions/Betrayers of Kamigawa.txt
index 17ae00935be..64c022ce672 100644
--- a/forge-gui/res/editions/Betrayers of Kamigawa.txt	
+++ b/forge-gui/res/editions/Betrayers of Kamigawa.txt	
@@ -7,6 +7,7 @@ MciCode=bok
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 FoilAlwaysInCommonSlot=False
 ScryfallCode=BOK
 
diff --git a/forge-gui/res/editions/Born of the Gods.txt b/forge-gui/res/editions/Born of the Gods.txt
index 842daa8e1da..7c5a019f943 100644
--- a/forge-gui/res/editions/Born of the Gods.txt	
+++ b/forge-gui/res/editions/Born of the Gods.txt	
@@ -6,6 +6,8 @@ MciCode=bng
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand THS
+FatPack=9
+FatPackExtraSlots=80 BasicLands THS
 ScryfallCode=BNG
 
 [cards]
diff --git a/forge-gui/res/editions/Champions of Kamigawa.txt b/forge-gui/res/editions/Champions of Kamigawa.txt
index f361164e473..101f0b19d5c 100644
--- a/forge-gui/res/editions/Champions of Kamigawa.txt	
+++ b/forge-gui/res/editions/Champions of Kamigawa.txt	
@@ -7,6 +7,7 @@ MciCode=chk
 Type=Expansion
 BoosterCovers=5
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 FoilAlwaysInCommonSlot=False
 ScryfallCode=CHK
 
diff --git a/forge-gui/res/editions/Coldsnap.txt b/forge-gui/res/editions/Coldsnap.txt
index 403cc08e576..b4701550074 100644
--- a/forge-gui/res/editions/Coldsnap.txt
+++ b/forge-gui/res/editions/Coldsnap.txt
@@ -7,6 +7,8 @@ MciCode=cs
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
+FatPackExtraSlots=40 BasicLands
 ScryfallCode=CSP
 
 [cards]
diff --git a/forge-gui/res/editions/Conflux.txt b/forge-gui/res/editions/Conflux.txt
index 746f8f27601..95d583f99fb 100644
--- a/forge-gui/res/editions/Conflux.txt
+++ b/forge-gui/res/editions/Conflux.txt
@@ -8,6 +8,8 @@ MciCode=cfx
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand ALA
+FatPack=8
+FatPackExtraSlots=40 BasicLands ALA
 ScryfallCode=CON
 
 [cards]
diff --git a/forge-gui/res/editions/Dark Ascension.txt b/forge-gui/res/editions/Dark Ascension.txt
index b020558359e..6a4f9b37c5b 100644
--- a/forge-gui/res/editions/Dark Ascension.txt	
+++ b/forge-gui/res/editions/Dark Ascension.txt	
@@ -7,6 +7,8 @@ MciCode=dka
 Type=Expansion
 BoosterCovers=3
 Booster=9 Common:!dfc, 3 Uncommon:!dfc, 1 RareMythic:!dfc, 1 dfc, 1 BasicLand ISD
+FatPack=9
+FatPackExtraSlots=70 BasicLands ISD
 ChaosDraftThemes=GRAVEYARD_MATTERS
 ScryfallCode=DKA
 
diff --git a/forge-gui/res/editions/Darksteel.txt b/forge-gui/res/editions/Darksteel.txt
index 398cfc4009e..850cb177bd0 100644
--- a/forge-gui/res/editions/Darksteel.txt
+++ b/forge-gui/res/editions/Darksteel.txt
@@ -7,6 +7,7 @@ MciCode=ds
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 FoilAlwaysInCommonSlot=False
 ChaosDraftThemes=MIRRODIN
 ScryfallCode=DST
diff --git a/forge-gui/res/editions/Dissension.txt b/forge-gui/res/editions/Dissension.txt
index 5e061f60d76..1d791ad3d2d 100644
--- a/forge-gui/res/editions/Dissension.txt
+++ b/forge-gui/res/editions/Dissension.txt
@@ -7,6 +7,8 @@ MciCode=di
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
+FatPackExtraSlots=40 BasicLands RAV
 FoilAlwaysInCommonSlot=False
 ChaosDraftThemes=RAVNICA
 ScryfallCode=DIS
diff --git a/forge-gui/res/editions/Dominaria.txt b/forge-gui/res/editions/Dominaria.txt
index d0abf979c69..fcf4e5c0e61 100644
--- a/forge-gui/res/editions/Dominaria.txt
+++ b/forge-gui/res/editions/Dominaria.txt
@@ -7,6 +7,8 @@ MciCode=dom
 BoosterCovers=5
 Booster=10 Common:!fromSheet("DOM Planeswalker Decks and Additional Promo"), 3 Uncommon:!fromSheet("DOM Planeswalker Decks and Additional Promo"), 1 RareMythic:!fromSheet("DOM Planeswalker Decks and Additional Promo"), 1 BasicLand DOM
 BoosterMustContain=Legendary Creature
+FatPack=10
+FatPackExtraSlots=80 BasicLands
 ScryfallCode=DOM
 
 [cards]
diff --git a/forge-gui/res/editions/Dragon's Maze.txt b/forge-gui/res/editions/Dragon's Maze.txt
index c1dfe9d8c02..84887ce833c 100644
--- a/forge-gui/res/editions/Dragon's Maze.txt	
+++ b/forge-gui/res/editions/Dragon's Maze.txt	
@@ -7,6 +7,8 @@ MciCode=dgm
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common:!land, 3 Uncommon, 1 RareMythic:!land, 1 fromSheet("DGM Lands")
+FatPack=9
+FatPackExtraSlots=80 BasicLands RTR
 ChaosDraftThemes=RAVNICA
 ScryfallCode=DGM
 
diff --git a/forge-gui/res/editions/Dragons of Tarkir.txt b/forge-gui/res/editions/Dragons of Tarkir.txt
index d98e6025c39..79519cfb9e8 100644
--- a/forge-gui/res/editions/Dragons of Tarkir.txt	
+++ b/forge-gui/res/editions/Dragons of Tarkir.txt	
@@ -7,6 +7,8 @@ MciCode=dtk
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand DTK
+FatPack=9
+FatPackExtraSlots=80 BasicLands
 ScryfallCode=DTK
 
 [cards]
diff --git a/forge-gui/res/editions/Eldritch Moon.txt b/forge-gui/res/editions/Eldritch Moon.txt
index ac5a01cec47..38a869401d1 100644
--- a/forge-gui/res/editions/Eldritch Moon.txt	
+++ b/forge-gui/res/editions/Eldritch Moon.txt	
@@ -7,6 +7,8 @@ Type=Expansion
 MciCode=emn
 BoosterCovers=3
 Booster=9 Common:!dfc, 3 Uncommon:!dfc, 1 RareMythic:!dfc, 1 dfc:!Rare:!Mythic, 1 BasicLand SOI
+FatPack=9
+FatPackExtraSlots=80 BasicLands SOI
 ChanceReplaceCommonWith=.125F dfc:RareMythic
 TreatAsSmallSet=true
 ChaosDraftThemes=GRAVEYARD_MATTERS
diff --git a/forge-gui/res/editions/Eventide.txt b/forge-gui/res/editions/Eventide.txt
index 241d3474486..a9dfe4f59cd 100644
--- a/forge-gui/res/editions/Eventide.txt
+++ b/forge-gui/res/editions/Eventide.txt
@@ -8,6 +8,8 @@ MciCode=eve
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=8
+FatPackExtraSlots=40 BasicLands SHM
 ScryfallCode=EVE
 
 [cards]
diff --git a/forge-gui/res/editions/Fate Reforged.txt b/forge-gui/res/editions/Fate Reforged.txt
index 875a6a19d8a..74c72cbb195 100644
--- a/forge-gui/res/editions/Fate Reforged.txt	
+++ b/forge-gui/res/editions/Fate Reforged.txt	
@@ -6,6 +6,8 @@ MciCode=frf
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common:!land, 3 Uncommon, 1 RareMythic, 1 fromSheet("FRF Lands"), 0 fromSheet("FRF Basic Lands")
+FatPack=9
+FatPackExtraSlots=80 BasicLands
 ChaosDraftThemes=GRAVEYARD_MATTERS
 ScryfallCode=FRF
 
diff --git a/forge-gui/res/editions/Fifth Dawn.txt b/forge-gui/res/editions/Fifth Dawn.txt
index 525e4d35b7e..8ca1f293110 100644
--- a/forge-gui/res/editions/Fifth Dawn.txt	
+++ b/forge-gui/res/editions/Fifth Dawn.txt	
@@ -7,6 +7,7 @@ MciCode=5dn
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 FoilAlwaysInCommonSlot=False
 ChaosDraftThemes=MIRRODIN
 ScryfallCode=5DN
diff --git a/forge-gui/res/editions/Future Sight.txt b/forge-gui/res/editions/Future Sight.txt
index b8a527c0102..c1329506ac8 100644
--- a/forge-gui/res/editions/Future Sight.txt	
+++ b/forge-gui/res/editions/Future Sight.txt	
@@ -7,6 +7,8 @@ MciCode=fut
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
+FatPackExtraSlots=40 BasicLands TSP
 ScryfallCode=FUT
 
 [cards]
diff --git a/forge-gui/res/editions/Gatecrash.txt b/forge-gui/res/editions/Gatecrash.txt
index ee980f75efc..407d0bd876c 100644
--- a/forge-gui/res/editions/Gatecrash.txt
+++ b/forge-gui/res/editions/Gatecrash.txt
@@ -7,6 +7,8 @@ MciCode=gtc
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand RTR
+FatPack=9
+FatPackExtraSlots=80 BasicLands RTR
 ChaosDraftThemes=RAVNICA
 ScryfallCode=GTC
 
diff --git a/forge-gui/res/editions/Guildpact.txt b/forge-gui/res/editions/Guildpact.txt
index b1150f2b3b1..18f86e7e5b1 100644
--- a/forge-gui/res/editions/Guildpact.txt
+++ b/forge-gui/res/editions/Guildpact.txt
@@ -7,6 +7,8 @@ MciCode=gp
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
+FatPackExtraSlots=40 BasicLands RAV
 FoilAlwaysInCommonSlot=False
 ChaosDraftThemes=RAVNICA
 ScryfallCode=GPT
diff --git a/forge-gui/res/editions/Guilds of Ravnica.txt b/forge-gui/res/editions/Guilds of Ravnica.txt
index a7b51e7e750..d1a997eaeb6 100644
--- a/forge-gui/res/editions/Guilds of Ravnica.txt	
+++ b/forge-gui/res/editions/Guilds of Ravnica.txt	
@@ -8,6 +8,8 @@ Type=Expansion
 BoosterCovers=5
 Booster=10 Common:!fromSheet("GRN Secret Cards"), 3 Uncommon:!fromSheet("GRN Secret Cards"), 1 RareMythic:!fromSheet("GRN Secret Cards"), 1 fromSheet("GRN Lands")
 AdditionalSetUnlockedInQuest=GK1
+FatPack=10
+FatPackExtraSlots=80 BasicLands
 ChaosDraftThemes=RAVNICA;GRAVEYARD_MATTERS
 ScryfallCode=GRN
 
diff --git a/forge-gui/res/editions/Hour of Devastation.txt b/forge-gui/res/editions/Hour of Devastation.txt
index 4a19528a2f7..e66437f4570 100644
--- a/forge-gui/res/editions/Hour of Devastation.txt	
+++ b/forge-gui/res/editions/Hour of Devastation.txt	
@@ -8,6 +8,8 @@ MciCode=hou
 BoosterCovers=5
 Booster=10 Common:!fromSheet("HOU Planeswalker Decks and Toolkit"), 3 Uncommon:!fromSheet("HOU Planeswalker Decks and Toolkit"), 1 RareMythic:!fromSheet("HOU Planeswalker Decks and Toolkit"), 1 BasicLand
 AdditionalSheetForFoils=fromSheet("MPS Hour of Devastation Invocations")
+FatPack=10
+FatPackExtraSlots=80 BasicLands
 AdditionalSetUnlockedInQuest=MPS_AKH
 TreatAsSmallSet=true
 ChaosDraftThemes=GRAVEYARD_MATTERS
diff --git a/forge-gui/res/editions/Ikoria Lair of Behemoths.txt b/forge-gui/res/editions/Ikoria Lair of Behemoths.txt
index 90ba84579f3..be605277088 100644
--- a/forge-gui/res/editions/Ikoria Lair of Behemoths.txt	
+++ b/forge-gui/res/editions/Ikoria Lair of Behemoths.txt	
@@ -8,6 +8,7 @@ Type=Expansion
 BoosterCovers=3
 Booster=10 Common:fromSheet("IKO cards"):!fromSheet("IKO Lands"), 3 Uncommon:fromSheet("IKO cards"), 1 RareMythic:fromSheet("IKO cards"), 1 fromSheet("IKO Lands")
 Prerelease=6 Boosters, 1 RareMythic+
+FatPackExtraSlots=20 BasicLands, 20 BasicLands+, 1 Colossification+|IKO|3
 ScryfallCode=IKO
 
 [cards]
diff --git a/forge-gui/res/editions/Innistrad.txt b/forge-gui/res/editions/Innistrad.txt
index aa3c496f365..e7d2e6e9d3d 100644
--- a/forge-gui/res/editions/Innistrad.txt
+++ b/forge-gui/res/editions/Innistrad.txt
@@ -7,6 +7,8 @@ MciCode=isd
 Type=Expansion
 BoosterCovers=5
 Booster=9 Common:!dfc, 3 Uncommon:!dfc, 1 RareMythic:!dfc, 1 dfc, 1 BasicLand
+FatPack=9
+FatPackExtraSlots=70 BasicLands
 ChaosDraftThemes=GRAVEYARD_MATTERS
 ScryfallCode=ISD
 
diff --git a/forge-gui/res/editions/Invasion.txt b/forge-gui/res/editions/Invasion.txt
index 5fcca1d20dc..e0d4aa9364d 100644
--- a/forge-gui/res/editions/Invasion.txt
+++ b/forge-gui/res/editions/Invasion.txt
@@ -7,6 +7,7 @@ MciCode=in
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 Foil=OldStyle
 FoilAlwaysInCommonSlot=False
 ScryfallCode=INV
diff --git a/forge-gui/res/editions/Ixalan.txt b/forge-gui/res/editions/Ixalan.txt
index 5b35da73414..faa0ccc1273 100644
--- a/forge-gui/res/editions/Ixalan.txt
+++ b/forge-gui/res/editions/Ixalan.txt
@@ -7,6 +7,8 @@ Type=Expansion
 MciCode=xln
 BoosterCovers=5
 Booster=10 Common:fromSheet("XLN cards"), 3 Uncommon:fromSheet("XLN cards"), 1 RareMythic:fromSheet("XLN cards"), 1 BasicLand
+FatPack=10
+FatPackExtraSlots=80 BasicLands
 ScryfallCode=XLN
 
 [cards]
diff --git a/forge-gui/res/editions/Journey into Nyx.txt b/forge-gui/res/editions/Journey into Nyx.txt
index be3f52e5d8b..e156998296b 100644
--- a/forge-gui/res/editions/Journey into Nyx.txt	
+++ b/forge-gui/res/editions/Journey into Nyx.txt	
@@ -6,6 +6,8 @@ MciCode=jou
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand THS
+FatPack=9
+FatPackExtraSlots=80 BasicLands THS
 ScryfallCode=JOU
 
 [cards]
diff --git a/forge-gui/res/editions/Judgment.txt b/forge-gui/res/editions/Judgment.txt
index fe3abe2fd5f..4e79efa63be 100644
--- a/forge-gui/res/editions/Judgment.txt
+++ b/forge-gui/res/editions/Judgment.txt
@@ -7,6 +7,7 @@ MciCode=ju
 Type=Expansion
 BoosterCovers=1
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 Foil=OldStyle
 FoilAlwaysInCommonSlot=False
 ChaosDraftThemes=GRAVEYARD_MATTERS
diff --git a/forge-gui/res/editions/Kaladesh.txt b/forge-gui/res/editions/Kaladesh.txt
index 3909b309f2b..8a0cdd97818 100644
--- a/forge-gui/res/editions/Kaladesh.txt
+++ b/forge-gui/res/editions/Kaladesh.txt
@@ -8,6 +8,8 @@ MciCode=kld
 BoosterCovers=3
 Booster=10 Common:fromSheet("KLD cards"), 3 Uncommon:fromSheet("KLD cards"), 1 RareMythic:fromSheet("KLD cards"), 1 BasicLand
 AdditionalSheetForFoils=fromSheet("KLD Kaladesh Inventions")
+FatPack=10
+FatPackExtraSlots=80 BasicLands
 AdditionalSetUnlockedInQuest=MPS_KLD
 ScryfallCode=KLD
 
diff --git a/forge-gui/res/editions/Kaldheim.txt b/forge-gui/res/editions/Kaldheim.txt
index be197e1b575..cda99af13a1 100644
--- a/forge-gui/res/editions/Kaldheim.txt
+++ b/forge-gui/res/editions/Kaldheim.txt
@@ -9,6 +9,7 @@ BoosterCovers=3
 Booster=10 Common:!fromSheet("KHM Snow Lands"):fromsheet("KHM cards"), 3 Uncommon:fromSheet("KHM cards"), 1 RareMythic:fromSheet("KHM cards"), 1 fromSheet("KHM Snow Lands")
 Prerelease=6 Boosters, 1 RareMythic+
 #BoosterBox=36 Boosters, 1 fromSheet('KHM buy a box')+
+FatPackExtraSlots=20 BasicLands, 20 BasicLands+
 ScryfallCode=KHM
 
 [cards]
diff --git a/forge-gui/res/editions/Khans of Tarkir.txt b/forge-gui/res/editions/Khans of Tarkir.txt
index 50be0f1687b..651efbb3aee 100644
--- a/forge-gui/res/editions/Khans of Tarkir.txt	
+++ b/forge-gui/res/editions/Khans of Tarkir.txt	
@@ -7,6 +7,8 @@ MciCode=ktk
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand KTK
+FatPack=9
+FatPackExtraSlots=80 BasicLands
 ChaosDraftThemes=GRAVEYARD_MATTERS
 ScryfallCode=KTK
 
diff --git a/forge-gui/res/editions/Legions.txt b/forge-gui/res/editions/Legions.txt
index f524cdf3595..9a43deddaf0 100644
--- a/forge-gui/res/editions/Legions.txt
+++ b/forge-gui/res/editions/Legions.txt
@@ -7,6 +7,7 @@ MciCode=le
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 Foil=OldStyle
 FoilAlwaysInCommonSlot=False
 ScryfallCode=LGN
diff --git a/forge-gui/res/editions/Lorwyn.txt b/forge-gui/res/editions/Lorwyn.txt
index 742db97fe77..22643848b31 100644
--- a/forge-gui/res/editions/Lorwyn.txt
+++ b/forge-gui/res/editions/Lorwyn.txt
@@ -7,6 +7,8 @@ MciCode=lw
 Type=Expansion
 BoosterCovers=5
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
+FatPackExtraSlots=40 BasicLands
 ScryfallCode=LRW
 
 [cards]
diff --git a/forge-gui/res/editions/M19 Gift Pack.txt b/forge-gui/res/editions/M19 Gift Pack.txt
index a0354d7d716..7fca1cfe0d4 100644
--- a/forge-gui/res/editions/M19 Gift Pack.txt	
+++ b/forge-gui/res/editions/M19 Gift Pack.txt	
@@ -4,7 +4,7 @@ Date=2018-11-16
 Name=M19 Gift Pack
 Code2=G18
 MciCode=g18
-Type=Core
+Type=Promo
 ScryfallCode=g18
 
 [cards]
diff --git a/forge-gui/res/editions/Magic 2010.txt b/forge-gui/res/editions/Magic 2010.txt
index 49867302d86..afbf99887ec 100644
--- a/forge-gui/res/editions/Magic 2010.txt	
+++ b/forge-gui/res/editions/Magic 2010.txt	
@@ -7,6 +7,8 @@ MciCode=m10
 Type=Core
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+FatPack=8
+FatPackExtraSlots=40 BasicLands
 ChaosDraftThemes=CORE_SET
 ScryfallCode=M10
 
diff --git a/forge-gui/res/editions/Magic 2011.txt b/forge-gui/res/editions/Magic 2011.txt
index f91d0a7fa68..76da5a8bd65 100644
--- a/forge-gui/res/editions/Magic 2011.txt	
+++ b/forge-gui/res/editions/Magic 2011.txt	
@@ -7,6 +7,8 @@ MciCode=m11
 Type=Core
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+FatPack=8
+FatPackExtraSlots=40 BasicLands
 ChaosDraftThemes=CORE_SET
 ScryfallCode=M11
 
diff --git a/forge-gui/res/editions/Magic 2012.txt b/forge-gui/res/editions/Magic 2012.txt
index 6af98b695fa..cebff00d67d 100644
--- a/forge-gui/res/editions/Magic 2012.txt	
+++ b/forge-gui/res/editions/Magic 2012.txt	
@@ -7,6 +7,8 @@ MciCode=m12
 Type=Core
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+FatPack=9
+FatPackExtraSlots=40 BasicLands
 ChaosDraftThemes=CORE_SET
 ScryfallCode=M12
 
diff --git a/forge-gui/res/editions/Magic 2013.txt b/forge-gui/res/editions/Magic 2013.txt
index 588ad48cb1d..3e7178d1498 100644
--- a/forge-gui/res/editions/Magic 2013.txt	
+++ b/forge-gui/res/editions/Magic 2013.txt	
@@ -7,6 +7,8 @@ MciCode=m13
 Type=Core
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+FatPack=9
+FatPackExtraSlots=80 BasicLands
 ChaosDraftThemes=CORE_SET
 ScryfallCode=M13
 
diff --git a/forge-gui/res/editions/Magic 2014.txt b/forge-gui/res/editions/Magic 2014.txt
index 712c18f8c35..418459bb40b 100644
--- a/forge-gui/res/editions/Magic 2014.txt	
+++ b/forge-gui/res/editions/Magic 2014.txt	
@@ -7,6 +7,8 @@ MciCode=m14
 Type=Core
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+FatPack=9
+FatPackExtraSlots=80 BasicLands
 ChaosDraftThemes=CORE_SET
 ScryfallCode=M14
 
diff --git a/forge-gui/res/editions/Magic 2015.txt b/forge-gui/res/editions/Magic 2015.txt
index f58354c95df..79ba1cc069d 100644
--- a/forge-gui/res/editions/Magic 2015.txt	
+++ b/forge-gui/res/editions/Magic 2015.txt	
@@ -7,6 +7,8 @@ MciCode=m15
 Type=Core
 BoosterCovers=5
 Booster=10 Common:!fromSheet("M15 Sample Cards"), 3 Uncommon:!fromSheet("M15 Sample Cards"), 1 RareMythic:!fromSheet("M15 Sample Cards"), 1 BasicLand
+FatPack=9
+FatPackExtraSlots=80 BasicLands
 ChaosDraftThemes=CORE_SET
 ScryfallCode=M15
 
diff --git a/forge-gui/res/editions/Magic 2019.txt b/forge-gui/res/editions/Magic 2019.txt
index 16209d1edd1..41b6c34052e 100644
--- a/forge-gui/res/editions/Magic 2019.txt	
+++ b/forge-gui/res/editions/Magic 2019.txt	
@@ -8,6 +8,8 @@ Type=Core
 BoosterCovers=5
 Booster=10 Common:!fromSheet("M19 Secret Cards"), 3 Uncommon:!fromSheet("M19 Secret Cards"), 1 RareMythic:!fromSheet("M19 Secret Cards"), 1 fromSheet("M19 Lands")
 ChaosDraftThemes=CORE_SET
+FatPack=10
+FatPackExtraSlots=80 BasicLands
 ScryfallCode=M19
 
 [cards]
diff --git a/forge-gui/res/editions/Magic 2020.txt b/forge-gui/res/editions/Magic 2020.txt
index 3353e49cc4c..c977ee1c84e 100644
--- a/forge-gui/res/editions/Magic 2020.txt	
+++ b/forge-gui/res/editions/Magic 2020.txt	
@@ -6,6 +6,7 @@ MciCode=m20
 Type=Core
 BoosterCovers=3
 Booster=10 Common:!fromSheet("M20 Secret Cards"), 3 Uncommon:!fromSheet("M20 Secret Cards"), 1 RareMythic:!fromSheet("M20 Secret Cards"), 1 fromSheet("M20 Lands")
+FatPackExtraSlots=80 BasicLands
 ChaosDraftThemes=CORE_SET
 ScryfallCode=M20
 
diff --git a/forge-gui/res/editions/Magic 2021.txt b/forge-gui/res/editions/Magic 2021.txt
index c73e31f7f0a..83c3f9dcc26 100644
--- a/forge-gui/res/editions/Magic 2021.txt	
+++ b/forge-gui/res/editions/Magic 2021.txt	
@@ -6,6 +6,7 @@ Type=Core
 BoosterCovers=3
 Booster=10 Common:fromSheet("M21 cards"):!fromSheet("M21 Lands"), 3 Uncommon:fromSheet("M21 cards"), 1 RareMythic:fromSheet("M21 cards"), 1 fromSheet("M21 Lands")
 Prerelease=6 Boosters, 1 RareMythic+
+FatPackExtraSlots=20 BasicLands, 20 BasicLands+, 1 Pack Leader+|M21|3
 ChaosDraftThemes=CORE_SET
 ScryfallCode=M21
 
diff --git a/forge-gui/res/editions/Magic Origins.txt b/forge-gui/res/editions/Magic Origins.txt
index 770d061775f..a5004b9b002 100644
--- a/forge-gui/res/editions/Magic Origins.txt	
+++ b/forge-gui/res/editions/Magic Origins.txt	
@@ -7,6 +7,8 @@ MciCode=ori
 Type=Core
 BoosterCovers=5
 Booster=10 Common:!fromSheet("ORI Sample Cards"), 3 Uncommon:!fromSheet("ORI Sample Cards"), 1 RareMythic:!fromSheet("ORI Sample Cards"), 1 BasicLand
+FatPack=9
+FatPackExtraSlots=80 BasicLands
 ChaosDraftThemes=CORE_SET
 ScryfallCode=ORI
 
diff --git a/forge-gui/res/editions/Mercadian Masques.txt b/forge-gui/res/editions/Mercadian Masques.txt
index a6dd83e7eb3..4a31e3e7d5b 100644
--- a/forge-gui/res/editions/Mercadian Masques.txt	
+++ b/forge-gui/res/editions/Mercadian Masques.txt	
@@ -4,12 +4,14 @@ Date=1999-10-04
 Name=Mercadian Masques
 Code2=MM
 MciCode=mm
+ScryfallCode=MMQ
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
+FatPackExtraSlots=30 BasicLands
 Foil=OldStyle
 FoilAlwaysInCommonSlot=False
-ScryfallCode=MMQ
 
 [cards]
 58 R Aerial Caravan
diff --git a/forge-gui/res/editions/Mirrodin Besieged.txt b/forge-gui/res/editions/Mirrodin Besieged.txt
index d72227f393a..b4e6a8511ee 100644
--- a/forge-gui/res/editions/Mirrodin Besieged.txt	
+++ b/forge-gui/res/editions/Mirrodin Besieged.txt	
@@ -7,6 +7,8 @@ MciCode=mbs
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+FatPack=9
+FatPackExtraSlots=40 BasicLands
 ChaosDraftThemes=MIRRODIN
 ScryfallCode=MBS
 
diff --git a/forge-gui/res/editions/Mirrodin.txt b/forge-gui/res/editions/Mirrodin.txt
index 4a03b7f1e5a..d283efe4d6d 100644
--- a/forge-gui/res/editions/Mirrodin.txt
+++ b/forge-gui/res/editions/Mirrodin.txt
@@ -7,6 +7,7 @@ MciCode=mi
 Type=Expansion
 BoosterCovers=5
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 FoilAlwaysInCommonSlot=False
 ChaosDraftThemes=MIRRODIN
 ScryfallCode=MRD
diff --git a/forge-gui/res/editions/Morningtide.txt b/forge-gui/res/editions/Morningtide.txt
index af05d2e3300..aee5bc66ddf 100644
--- a/forge-gui/res/editions/Morningtide.txt
+++ b/forge-gui/res/editions/Morningtide.txt
@@ -7,6 +7,8 @@ MciCode=mt
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
+FatPackExtraSlots=40 BasicLands LRW
 ScryfallCode=MOR
 
 [cards]
diff --git a/forge-gui/res/editions/Nemesis.txt b/forge-gui/res/editions/Nemesis.txt
index eaddbefa9da..4b6922951a7 100644
--- a/forge-gui/res/editions/Nemesis.txt
+++ b/forge-gui/res/editions/Nemesis.txt
@@ -5,12 +5,13 @@ Name=Nemesis
 Code2=NE
 Alias=NEM
 MciCode=ne
+ScryfallCode=NEM
 Type=Expansion
 BoosterCovers=1
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 Foil=OldStyle
 FoilAlwaysInCommonSlot=False
-ScryfallCode=NEM
 
 [cards]
 27 R AEther Barrier
diff --git a/forge-gui/res/editions/New Phyrexia.txt b/forge-gui/res/editions/New Phyrexia.txt
index e68699a20e0..3b06a3b7a5a 100644
--- a/forge-gui/res/editions/New Phyrexia.txt	
+++ b/forge-gui/res/editions/New Phyrexia.txt	
@@ -7,6 +7,8 @@ MciCode=nph
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+FatPack=9
+FatPackExtraSlots=40 BasicLands
 ChaosDraftThemes=MIRRODIN
 ScryfallCode=NPH
 
diff --git a/forge-gui/res/editions/Ninth Edition.txt b/forge-gui/res/editions/Ninth Edition.txt
index b628b4000a9..d57202beba0 100644
--- a/forge-gui/res/editions/Ninth Edition.txt	
+++ b/forge-gui/res/editions/Ninth Edition.txt	
@@ -8,6 +8,8 @@ Type=Core
 Border=White
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 Rare, 1 BasicLand
+FatPack=6
+FatPackExtraSlots=40 BasicLands
 FoilAlwaysInCommonSlot=False
 ChaosDraftThemes=CORE_SET
 ScryfallCode=9ED
diff --git a/forge-gui/res/editions/Oath of the Gatewatch.txt b/forge-gui/res/editions/Oath of the Gatewatch.txt
index 987bac15df9..4c8241a7a6f 100644
--- a/forge-gui/res/editions/Oath of the Gatewatch.txt	
+++ b/forge-gui/res/editions/Oath of the Gatewatch.txt	
@@ -7,6 +7,8 @@ MciCode=ogw
 Type=Expansion
 BoosterCovers=4
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand BFZ
+FatPack=9
+FatPackExtraSlots=66 BasicLands BFZ, 14 name("Wastes")
 AdditionalSheetForFoils=fromSheet("EXP Lands 2")
 AdditionalSetUnlockedInQuest=EXP
 ScryfallCode=OGW
diff --git a/forge-gui/res/editions/Odyssey.txt b/forge-gui/res/editions/Odyssey.txt
index dc5902ff486..e8660df351e 100644
--- a/forge-gui/res/editions/Odyssey.txt
+++ b/forge-gui/res/editions/Odyssey.txt
@@ -7,6 +7,7 @@ MciCode=od
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 Foil=OldStyle
 FoilAlwaysInCommonSlot=False
 ChaosDraftThemes=GRAVEYARD_MATTERS
diff --git a/forge-gui/res/editions/Onslaught.txt b/forge-gui/res/editions/Onslaught.txt
index 6b3decb1cab..2fc35bfbf9b 100644
--- a/forge-gui/res/editions/Onslaught.txt
+++ b/forge-gui/res/editions/Onslaught.txt
@@ -7,6 +7,8 @@ MciCode=on
 Type=Expansion
 BoosterCovers=5
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=9
+FatPackExtraSlots=30 BasicLands
 Foil=OldStyle
 FoilAlwaysInCommonSlot=False
 ScryfallCode=ONS
diff --git a/forge-gui/res/editions/Planar Chaos.txt b/forge-gui/res/editions/Planar Chaos.txt
index 758ccc8bf48..1e5e8fdcbb2 100644
--- a/forge-gui/res/editions/Planar Chaos.txt	
+++ b/forge-gui/res/editions/Planar Chaos.txt	
@@ -7,6 +7,8 @@ MciCode=pc
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
+FatPackExtraSlots=40 BasicLands TSP
 ScryfallCode=PLC
 
 [cards]
diff --git a/forge-gui/res/editions/Planeshift.txt b/forge-gui/res/editions/Planeshift.txt
index 22420eb0743..3dfac7a29a6 100644
--- a/forge-gui/res/editions/Planeshift.txt
+++ b/forge-gui/res/editions/Planeshift.txt
@@ -7,6 +7,7 @@ MciCode=ps
 Type=Expansion
 BoosterCovers=1
 Booster=11 Common, 3 Uncommon, 1 Rare, 0 Special
+FatPack=6
 Foil=OldStyle
 FoilAlwaysInCommonSlot=False
 ScryfallCode=PLS
diff --git a/forge-gui/res/editions/Prophecy.txt b/forge-gui/res/editions/Prophecy.txt
index 85852a6a143..85d6ac8a4a0 100644
--- a/forge-gui/res/editions/Prophecy.txt
+++ b/forge-gui/res/editions/Prophecy.txt
@@ -4,12 +4,13 @@ Date=2000-06-05
 Name=Prophecy
 Code2=PY
 MciCode=pr
+ScryfallCode=PCY
 Type=Expansion
 BoosterCovers=1
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 Foil=OldStyle
 FoilAlwaysInCommonSlot=False
-ScryfallCode=PCY
 
 [cards]
 1 U Abolish
diff --git a/forge-gui/res/editions/Ravnica Allegiance.txt b/forge-gui/res/editions/Ravnica Allegiance.txt
index d77fc6d005e..d7184926acb 100644
--- a/forge-gui/res/editions/Ravnica Allegiance.txt	
+++ b/forge-gui/res/editions/Ravnica Allegiance.txt	
@@ -7,6 +7,8 @@ MciCode=rna
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common:!fromSheet("RNA Secret Cards"), 3 Uncommon:!fromSheet("RNA Secret Cards"), 1 RareMythic:!fromSheet("RNA Secret Cards"), 1 fromSheet("RNA Lands")
+FatPack=10
+FatPackExtraSlots=80 BasicLands
 ChaosDraftThemes=RAVNICA
 ScryfallCode=RNA
 
diff --git a/forge-gui/res/editions/Ravnica City of Guilds.txt b/forge-gui/res/editions/Ravnica City of Guilds.txt
index fa049f28550..94e575264f5 100644
--- a/forge-gui/res/editions/Ravnica City of Guilds.txt	
+++ b/forge-gui/res/editions/Ravnica City of Guilds.txt	
@@ -7,6 +7,8 @@ MciCode=rav
 Type=Expansion
 BoosterCovers=5
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
+FatPackExtraSlots=30 BasicLands
 FoilAlwaysInCommonSlot=False
 ChaosDraftThemes=RAVNICA
 ScryfallCode=RAV
diff --git a/forge-gui/res/editions/Return to Ravnica.txt b/forge-gui/res/editions/Return to Ravnica.txt
index e6a822c3572..ce818554f89 100644
--- a/forge-gui/res/editions/Return to Ravnica.txt	
+++ b/forge-gui/res/editions/Return to Ravnica.txt	
@@ -7,6 +7,8 @@ MciCode=rtr
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+FatPack=9
+FatPackExtraSlots=80 BasicLands
 ChaosDraftThemes=RAVNICA;GRAVEYARD_MATTERS
 ScryfallCode=RTR
 
diff --git a/forge-gui/res/editions/Rise of the Eldrazi.txt b/forge-gui/res/editions/Rise of the Eldrazi.txt
index 2c885a9cda8..9678adbc3b3 100644
--- a/forge-gui/res/editions/Rise of the Eldrazi.txt	
+++ b/forge-gui/res/editions/Rise of the Eldrazi.txt	
@@ -7,6 +7,8 @@ MciCode=roe
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+FatPack=8
+FatPackExtraSlots=40 BasicLands
 ScryfallCode=ROE
 
 [cards]
diff --git a/forge-gui/res/editions/Rivals of Ixalan.txt b/forge-gui/res/editions/Rivals of Ixalan.txt
index 2aa5b787012..60def9e73a6 100644
--- a/forge-gui/res/editions/Rivals of Ixalan.txt	
+++ b/forge-gui/res/editions/Rivals of Ixalan.txt	
@@ -7,6 +7,8 @@ Type=Expansion
 MciCode=rix
 BoosterCovers=5
 Booster=10 Common:fromSheet("RIX cards"), 3 Uncommon:fromSheet("RIX cards"), 1 RareMythic:fromSheet("RIX cards"), 1 BasicLand:fromSheet("RIX Basic Lands")
+FatPack=10
+FatPackExtraSlots=80 BasicLands
 TreatAsSmallSet=true
 ScryfallCode=RIX
 
diff --git a/forge-gui/res/editions/Saviors of Kamigawa.txt b/forge-gui/res/editions/Saviors of Kamigawa.txt
index b285f507287..eeaa6b745cb 100644
--- a/forge-gui/res/editions/Saviors of Kamigawa.txt	
+++ b/forge-gui/res/editions/Saviors of Kamigawa.txt	
@@ -7,6 +7,7 @@ MciCode=sok
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 FoilAlwaysInCommonSlot=False
 ScryfallCode=SOK
 
diff --git a/forge-gui/res/editions/Scars of Mirrodin.txt b/forge-gui/res/editions/Scars of Mirrodin.txt
index ec03565cc46..b2c76d343b6 100644
--- a/forge-gui/res/editions/Scars of Mirrodin.txt	
+++ b/forge-gui/res/editions/Scars of Mirrodin.txt	
@@ -7,6 +7,8 @@ MciCode=som
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+FatPack=8
+FatPackExtraSlots=40 BasicLands
 ChaosDraftThemes=MIRRODIN
 ScryfallCode=SOM
 
diff --git a/forge-gui/res/editions/Scourge.txt b/forge-gui/res/editions/Scourge.txt
index 461543d7994..48b016a92c1 100644
--- a/forge-gui/res/editions/Scourge.txt
+++ b/forge-gui/res/editions/Scourge.txt
@@ -7,6 +7,7 @@ MciCode=sc
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 Foil=OldStyle
 FoilAlwaysInCommonSlot=False
 ChaosDraftThemes=GRAVEYARD_MATTERS
diff --git a/forge-gui/res/editions/Shadowmoor.txt b/forge-gui/res/editions/Shadowmoor.txt
index ac734264f9b..5f194fda4a6 100644
--- a/forge-gui/res/editions/Shadowmoor.txt
+++ b/forge-gui/res/editions/Shadowmoor.txt
@@ -7,6 +7,8 @@ MciCode=shm
 Type=Expansion
 BoosterCovers=5
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=8
+FatPackExtraSlots=40 BasicLands
 ScryfallCode=SHM
 
 [cards]
diff --git a/forge-gui/res/editions/Shadows over Innistrad.txt b/forge-gui/res/editions/Shadows over Innistrad.txt
index e16b6d3f5db..4a3a306d357 100644
--- a/forge-gui/res/editions/Shadows over Innistrad.txt	
+++ b/forge-gui/res/editions/Shadows over Innistrad.txt	
@@ -7,6 +7,8 @@ Type=Expansion
 MciCode=soi
 BoosterCovers=5
 Booster=9 Common:!dfc, 3 Uncommon:!dfc, 1 RareMythic:!dfc, 1 dfc:!Rare:!Mythic, 1 BasicLand
+FatPack=9
+FatPackExtraSlots=80 BasicLands
 ChanceReplaceCommonWith=.125F dfc:RareMythic
 ChaosDraftThemes=GRAVEYARD_MATTERS
 ScryfallCode=SOI
diff --git a/forge-gui/res/editions/Shards of Alara.txt b/forge-gui/res/editions/Shards of Alara.txt
index 66b84d4e7c1..da547d786f6 100644
--- a/forge-gui/res/editions/Shards of Alara.txt	
+++ b/forge-gui/res/editions/Shards of Alara.txt	
@@ -7,6 +7,8 @@ MciCode=ala
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+FatPack=8
+FatPackExtraSlots=40 BasicLands
 ScryfallCode=ALA
 
 [cards]
diff --git a/forge-gui/res/editions/Strixhaven School of Mages.txt b/forge-gui/res/editions/Strixhaven School of Mages.txt
index b66186058d1..0ccb52075c8 100644
--- a/forge-gui/res/editions/Strixhaven School of Mages.txt	
+++ b/forge-gui/res/editions/Strixhaven School of Mages.txt	
@@ -9,6 +9,7 @@ BoosterCovers=5
 DraftBooster=1 fromSheet("STX lesson"), 9 Common, 3 Uncommon, 1 RareMythic, 1 Any STA
 CollectorBooster=1 Uncommon:fromSheet("STA borderless")+, 1 RareMythic:fromSheet("STA borderless")+, 1 Uncommon:fromSheet("STA etched")+, 1 RareMythic:fromSheet("STA etched")+, 1 RareMythic C21+, 1 RareMythic STA, 1 Uncommon STA, 1 fromSheet("STX lesson")+, 1 RareMythic+, 2 Uncommon+, 5 Common+
 Prerelease=6 Boosters, 1 RareMythic+
+FatPackExtraSlots=20 BasicLands, 20 BasicLands+
 ScryfallCode=STX
 
 [cards]
diff --git a/forge-gui/res/editions/Tenth Edition.txt b/forge-gui/res/editions/Tenth Edition.txt
index deda2df8d62..404de0cee04 100644
--- a/forge-gui/res/editions/Tenth Edition.txt	
+++ b/forge-gui/res/editions/Tenth Edition.txt	
@@ -7,6 +7,8 @@ MciCode=10e
 Type=Core
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 Rare, 1 BasicLand
+FatPack=6
+FatPackExtraSlots=40 BasicLands
 ChaosDraftThemes=CORE_SET
 ScryfallCode=10E
 
diff --git a/forge-gui/res/editions/Theros Beyond Death.txt b/forge-gui/res/editions/Theros Beyond Death.txt
index a2d41a84ff7..9c3279e4f1f 100644
--- a/forge-gui/res/editions/Theros Beyond Death.txt	
+++ b/forge-gui/res/editions/Theros Beyond Death.txt	
@@ -7,6 +7,7 @@ Type=Expansion
 BoosterCovers=3
 Booster=10 Common:fromSheet("THB Commons"), 3 Uncommon:fromSheet("THB Uncommons"), 1 RareMythic:fromSheet("THB RareMythics"), 1 BasicLand
 Prerelease=6 Boosters, 1 RareMythic+
+FatPackExtraSlots=20 BasicLands, 20 BasicLands+, 1 Arasta of the Endless Web+|THB|3
 ChaosDraftThemes=GRAVEYARD_MATTERS
 ScryfallCode=THB
 
diff --git a/forge-gui/res/editions/Theros.txt b/forge-gui/res/editions/Theros.txt
index 14ddfca4089..d98f01c4d8e 100644
--- a/forge-gui/res/editions/Theros.txt
+++ b/forge-gui/res/editions/Theros.txt
@@ -6,6 +6,8 @@ MciCode=ths
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+FatPack=9
+FatPackExtraSlots=80 BasicLands
 ScryfallCode=THS
 
 [cards]
diff --git a/forge-gui/res/editions/Throne of Eldraine.txt b/forge-gui/res/editions/Throne of Eldraine.txt
index 112c653f84b..271095d3189 100644
--- a/forge-gui/res/editions/Throne of Eldraine.txt	
+++ b/forge-gui/res/editions/Throne of Eldraine.txt	
@@ -8,6 +8,8 @@ Type=Expansion
 BoosterCovers=3
 Booster=10 Common:fromSheet("ELD cards"), 3 Uncommon:fromSheet("ELD cards"), 1 RareMythic:fromSheet("ELD cards"), 1 BasicLand
 Prerelease=6 Boosters, 1 RareMythic+
+FatPack=10
+FatPackExtraSlots=20 BasicLands, 20 BasicLands+, 1 Piper of the Swarm+|ELD|3
 ScryfallCode=ELD
 
 [cards]
diff --git a/forge-gui/res/editions/Time Spiral Timeshifted.txt b/forge-gui/res/editions/Time Spiral Timeshifted.txt
index 75446758447..f7183e32430 100644
--- a/forge-gui/res/editions/Time Spiral Timeshifted.txt	
+++ b/forge-gui/res/editions/Time Spiral Timeshifted.txt	
@@ -6,6 +6,8 @@ Code2=TSB
 MciCode=tsts
 Type=Expansion
 ScryfallCode=TSB
+BoosterBox=0
+FatPack=0
 
 [cards]
 1 S Akroma, Angel of Wrath
diff --git a/forge-gui/res/editions/Time Spiral.txt b/forge-gui/res/editions/Time Spiral.txt
index 93d299d05b7..fba96f6d20f 100644
--- a/forge-gui/res/editions/Time Spiral.txt	
+++ b/forge-gui/res/editions/Time Spiral.txt	
@@ -7,6 +7,8 @@ MciCode=ts
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 Rare, 1 TimeShifted TSB
+FatPack=6
+FatPackExtraSlots=40 BasicLands
 AdditionalSetUnlockedInQuest=TSB
 ScryfallCode=TSP
 
diff --git a/forge-gui/res/editions/Torment.txt b/forge-gui/res/editions/Torment.txt
index 6dc349bd0ab..4499ad2519a 100644
--- a/forge-gui/res/editions/Torment.txt
+++ b/forge-gui/res/editions/Torment.txt
@@ -7,6 +7,7 @@ MciCode=tr
 Type=Expansion
 BoosterCovers=1
 Booster=11 Common, 3 Uncommon, 1 Rare
+FatPack=6
 Foil=OldStyle
 FoilAlwaysInCommonSlot=False
 ChaosDraftThemes=GRAVEYARD_MATTERS
diff --git a/forge-gui/res/editions/War of the Spark.txt b/forge-gui/res/editions/War of the Spark.txt
index c9b726dabce..59e0c580159 100644
--- a/forge-gui/res/editions/War of the Spark.txt	
+++ b/forge-gui/res/editions/War of the Spark.txt	
@@ -8,6 +8,8 @@ Type=Expansion
 BoosterCovers=3
 Booster=10 Common:!fromSheet("WAR Secret Cards"), 3 Uncommon:!fromSheet("WAR Secret Cards"), 1 RareMythic:!fromSheet("WAR Secret Cards"), 1 BasicLand
 BoosterMustContain=Planeswalker
+FatPack=10
+FatPackExtraSlots=80 BasicLands
 ChaosDraftThemes=RAVNICA
 ScryfallCode=WAR
 
diff --git a/forge-gui/res/editions/Worldwake.txt b/forge-gui/res/editions/Worldwake.txt
index 1e0153f9c56..fa5e885f9ec 100644
--- a/forge-gui/res/editions/Worldwake.txt
+++ b/forge-gui/res/editions/Worldwake.txt
@@ -7,6 +7,8 @@ MciCode=wwk
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand ZEN
+FatPack=8
+FatPackExtraSlots=40 BasicLands ZEN
 ScryfallCode=WWK
 
 [cards]
diff --git a/forge-gui/res/editions/Zendikar Rising.txt b/forge-gui/res/editions/Zendikar Rising.txt
index a9b04da9e32..1a8c46ba3c2 100644
--- a/forge-gui/res/editions/Zendikar Rising.txt	
+++ b/forge-gui/res/editions/Zendikar Rising.txt	
@@ -10,6 +10,7 @@ Booster=10 Common:!dfc:fromSheet("ZNR cards"), 3 Uncommon:!dfc:fromSheet("ZNR ca
 BoosterReplaceSlotFromPrintSheet=ZNR ModalDoubleFaceCards
 Prerelease=6 Boosters, 1 RareMythic+
 #BoosterBox=36 Boosters, 1 fromSheet('ZNR buy a box')+
+FatPackExtraSlots=20 BasicLands, 20 BasicLands+, 1 Charix, the Raging Isle+|ZNR|3
 ScryfallCode=ZNR
 
 [cards]
diff --git a/forge-gui/res/editions/Zendikar.txt b/forge-gui/res/editions/Zendikar.txt
index 216c842d03a..463a39f7282 100644
--- a/forge-gui/res/editions/Zendikar.txt
+++ b/forge-gui/res/editions/Zendikar.txt
@@ -7,6 +7,8 @@ MciCode=zen
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+FatPack=8
+FatPackExtraSlots=40 BasicLands
 ScryfallCode=ZEN
 
 [cards]