Added 7 Card booster packs shops in Adventure Mode (#7141)

* Added 7 Card booster packs shops in Adventure Mode * Update CHANGES.txt * Fix: trailing space, extra comma and wrong color on shop fixed. * Removed unused imports --------- Co-authored-by: Heitor Bittencourt <heitorbite@outlook.com> Co-authored-by: Agetian <stavdev@mail.ru>
2025-11-16 02:38:02 +00:00 · 2025-03-14 14:03:13 -03:00
parent 9091cfe3b0
commit 37a5958750
43 changed files with 632 additions and 330 deletions
--- a/forge-core/src/main/java/forge/item/PaperCard.java
+++ b/forge-core/src/main/java/forge/item/PaperCard.java
@@ -356,8 +356,8 @@ public class PaperCard implements Comparable<IPaperCard>, InventoryItemFromSet,

    @Override
    public String getImageKey(boolean altState) {
-        String noramlizedName = StringUtils.stripAccents(name);
-        String imageKey = ImageKeys.CARD_PREFIX + noramlizedName + CardDb.NameSetSeparator
+        String normalizedName = StringUtils.stripAccents(name);
+        String imageKey = ImageKeys.CARD_PREFIX + normalizedName + CardDb.NameSetSeparator
                + edition + CardDb.NameSetSeparator + artIndex;
        if (altState) {
            imageKey += ImageKeys.BACKFACE_POSTFIX;
--- a/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java
@@ -365,15 +365,15 @@ public class AdventureEventData implements Serializable {
                for (PrintSheet ps : c.getPrintSheetsBySection()) {
                    //exclude block with sets containing P9 cards..
                    if (ps.containsCardNamed("Black Lotus", 1)
-                            || ps.containsCardNamed("Mox Emerald", 1)
-                            || ps.containsCardNamed("Mox Pearl", 1)
-                            || ps.containsCardNamed("Mox Ruby", 1)
-                            || ps.containsCardNamed("Mox Sapphire", 1)
-                            || ps.containsCardNamed("Mox Jet", 1)
-                            || ps.containsCardNamed("Ancestral Recall", 1)
-                            || ps.containsCardNamed("Timetwister", 1)
-                            || ps.containsCardNamed("Time Walk", 1)) {
-                        isOkay = false;
+                                || ps.containsCardNamed("Mox Emerald", 1)
+                                || ps.containsCardNamed("Mox Pearl", 1)
+                                || ps.containsCardNamed("Mox Ruby", 1)
+                                || ps.containsCardNamed("Mox Sapphire", 1)
+                                || ps.containsCardNamed("Mox Jet", 1)
+                                || ps.containsCardNamed("Ancestral Recall", 1)
+                                || ps.containsCardNamed("Timetwister", 1)
+                                || ps.containsCardNamed("Time Walk", 1)) {
+                            isOkay = false;
                        break;
                    }
                }
--- a/forge-gui-mobile/src/forge/adventure/data/RewardData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/RewardData.java
@@ -3,17 +3,20 @@ package forge.adventure.data;
 import com.badlogic.gdx.utils.Array;
 import com.google.common.collect.Iterables;
 import forge.StaticData;
-import forge.adventure.util.CardUtil;
-import forge.adventure.util.Config;
-import forge.adventure.util.Current;
-import forge.adventure.util.Reward;
+import forge.adventure.util.*;
 import forge.adventure.world.WorldSave;
+import forge.card.CardEdition;
 import forge.deck.Deck;
 import forge.item.PaperCard;
+import forge.model.FModel;
+import forge.util.Aggregates;
 import forge.util.IterableUtil;
+import forge.util.StreamUtil;

 import java.io.Serializable;
 import java.util.*;
+import java.util.function.Predicate;
+

 /**
 * Data class that will be used to read Json configuration files
@@ -216,6 +219,38 @@ public class RewardData implements Serializable {
                        }
                    }
                    break;
+                case "cardPackShop":
+                {
+                    if(colors == null) {
+                        CardEdition.Collection editions = FModel.getMagicDb().getEditions();
+                        Predicate<CardEdition> filter = CardEdition.Predicates.CAN_MAKE_BOOSTER;
+                        List<CardEdition> allEditions = new ArrayList<>();
+                        StreamUtil.stream(editions)
+                                .filter(filter)
+                                .filter(CardEdition::hasBoosterTemplate)
+                                .forEach(allEditions::add);
+                        ConfigData configData = Config.instance().getConfigData();
+                        for (String restricted : configData.restrictedEditions) {
+                            allEditions.removeIf(q -> q.getName().equals(restricted));
+                        }
+                        System.out.println(allEditions);
+                        for(int i=0;i<count+addedCount;i++) {
+                            ret.add(new Reward(AdventureEventController.instance().generateBooster(Aggregates.random(allEditions).getCode())));
+
+                        }
+
+                    }
+                    else
+                    {
+                        for(int i=0;i<count+addedCount;i++) {
+                            ret.add(new Reward(AdventureEventController.instance().generateBoosterByColor(colors[0])));
+
+                        }
+                    }
+
+
+                    break;
+                }
                case "cardPack":
                    if(cardPack!=null)
                    {
@@ -265,7 +300,7 @@ public class RewardData implements Serializable {
            for (Reward data : dataList) {
                PaperCard card = data.getCard();
                if (card.isVeryBasicLand()) {
-                    // ensure that all basid lands share the same edition so the deck doesn't look odd
+                    // ensure that all basic lands share the same edition so the deck doesn't look odd
                    if (basicLandEdition.isEmpty()) {
                        basicLandEdition = card.getEdition();
                    }
--- a/forge-gui-mobile/src/forge/adventure/util/AdventureEventController.java
+++ b/forge-gui-mobile/src/forge/adventure/util/AdventureEventController.java
@@ -6,6 +6,7 @@ import forge.adventure.data.AdventureEventData;
 import forge.adventure.player.AdventurePlayer;
 import forge.adventure.pointofintrest.PointOfInterestChanges;
 import forge.deck.Deck;
+import forge.item.BoosterPack;
 import forge.item.PaperCard;
 import forge.item.SealedTemplate;
 import forge.item.generation.BoosterGenerator;
@@ -138,6 +139,17 @@ public class AdventureEventController implements Serializable {
        output.setComment(setCode);
        return output;
    }
+    public Deck generateBoosterByColor(String color)
+    {
+        System.out.println(color);
+        List<PaperCard> cards = BoosterPack.fromColor(color).getCards();
+        Deck output = new Deck();
+        output.getMain().add(cards);
+        String editionName = color + " Booster Pack";
+        output.setName(editionName);
+        output.setComment(color);
+        return output;
+    }

    public List<Deck> getJumpstartBoosters(CardBlock block, int count) {
        //Get all candidates then remove at random until no more than count are included
--- a/forge-gui-mobile/src/forge/adventure/util/CardUtil.java
+++ b/forge-gui-mobile/src/forge/adventure/util/CardUtil.java
@@ -400,6 +400,11 @@ public class CardUtil {
            return reward.getCount()*500;
        if(reward.getType()== Reward.Type.Gold)
            return reward.getCount();
+        /*if(reward.getType() == Reward.Type.CardPack)
+            return reward.getDeck().get(DeckSection.Main).countAll()*70;*/
+        //TODO: Heitor - Price by card count and type of boosterPack.
+
+
        return 1000;
    }

--- a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java
+++ b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java
@@ -38,6 +38,7 @@ import forge.assets.FSkinImage;
 import forge.assets.ImageCache;
 import forge.card.CardImageRenderer;
 import forge.card.CardRenderer;
+import forge.deck.DeckSection;
 import forge.game.card.CardView;
 import forge.gui.GuiBase;
 import forge.item.PaperCard;
@@ -51,6 +52,9 @@ import forge.util.ImageUtil;
 import org.apache.commons.lang3.StringUtils;

 import java.io.File;
+import java.util.Scanner;
+
+import static forge.localinstance.properties.ForgeConstants.IMAGE_LIST_QUEST_BOOSTERS_FILE;

 /**
 * Render the rewards as a card on the reward scene.
@@ -80,7 +84,8 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
    boolean alternate = false, shown = false;
    boolean isRewardShop, showOverlay, isLoot;
    TextraLabel overlayLabel;
-
+    int artIndex = 1;
+    String imageKey = "";
    public int renderedCount = 0; //Counter for cards that require rendering a preview.
    static final ImageFetcher fetcher = GuiBase.getInterface().getImageFetcher();
    RewardImage toolTipImage;
@@ -114,66 +119,83 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
    @Override
    public void onImageFetched() {
        ImageCache.getInstance().clear();
-        String imageKey = reward.getCard().getImageKey(false);
-        PaperCard card = ImageUtil.getPaperCardFromImageKey(imageKey);
-        imageKey = card.getCardImageKey();
-        int count = 0;
-        if (StringUtils.isBlank(imageKey))
-            return;
-        File imageFile = ImageKeys.getImageFile(imageKey);
-        if (imageFile == null || !imageFile.exists())
-            return;
-        Texture replacement = Forge.getAssets().manager().get(imageFile.getPath(), Texture.class, false);
-        if (replacement == null) {
-            try {
-                Forge.getAssets().manager().load(imageFile.getPath(), Texture.class, Forge.getAssets().getTextureFilter());
-                Forge.getAssets().manager().finishLoadingAsset(imageFile.getPath());
-                replacement = Forge.getAssets().manager().get(imageFile.getPath(), Texture.class, false);
-            } catch (Exception e) {
-                //e.printStackTrace();
+
+
+
+        if(reward.type.equals(Reward.Type.Card)) {
+            imageKey = reward.getCard().getImageKey(false);
+            PaperCard card = ImageUtil.getPaperCardFromImageKey(imageKey);
+            imageKey = card.getCardImageKey();
+
+
+            int count = 0;
+            if (StringUtils.isBlank(imageKey))
                return;
-            }
-        }
-        if (replacement == null)
-            return;
-        count += 1;
-        image = replacement;
-        loaded = true;
-        if (toolTipImage != null) {
-            if (toolTipImage.getDrawable() instanceof TextureRegionDrawable) {
-                ((TextureRegionDrawable) toolTipImage.getDrawable()).getRegion().getTexture().dispose();
-            }
-            toolTipImage.remove();
-            toolTipImage = new RewardImage(processDrawable(image));
-            if (GuiBase.isAndroid() || Forge.hasGamepad()) {
-                if (holdTooltip != null) {
-                    if (shown) {
-                        holdTooltip.getTouchDownTarget().fire(RewardScene.eventTouchUp());
-                        Gdx.input.setInputProcessor(null);
-                    }
-                    if (holdTooltip.getImage() != null && holdTooltip.getImage().getDrawable() instanceof TextureRegionDrawable) {
-                        try { // if texture is null either it's not initialized or already disposed
-                            ((TextureRegionDrawable) holdTooltip.getImage().getDrawable()).getRegion().getTexture().dispose();
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    }
-                    holdTooltip.hide();
-                    holdTooltip.tooltip_actor = new ComplexTooltip(toolTipImage);
+            File imageFile = ImageKeys.getImageFile(imageKey);
+
+            if (imageFile == null || !imageFile.exists())
+                return;
+            Texture replacement = Forge.getAssets().manager().get(imageFile.getPath(), Texture.class, false);
+            if (replacement == null) {
+                try {
+                    Forge.getAssets().manager().load(imageFile.getPath(), Texture.class, Forge.getAssets().getTextureFilter());
+                    Forge.getAssets().manager().finishLoadingAsset(imageFile.getPath());
+                    replacement = Forge.getAssets().manager().get(imageFile.getPath(), Texture.class, false);
+                } catch (Exception e) {
+                    //e.printStackTrace();
+                    return;
                }
-            } else {
-                tooltip.setActor(new ComplexTooltip(toolTipImage));
+            }
+            if (replacement == null)
+                return;
+            count += 1;
+            image = replacement;
+            loaded = true;
+            if (toolTipImage != null) {
+                if (toolTipImage.getDrawable() instanceof TextureRegionDrawable) {
+                    ((TextureRegionDrawable) toolTipImage.getDrawable()).getRegion().getTexture().dispose();
+                }
+                toolTipImage.remove();
+                toolTipImage = new RewardImage(processDrawable(image));
+                if (GuiBase.isAndroid() || Forge.hasGamepad()) {
+                    if (holdTooltip != null) {
+                        if (shown) {
+                            holdTooltip.getTouchDownTarget().fire(RewardScene.eventTouchUp());
+                            Gdx.input.setInputProcessor(null);
+                        }
+                        if (holdTooltip.getImage() != null && holdTooltip.getImage().getDrawable() instanceof TextureRegionDrawable) {
+                            try { // if texture is null either it's not initialized or already disposed
+                                ((TextureRegionDrawable) holdTooltip.getImage().getDrawable()).getRegion().getTexture().dispose();
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }
+                        holdTooltip.hide();
+                        holdTooltip.tooltip_actor = new ComplexTooltip(toolTipImage);
+                    }
+                } else {
+                    tooltip.setActor(new ComplexTooltip(toolTipImage));
+                }
+            }
+            if (T != null)
+                T.dispose();
+            if (alternate && Talt != null)
+                Talt.dispose();
+            ImageCache.getInstance().updateSynqCount(imageFile, count);
+            if (Forge.getCurrentScene() instanceof RewardScene)
+                RewardScene.instance().reactivateInputs();
+            else if (Forge.getCurrentScene() instanceof UIScene) {
+                (Forge.getCurrentScene()).updateInput();
            }
        }
-        if (T != null)
-            T.dispose();
-        if (alternate && Talt != null)
-            Talt.dispose();
-        ImageCache.getInstance().updateSynqCount(imageFile, count);
-        if (Forge.getCurrentScene() instanceof RewardScene)
-            RewardScene.instance().reactivateInputs();
-        else if (Forge.getCurrentScene() instanceof UIScene) {
-            (Forge.getCurrentScene()).updateInput();
+        if(reward.type.equals(Reward.Type.CardPack))
+        {
+            Texture t = ImageCache.getInstance().getImage(imageKey, false, true);
+            Sprite backSprite = Config.instance().getItemSprite("CardBack");
+            Sprite item = new Sprite(new TextureRegion(t));
+            setItemTooltips(item, backSprite, true);
+            //processSprite(backSprite, item, Controls.newTextraLabel("[%200]" + reward.getDeck().getComment() + " " +
+            //        "Booster"), 0, -10, true);
        }
        Gdx.graphics.requestRendering();
    }
@@ -352,38 +374,80 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
                    processSprite(backSprite, null, null, 0, 0, false);
                    break;
                }
-
-
-                String imageKey = "";
+                boolean isBooster = false;
+                imageKey = "";
                String editionCode = "";
                try {
                    editionCode = reward.getDeck().getComment();
-                    int artIndex = 1;
+
+                    artIndex = 1;
                    if (SealedProduct.specialSets.contains(editionCode) || editionCode.equals("?")) {
-                        imageKey = "b:" + getName().substring(0, getName().indexOf("Booster Pack") - 1);
+                        imageKey = "b:" + reward.getDeck().getName().substring(0, reward.getDeck().getName().indexOf("Booster Pack") - 1);
+                        artIndex = 0;
+
                    } else {
                        int maxIdx = StaticData.instance().getEditions().get(editionCode).getCntBoosterPictures();
                        artIndex = Aggregates.randomInt(1, 2);//MyRandom.getRandom().nextInt(maxIdx) + 1;
                        imageKey = ImageKeys.BOOSTER_PREFIX + editionCode + ((1 >= maxIdx) ? "" : ("_" + artIndex));
+
                    }
                } catch (Exception e) {
                    //Comment did not contain the edition code, this is not a basic booster pack
                }
-                boolean isBooster = false;
-                Sprite item;
-                Texture t = ImageCache.getInstance().getImage(imageKey, false, true);
-                if (t != null) {
-                    item = new Sprite(new TextureRegion(t));
-                    isBooster = true;
-                } else {
-                    item = Config.instance().getItemSprite("Deck");
-                }

-                setItemTooltips(item, backSprite, isBooster);
+                Sprite item = null;
+                boolean found = false;
+                if (imageKey != "") {
+                    isBooster = true;
+                    File file = new File(IMAGE_LIST_QUEST_BOOSTERS_FILE);
+                    try {
+                        Scanner scanner = new Scanner(file);
+                        String boosterPath = "";
+                        while(scanner.hasNextLine())
+                        {
+                            boosterPath = scanner.nextLine();
+                            if(boosterPath.contains(imageKey.substring(2))) {
+                                imageKey = imageKey + boosterPath.substring(boosterPath.length() - 4);
+                                found = true;
+                                break;
+                            }
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        System.out.println(e.getMessage());
+                        break;
+                    }
+                }
+                if(found) {
+                    Texture t = ImageCache.getInstance().getImage(imageKey, false, true);
+                    isBooster = true;
+                    if (t != null) {
+
+                        item = new Sprite(new TextureRegion(t));
+
+
+                        //setCardImage(t);
+                        onImageFetched();
+                    }
+                    else {
+                        fetcher.fetchImage(imageKey, this);
+                        item = Config.instance().getItemSprite("Deck");
+                        setItemTooltips(item, backSprite, isBooster);
+                    }
+                }
+                else{
+
+
+                    item = Config.instance().getItemSprite("Deck");
+                    setItemTooltips(item, backSprite, isBooster);
+                }
                if (isBooster)
-                    processSprite(backSprite, item, Controls.newTextraLabel("[%200]" + editionCode + " Booster"), 0, -10, isBooster);
+                    processSprite(backSprite, item, Controls.newTextraLabel("[%200]" + editionCode + " Booster"), 0,
+                            -10, isBooster);
                else
-                    processSprite(backSprite, item, Controls.newTextraLabel("[%200]Event Reward Pack"), 0, -10, isBooster);
+                    processSprite(backSprite, item, Controls.newTextraLabel("[%200]Event Reward Pack"), 0, -10,
+                            isBooster);
                needsToBeDisposed = true;
                break;
            }
@@ -670,11 +734,20 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
                getGraphics().drawImage(backSprite, 0, 0, preview_w, preview_h);
                if (!isBooster)
                    getGraphics().drawImage(icon, preview_w / 2f - 75, 160, 160, 160);
-                else
-                    getGraphics().drawImage(icon, 0, 0, preview_w, preview_h);
+                else //if(loaded)
+                    getGraphics().drawImage(icon, 74, 100, 345, 480);
+               /* else
+                    getGraphics().drawImage(icon, 0, 0, preview_w, preview_h);*/
                float div = (float) preview_h / preview_w;
                BitmapFont font = Controls.getBitmapFont("default", 4 / div);
-                layout.setText(font, itemExists ? item.name : getReward().type.name(), Color.WHITE, preview_w - 64, Align.center, true);
+                if(reward.getType().equals(Reward.Type.CardPack)) {
+                    layout.setText(font, reward.getDeck().get(DeckSection.Main).countAll() +" Cards",
+                            Color.WHITE,
+                            preview_w - 64,
+                            Align.center, true);
+                }
+                else
+                    layout.setText(font, itemExists ? item.name : getReward().type.name(), Color.WHITE, preview_w - 64, Align.center, true);
                getGraphics().drawText(font, layout, 32, preview_h - 70);
                align = itemExists ? Align.topLeft : Align.top;
                if (itemExists) {
@@ -886,7 +959,8 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
                    T = renderPlaceholder(new Graphics(), reward.getCard(), false);
                drawCard(batch, T, x, width);
            }
-        } else if (image != null) {
+        }
+        else if (image != null) {
            batch.draw(image, x, -getHeight() / 2, width, getHeight());
        }
    }
@@ -1017,8 +1091,18 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
            cLabel.setAlignment(align);
            cLabel.setWrap(true);
            cLabel.setWidth(width);
+
+            if(reward.type.equals(Reward.Type.CardPack))
+            {
+
+                cLabel.setY(y-70);
+            }
+            else
+            {
+                cLabel.setY(y);
+            }
            cLabel.setX(x);
-            cLabel.setY(y);
+
            addActorAt(0, cImage);
            addActorAt(1, cLabel);
        }
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -258,6 +258,7 @@ public class ImageCache {
            }
        }

+
        Texture image;
        File imageFile = ImageKeys.getImageFile(imageKey);
        if (useDefaultIfNotFound) {
--- a/forge-gui/res/adventure/Shandalar/world/shops.json
+++ b/forge-gui/res/adventure/Shandalar/world/shops.json
@@ -5502,5 +5502,113 @@
 			"minDate": "2021-09-09"
 		}]
 	}]
-}
+},
+  {
+    "name": "BoosterPackShop",
+    "description":"Pack To Basics",
+    "spriteAtlas":"maps/tileset/buildings.atlas",
+    "sprite": "CarShop",
+    "rewards": [
+      {
+        "type": "cardPackShop",
+        "count": 8
+      }]
+  },
+  {
+    "name": "WhiteBoosterPackShop",
+    "description":"Blessed Boosters",
+    "spriteAtlas":"maps/tileset/buildings.atlas",
+    "sprite": "CarShopW",
+    "rewards": [
+      {
+        "type": "cardPackShop",
+        "count": 4,
+        "colors":["White"]
+      },
+      {
+        "type": "cardPackShop",
+        "count": 4
+      }]
+
+  },
+  {
+    "name": "BlueBoosterPackShop",
+    "description":"Counter Packs",
+    "spriteAtlas":"maps/tileset/buildings.atlas",
+    "sprite": "CarShopU",
+    "rewards": [
+      {
+            "type": "cardPackShop",
+            "count": 4,
+            "colors":["Blue"]
+          },
+          {
+            "type": "cardPackShop",
+            "count": 4
+      }]
+  },
+  {
+    "name": "BlackBoosterPackShop",
+    "description":"Graveyard Goods",
+    "spriteAtlas":"maps/tileset/buildings.atlas",
+    "sprite": "CarShopB",
+    "rewards": [
+      {
+        "type": "cardPackShop",
+        "count": 4,
+        "colors":["Black"]
+      },
+      {
+        "type": "cardPackShop",
+        "count": 4
+      }]
+  },
+  {
+    "name": "RedBoosterPackShop",
+    "description":"Wildfire Wonders",
+    "spriteAtlas":"maps/tileset/buildings.atlas",
+    "sprite": "CarShopR",
+    "rewards": [
+      {
+        "type": "cardPackShop",
+        "count": 4,
+        "colors":["Red"]
+      },
+      {
+        "type": "cardPackShop",
+        "count": 4
+      }]
+  },
+  {
+    "name": "GreenBoosterPackShop",
+    "description":"Nature’s Nurture Packs",
+    "spriteAtlas":"maps/tileset/buildings.atlas",
+    "sprite": "CarShopG",
+    "rewards": [
+      {
+        "type": "cardPackShop",
+        "count": 4,
+        "colors":["Green"]
+      },
+      {
+        "type": "cardPackShop",
+        "count": 4
+      }]
+  },
+  {
+    "name": "ColorlessBoosterPackShop",
+    "description":"Pack to the Future",
+    "spriteAtlas":"maps/tileset/buildings.atlas",
+    "sprite": "CarShopC",
+    "rewards": [
+      {
+        "type": "cardPackShop",
+        "count": 4,
+        "colors":["Colorless"]
+      },
+      {
+        "type": "cardPackShop",
+        "count": 4
+      }]
+  }
 ]   
--- a/forge-gui/res/adventure/common/maps/map/main_story/forest_capital.tmx
+++ b/forge-gui/res/adventure/common/maps/map/main_story/forest_capital.tmx
@@ -37,7 +37,7 @@
 <objectgroup id="4" name="Objects">
  <object id="56" template="../../obj/shop.tx" x="208" y="162">
   <properties>
-    <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="GreenBoosterPackShop,BoosterPackShop,Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
    <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
    <property name="signYOffset" type="float" value="-2"/>
@@ -78,7 +78,7 @@
  </object>
  <object id="64" template="../../obj/shop.tx" x="466" y="417">
   <properties>
-    <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
    <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen"/>
    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
    <property name="signYOffset" type="float" value="-2"/>
@@ -87,7 +87,7 @@
  </object>
  <object id="65" template="../../obj/shop.tx" x="530" y="386">
   <properties>
-    <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
    <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
    <property name="signYOffset" type="float" value="-2"/>
@@ -96,7 +96,7 @@
  </object>
  <object id="66" template="../../obj/shop.tx" x="449" y="305">
   <properties>
-    <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
    <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
    <property name="signYOffset" type="float" value="-2"/>
@@ -105,7 +105,7 @@
  </object>
  <object id="67" template="../../obj/shop.tx" x="513" y="241">
   <properties>
-    <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
    <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
    <property name="signYOffset" type="float" value="-2"/>
@@ -114,7 +114,7 @@
  </object>
  <object id="68" template="../../obj/shop.tx" x="448" y="130">
   <properties>
-    <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
    <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
    <property name="signYOffset" type="float" value="-2"/>
@@ -123,7 +123,7 @@
  </object>
  <object id="69" template="../../obj/shop.tx" x="257" y="194">
   <properties>
-    <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
    <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
    <property name="signYOffset" type="float" value="-2"/>
@@ -132,7 +132,7 @@
  </object>
  <object id="70" template="../../obj/shop.tx" x="97" y="417">
   <properties>
-    <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
    <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
    <property name="signYOffset" type="float" value="-2"/>
@@ -209,7 +209,7 @@
  </object>
  <object id="76" template="../../obj/shop.tx" x="96" y="209">
   <properties>
-    <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
    <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen"/>
    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
    <property name="signXOffset" type="float" value="-16"/>
@@ -219,7 +219,7 @@
  </object>
  <object id="77" template="../../obj/shop.tx" x="96" y="304">
   <properties>
-    <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
    <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
    <property name="signXOffset" type="float" value="-16"/>
--- a/forge-gui/res/adventure/common/maps/map/main_story/island_capital.tmx
+++ b/forge-gui/res/adventure/common/maps/map/main_story/island_capital.tmx
@@ -42,7 +42,7 @@
 <objectgroup id="4" name="Objects">
  <object id="41" template="../../obj/shop.tx" x="232" y="146">
   <properties>
-    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
    <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods,Mutants"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -51,7 +51,7 @@
  </object>
  <object id="56" template="../../obj/shop.tx" x="106" y="210">
   <properties>
-    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
    <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods,Mutants"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -60,7 +60,7 @@
  </object>
  <object id="57" template="../../obj/shop.tx" x="408" y="146">
   <properties>
-    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
    <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods,Mutants"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -69,7 +69,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="152" y="435">
   <properties>
-    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
    <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Mutants"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -79,7 +79,7 @@
  <object id="47" template="../../obj/inn.tx" x="311" y="227"/>
  <object id="49" template="../../obj/shop.tx" x="360" y="258">
   <properties>
-    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
    <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Mutants"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -88,7 +88,7 @@
  </object>
  <object id="50" template="../../obj/shop.tx" x="536" y="354">
   <properties>
-    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
    <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods,Mutants"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -97,7 +97,7 @@
  </object>
  <object id="51" template="../../obj/shop.tx" x="552" y="418">
   <properties>
-    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
    <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods,Mutants"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -106,7 +106,7 @@
  </object>
  <object id="52" template="../../obj/shop.tx" x="56" y="306">
   <properties>
-    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
    <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -209,7 +209,7 @@
  </object>
  <object id="66" template="../../obj/shop.tx" x="264" y="258">
   <properties>
-    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
    <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods,Mutants"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -218,7 +218,7 @@
  </object>
  <object id="67" template="../../obj/shop.tx" x="472" y="178">
   <properties>
-    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
    <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods,Mutants"/>
    <property name="signYOffset" type="float" value="-4"/>
--- a/forge-gui/res/adventure/common/maps/map/main_story/mountain_capital.tmx
+++ b/forge-gui/res/adventure/common/maps/map/main_story/mountain_capital.tmx
@@ -37,7 +37,7 @@
 <objectgroup id="4" name="Objects">
  <object id="41" template="../../obj/shop.tx" x="249" y="370">
   <properties>
-    <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
    <property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red,PhyrexianRed"/>
    <property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -46,7 +46,7 @@
  </object>
  <object id="56" template="../../obj/shop.tx" x="152" y="370">
   <properties>
-    <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
    <property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red,PhyrexianRed"/>
    <property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -55,7 +55,7 @@
  </object>
  <object id="57" template="../../obj/shop.tx" x="200" y="418">
   <properties>
-    <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
    <property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red,PhyrexianRed"/>
    <property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -64,7 +64,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="104" y="370">
   <properties>
-    <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
    <property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red,PhyrexianRed"/>
    <property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -74,7 +74,7 @@
  <object id="47" template="../../obj/inn.tx" x="376" y="370"/>
  <object id="49" template="../../obj/shop.tx" x="104" y="418">
   <properties>
-    <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
    <property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red,PhyrexianRed"/>
    <property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -83,7 +83,7 @@
  </object>
  <object id="50" template="../../obj/shop.tx" x="152" y="418">
   <properties>
-    <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
    <property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red,PhyrexianRed"/>
    <property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -92,7 +92,7 @@
  </object>
  <object id="51" template="../../obj/shop.tx" x="248" y="418">
   <properties>
-    <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
    <property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red,PhyrexianRed"/>
    <property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -199,7 +199,7 @@
  </object>
  <object id="65" template="../../obj/shop.tx" x="200" y="370">
   <properties>
-    <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
    <property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red,PhyrexianRed"/>
    <property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
    <property name="signYOffset" type="float" value="-4"/>
@@ -219,7 +219,7 @@
  </object>
  <object id="68" template="../../obj/shop.tx" x="400" y="337">
   <properties>
-    <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
    <property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red"/>
    <property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
    <property name="signYOffset" type="float" value="-2"/>
@@ -228,7 +228,7 @@
  </object>
  <object id="69" template="../../obj/shop.tx" x="464" y="337">
   <properties>
-    <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
    <property name="mythicShopList" value="Planeswalker4Red,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,Legend4Red"/>
    <property name="rareShopList" value="Artifact4Red,Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle2Red,Wand4Red"/>
    <property name="signYOffset" type="float" value="-4"/>
--- a/forge-gui/res/adventure/common/maps/map/main_story/plains_capital.tmx
+++ b/forge-gui/res/adventure/common/maps/map/main_story/plains_capital.tmx
@@ -37,7 +37,7 @@
 <objectgroup id="4" name="Objects">
  <object id="41" template="../../obj/shop.tx" x="465" y="260">
   <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite,Eldrazi"/>
    <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -46,7 +46,7 @@
  </object>
  <object id="56" template="../../obj/shop.tx" x="416" y="260">
   <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite,Eldrazi"/>
    <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -55,7 +55,7 @@
  </object>
  <object id="57" template="../../obj/shop.tx" x="545" y="259">
   <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White"/>
    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite"/>
    <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -64,7 +64,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="370" y="325">
   <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite,Eldrazi"/>
    <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -74,7 +74,7 @@
  <object id="47" template="../../obj/inn.tx" x="536" y="144"/>
  <object id="49" template="../../obj/shop.tx" x="417" y="324">
   <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite,Eldrazi"/>
    <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -83,7 +83,7 @@
  </object>
  <object id="50" template="../../obj/shop.tx" x="465" y="323">
   <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite,Eldrazi"/>
    <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -92,7 +92,7 @@
  </object>
  <object id="51" template="../../obj/shop.tx" x="545" y="325">
   <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White"/>
    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite"/>
    <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -101,7 +101,7 @@
  </object>
  <object id="52" template="../../obj/shop.tx" x="369" y="261">
   <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite,Eldrazi"/>
    <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -222,7 +222,7 @@
  </object>
  <object id="67" template="../../obj/shop.tx" x="208" y="338">
   <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White"/>
    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite"/>
    <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
    <property name="signYOffset" type="float" value="-2"/>
@@ -231,7 +231,7 @@
  </object>
  <object id="68" template="../../obj/shop.tx" x="128" y="338">
   <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White"/>
    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite"/>
    <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
    <property name="signYOffset" type="float" value="-2"/>
--- a/forge-gui/res/adventure/common/maps/map/main_story/swamp_capital.tmx
+++ b/forge-gui/res/adventure/common/maps/map/main_story/swamp_capital.tmx
@@ -125,7 +125,7 @@
  </object>
  <object id="65" template="../../obj/shop.tx" x="376" y="322">
   <properties>
-    <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
    <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black,PhyrexianBlack"/>
    <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -134,7 +134,7 @@
  </object>
  <object id="66" template="../../obj/shop.tx" x="424" y="274">
   <properties>
-    <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
    <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black,PhyrexianBlack"/>
    <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -143,7 +143,7 @@
  </object>
  <object id="67" template="../../obj/shop.tx" x="424" y="322">
   <properties>
-    <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
    <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black,PhyrexianBlack"/>
    <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
    <property name="signXOffset" type="float" value="18"/>
@@ -153,7 +153,7 @@
  </object>
  <object id="68" template="../../obj/shop.tx" x="472" y="274">
   <properties>
-    <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
    <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black,PhyrexianBlack"/>
    <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -162,7 +162,7 @@
  </object>
  <object id="69" template="../../obj/shop.tx" x="472" y="322">
   <properties>
-    <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
    <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black,PhyrexianBlack"/>
    <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -171,7 +171,7 @@
  </object>
  <object id="70" template="../../obj/shop.tx" x="520" y="274">
   <properties>
-    <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
    <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black,PhyrexianBlack"/>
    <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -180,7 +180,7 @@
  </object>
  <object id="71" template="../../obj/shop.tx" x="520" y="322">
   <properties>
-    <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
    <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black,PhyrexianBlack"/>
    <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -189,7 +189,7 @@
  </object>
  <object id="77" template="../../obj/shop.tx" x="376" y="274">
   <properties>
-    <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
    <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black,PhyrexianBlack"/>
    <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -203,7 +203,7 @@
  </object>
  <object id="83" template="../../obj/shop.tx" x="519" y="194">
   <properties>
-    <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
    <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black,PhyrexianBlack"/>
    <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
    <property name="signYOffset" type="float" value="-8"/>
@@ -212,7 +212,7 @@
  </object>
  <object id="84" template="../../obj/shop.tx" x="456" y="194">
   <properties>
-    <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
    <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black,PhyrexianBlack"/>
    <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
    <property name="signYOffset" type="float" value="-8"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/forest_town.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/forest_town.tmx
@@ -32,32 +32,32 @@
  <object id="38" template="../../obj/entry_up.tx" x="240" y="272"/>
  <object id="41" template="../../obj/shop.tx" x="129" y="82">
   <properties>
-    <property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf"/>
+    <property name="shopList" value="Instant,Creature,GreenBoosterPackShop,BoosterPackShop,Green,Gruul,Selesnya,Golgari,Simic,Elf"/>
   </properties>
  </object>
  <object id="42" template="../../obj/shop.tx" x="304" y="114">
   <properties>
-    <property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
+    <property name="shopList" value="Instant,Creature,GreenBoosterPackShop,BoosterPackShop,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
   </properties>
  </object>
  <object id="43" template="../../obj/shop.tx" x="352" y="162">
   <properties>
-    <property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
+    <property name="shopList" value="Instant,Creature,GreenBoosterPackShop,BoosterPackShop,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
   </properties>
  </object>
  <object id="44" template="../../obj/shop.tx" x="177" y="81">
   <properties>
-    <property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf"/>
+    <property name="shopList" value="Instant,Creature,GreenBoosterPackShop,BoosterPackShop,Green,Gruul,Selesnya,Golgari,Simic,Elf"/>
   </properties>
  </object>
  <object id="45" template="../../obj/shop.tx" x="240" y="129">
   <properties>
-    <property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
+    <property name="shopList" value="Instant,Creature,GreenBoosterPackShop,BoosterPackShop,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
   </properties>
  </object>
  <object id="46" template="../../obj/shop.tx" x="368" y="226">
   <properties>
-    <property name="shopList" value="Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf"/>
+    <property name="shopList" value="Instant,Creature,GreenBoosterPackShop,BoosterPackShop,Green,Gruul,Selesnya,Golgari,Simic,Elf"/>
   </properties>
  </object>
  <object id="47" template="../../obj/inn.tx" x="137" y="162"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/forest_town_generic.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/forest_town_generic.tmx
@@ -33,7 +33,7 @@
  <object id="38" template="../../obj/entry_up.tx" x="240" y="272"/>
  <object id="41" template="../../obj/shop.tx" x="129" y="82">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,PhyrexianGreen"/>
    <property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
@@ -41,7 +41,7 @@
  </object>
  <object id="42" template="../../obj/shop.tx" x="304" y="114">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,PhyrexianGreen"/>
    <property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
@@ -49,7 +49,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="352" y="162">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB"/>
    <property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
@@ -57,7 +57,7 @@
  </object>
  <object id="44" template="../../obj/shop.tx" x="177" y="81">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,PhyrexianGreen"/>
    <property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
@@ -65,7 +65,7 @@
  </object>
  <object id="45" template="../../obj/shop.tx" x="240" y="129">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,PhyrexianGreen"/>
    <property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
@@ -73,7 +73,7 @@
  </object>
  <object id="46" template="../../obj/shop.tx" x="368" y="226">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,PhyrexianGreen"/>
    <property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
@@ -94,7 +94,7 @@
  <object id="50" template="../../obj/shardtrader.tx" x="98" y="98"/>
  <object id="51" template="../../obj/shop.tx" x="272" y="98">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,PhyrexianGreen"/>
    <property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
@@ -102,7 +102,7 @@
  </object>
  <object id="52" template="../../obj/shop.tx" x="208" y="50">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,PhyrexianGreen"/>
    <property name="rareShopList" value="Land4Green,Simic,Golgari,Gruul,Selesnya,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Elf,Wolf4Green,Druid,Squirrel,Sliver2Green,Wand,Equip,Multicolor"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/forest_town_identity.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/forest_town_identity.tmx
@@ -32,7 +32,7 @@
  <object id="38" template="../../obj/entry_up.tx" x="240" y="272"/>
  <object id="41" template="../../obj/shop.tx" x="129" y="82">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green,Hydra"/>
    <property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
    <property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
@@ -40,7 +40,7 @@
  </object>
  <object id="42" template="../../obj/shop.tx" x="304" y="114">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green,Hydra"/>
    <property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
    <property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
@@ -48,7 +48,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="352" y="162">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green,Hydra"/>
    <property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
    <property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
@@ -56,7 +56,7 @@
  </object>
  <object id="44" template="../../obj/shop.tx" x="177" y="81">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green,Hydra"/>
    <property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
    <property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
@@ -64,7 +64,7 @@
  </object>
  <object id="45" template="../../obj/shop.tx" x="240" y="129">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green,Hydra"/>
    <property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
    <property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
@@ -72,7 +72,7 @@
  </object>
  <object id="46" template="../../obj/shop.tx" x="368" y="226">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green,Hydra"/>
    <property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
    <property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
@@ -93,7 +93,7 @@
  <object id="50" template="../../obj/shardtrader.tx" x="98" y="98"/>
  <object id="52" template="../../obj/shop.tx" x="272" y="98">
   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green,Hydra"/>
    <property name="rareShopList" value="RGU,UWG,UGB,RWG,RGB,GWB,Land4Green,Creature6Green"/>
    <property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/forest_town_tribal.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/forest_town_tribal.tmx
@@ -33,7 +33,7 @@
  <object id="38" template="../../obj/entry_up.tx" x="240" y="272"/>
  <object id="41" template="../../obj/shop.tx" x="129" y="82">
   <properties>
-    <property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
    <property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green,PhyrexianGreen"/>
    <property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
@@ -41,7 +41,7 @@
  </object>
  <object id="42" template="../../obj/shop.tx" x="304" y="114">
   <properties>
-    <property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green,Hydra"/>
    <property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green,PhyrexianGreen"/>
    <property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
@@ -49,7 +49,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="352" y="162">
   <properties>
-    <property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green,Hydra"/>
    <property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green,PhyrexianGreen"/>
    <property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
@@ -57,7 +57,7 @@
  </object>
  <object id="44" template="../../obj/shop.tx" x="177" y="81">
   <properties>
-    <property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green,Hydra"/>
    <property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green,PhyrexianGreen"/>
    <property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
@@ -65,7 +65,7 @@
  </object>
  <object id="45" template="../../obj/shop.tx" x="240" y="129">
   <properties>
-    <property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green,Hydra"/>
    <property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green,PhyrexianGreen"/>
    <property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
@@ -73,7 +73,7 @@
  </object>
  <object id="46" template="../../obj/shop.tx" x="368" y="226">
   <properties>
-    <property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green,Hydra"/>
    <property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green,PhyrexianGreen"/>
    <property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
@@ -94,7 +94,7 @@
  <object id="52" template="../../obj/shardtrader.tx" x="98" y="98"/>
  <object id="53" template="../../obj/shop.tx" x="272" y="98">
   <properties>
-    <property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
    <property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green,PhyrexianGreen"/>
    <property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
@@ -102,7 +102,7 @@
  </object>
  <object id="54" template="../../obj/shop.tx" x="208" y="50">
   <properties>
-    <property name="commonShopList" value="Elf,Wolf,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green,Hydra"/>
    <property name="rareShopList" value="Simic,Golgari,Gruul,Selesnya,Creature6Green,Multicolor,Land4Green,PhyrexianGreen"/>
    <property name="uncommonShopList" value="Creature2Green,Creature,Green"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/island_town.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/island_town.tmx
@@ -32,32 +32,32 @@
  <object id="38" template="../../obj/entry_up.tx" x="256" y="271"/>
  <object id="41" template="../../obj/shop.tx" x="304" y="98">
   <properties>
-    <property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
+    <property name="shopList" value="Instant,Creature,BlueBoosterPackShop,BoosterPackShop,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
   </properties>
  </object>
  <object id="42" template="../../obj/shop.tx" x="368" y="162">
   <properties>
-    <property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
+    <property name="shopList" value="Instant,Creature,BlueBoosterPackShop,BoosterPackShop,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
   </properties>
  </object>
  <object id="43" template="../../obj/shop.tx" x="353" y="98">
   <properties>
-    <property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
+    <property name="shopList" value="Instant,Creature,BlueBoosterPackShop,BoosterPackShop,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
   </properties>
  </object>
  <object id="44" template="../../obj/shop.tx" x="208" y="162">
   <properties>
-    <property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
+    <property name="shopList" value="Instant,Creature,BlueBoosterPackShop,BoosterPackShop,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
   </properties>
  </object>
  <object id="45" template="../../obj/shop.tx" x="304" y="162">
   <properties>
-    <property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
+    <property name="shopList" value="Instant,Creature,BlueBoosterPackShop,BoosterPackShop,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
   </properties>
  </object>
  <object id="46" template="../../obj/shop.tx" x="336" y="162">
   <properties>
-    <property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
+    <property name="shopList" value="Instant,Creature,BlueBoosterPackShop,BoosterPackShop,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
   </properties>
  </object>
  <object id="47" template="../../obj/inn.tx" x="215" y="82"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/island_town_generic.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/island_town_generic.tmx
@@ -33,7 +33,7 @@
  <object id="38" template="../../obj/entry_up.tx" x="256" y="271"/>
  <object id="41" template="../../obj/shop.tx" x="304" y="98">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,PhyrexianBlue"/>
    <property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
@@ -41,7 +41,7 @@
  </object>
  <object id="42" template="../../obj/shop.tx" x="368" y="162">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,PhyrexianBlue"/>
    <property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
@@ -49,7 +49,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="353" y="98">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,PhyrexianBlue"/>
    <property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
@@ -57,7 +57,7 @@
  </object>
  <object id="44" template="../../obj/shop.tx" x="208" y="162">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,PhyrexianBlue"/>
    <property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
@@ -65,7 +65,7 @@
  </object>
  <object id="45" template="../../obj/shop.tx" x="304" y="162">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,PhyrexianBlue"/>
    <property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
@@ -73,7 +73,7 @@
  </object>
  <object id="46" template="../../obj/shop.tx" x="336" y="162">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,PhyrexianBlue"/>
    <property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
@@ -94,7 +94,7 @@
  <object id="51" template="../../obj/shardtrader.tx" x="398" y="178"/>
  <object id="52" template="../../obj/shop.tx" x="168" y="82">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,PhyrexianBlue"/>
    <property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
@@ -102,7 +102,7 @@
  </object>
  <object id="53" template="../../obj/shop.tx" x="256" y="66">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,PhyrexianBlue"/>
    <property name="rareShopList" value="Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Merfolk,Wizard,Bird4Blue,Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Wand,Equip,Multicolor"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/island_town_identity.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/island_town_identity.tmx
@@ -32,7 +32,7 @@
  <object id="38" template="../../obj/entry_up.tx" x="256" y="271"/>
  <object id="41" template="../../obj/shop.tx" x="304" y="98">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
    <property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
    <property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
@@ -40,7 +40,7 @@
  </object>
  <object id="42" template="../../obj/shop.tx" x="368" y="162">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
    <property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
    <property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
@@ -48,7 +48,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="353" y="98">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
    <property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
    <property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
@@ -56,7 +56,7 @@
  </object>
  <object id="44" template="../../obj/shop.tx" x="208" y="162">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
    <property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
    <property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
@@ -64,7 +64,7 @@
  </object>
  <object id="45" template="../../obj/shop.tx" x="304" y="162">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
    <property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
    <property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
@@ -72,7 +72,7 @@
  </object>
  <object id="46" template="../../obj/shop.tx" x="336" y="162">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
    <property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
    <property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
@@ -93,7 +93,7 @@
  <object id="53" template="../../obj/shardtrader.tx" x="398" y="178"/>
  <object id="54" template="../../obj/shop.tx" x="256" y="66">
   <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
    <property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
    <property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/island_town_tribal.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/island_town_tribal.tmx
@@ -33,7 +33,8 @@
  <object id="38" template="../../obj/entry_up.tx" x="256" y="271"/>
  <object id="41" template="../../obj/shop.tx" x="304" y="98">
   <properties>
-    <property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
+    <property name="commonShopList" value="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue,Mutants"/>
    <property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue,PhyrexianBlue,Mutants,Horrors,Shapeshifter,Sphinx,LargeSeaCreatures"/>
    <property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
@@ -41,7 +42,8 @@
  </object>
  <object id="42" template="../../obj/shop.tx" x="368" y="162">
   <properties>
-    <property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
+    <property name="commonShopList" value="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue,Mutants"/>
    <property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue,PhyrexianBlue,Mutants,Horrors,Shapeshifter,Sphinx,LargeSeaCreatures"/>
    <property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
@@ -49,7 +51,8 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="353" y="98">
   <properties>
-    <property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
+    <property name="commonShopList" value="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue,Mutants"/>
    <property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue,PhyrexianBlue,Mutants,Horrors,Shapeshifter,Sphinx,LargeSeaCreatures"/>
    <property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
@@ -57,7 +60,8 @@
  </object>
  <object id="44" template="../../obj/shop.tx" x="208" y="162">
   <properties>
-    <property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
+    <property name="commonShopList" value="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue,Mutants"/>
    <property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue,PhyrexianBlue,Mutants,Horrors,Shapeshifter,Sphinx,LargeSeaCreatures"/>
    <property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
@@ -65,7 +69,8 @@
  </object>
  <object id="45" template="../../obj/shop.tx" x="304" y="162">
   <properties>
-    <property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
+    <property name="commonShopList" value="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue,Mutants"/>
    <property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue,PhyrexianBlue,Mutants,Horrors,Shapeshifter,Sphinx,LargeSeaCreatures"/>
    <property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
@@ -73,7 +78,8 @@
  </object>
  <object id="46" template="../../obj/shop.tx" x="336" y="162">
   <properties>
-    <property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
+    <property name="commonShopList" value="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue,Mutants"/>
    <property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue,PhyrexianBlue,Mutants,Horrors,Shapeshifter,Sphinx,LargeSeaCreatures"/>
    <property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
@@ -94,7 +100,8 @@
  <object id="53" template="../../obj/shardtrader.tx" x="398" y="178"/>
  <object id="55" template="../../obj/shop.tx" x="168" y="82">
   <properties>
-    <property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
+    <property name="commonShopList" value="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
    <property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue,PhyrexianBlue"/>
    <property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
@@ -102,7 +109,8 @@
  </object>
  <object id="56" template="../../obj/shop.tx" x="256" y="66">
   <properties>
-    <property name="commonShopList" value="Merfolk,Wizard,Bird4Blue,Sliver2Blue,Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
+    <property name="commonShopList" value="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    Rogue4Blue,Spirit4Blue,Pirate4Blue"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue,Mutants"/>
    <property name="rareShopList" value="Azorius,Izzet,Simic,Dimir,Creature6Blue,Multicolor,Land4Blue,PhyrexianBlue,Mutants,Horrors,Shapeshifter,Sphinx,LargeSeaCreatures"/>
    <property name="uncommonShopList" value="Creature2Blue,Creature,Blue"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/mountain_town.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/mountain_town.tmx
@@ -32,32 +32,32 @@
  <object id="38" template="../../obj/entry_up.tx" x="208" y="272"/>
  <object id="41" template="../../obj/shop.tx" x="64" y="115">
   <properties>
-    <property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
+    <property name="shopList" value="Instant,RedBoosterPackShop,BoosterPackShop,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
   </properties>
  </object>
  <object id="42" template="../../obj/shop.tx" x="113" y="115">
   <properties>
-    <property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
+    <property name="shopList" value="Instant,RedBoosterPackShop,BoosterPackShop,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
   </properties>
  </object>
  <object id="43" template="../../obj/shop.tx" x="161" y="163">
   <properties>
-    <property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
+    <property name="shopList" value="Instant,RedBoosterPackShop,BoosterPackShop,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
   </properties>
  </object>
  <object id="44" template="../../obj/shop.tx" x="257" y="162">
   <properties>
-    <property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
+    <property name="shopList" value="Instant,RedBoosterPackShop,BoosterPackShop,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
   </properties>
  </object>
  <object id="45" template="../../obj/shop.tx" x="304" y="162">
   <properties>
-    <property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
+    <property name="shopList" value="Instant,RedBoosterPackShop,BoosterPackShop,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
   </properties>
  </object>
  <object id="46" template="../../obj/shop.tx" x="351" y="162">
   <properties>
-    <property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
+    <property name="shopList" value="Instant,RedBoosterPackShop,BoosterPackShop,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
   </properties>
  </object>
  <object id="47" template="../../obj/inn.tx" x="214" y="114"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/mountain_town_generic.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/mountain_town_generic.tmx
@@ -33,7 +33,7 @@
  <object id="38" template="../../obj/entry_up.tx" x="208" y="272"/>
  <object id="41" template="../../obj/shop.tx" x="64" y="115">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,PhyrexianRed"/>
    <property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor,Giant,SnowShop"/>
@@ -41,7 +41,7 @@
  </object>
  <object id="42" template="../../obj/shop.tx" x="113" y="115">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,PhyrexianRed"/>
    <property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor,Giant,SnowShop"/>
@@ -49,7 +49,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="161" y="163">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,PhyrexianRed"/>
    <property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor,Giant,SnowShop"/>
@@ -57,7 +57,7 @@
  </object>
  <object id="44" template="../../obj/shop.tx" x="257" y="162">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,PhyrexianRed"/>
    <property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor,Giant,SnowShop"/>
@@ -65,7 +65,7 @@
  </object>
  <object id="45" template="../../obj/shop.tx" x="304" y="162">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,PhyrexianRed"/>
    <property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor,Giant,SnowShop"/>
@@ -73,7 +73,7 @@
  </object>
  <object id="46" template="../../obj/shop.tx" x="367" y="162">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,PhyrexianRed"/>
    <property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor,Giant,SnowShop"/>
@@ -99,7 +99,7 @@
  </object>
  <object id="53" template="../../obj/shop.tx" x="239" y="100">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,PhyrexianRed"/>
    <property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor"/>
@@ -107,7 +107,7 @@
  </object>
  <object id="54" template="../../obj/shop.tx" x="304" y="98">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RGU,RWG,RWU,RUB,RWB,RGB,PhyrexianRed"/>
    <property name="rareShopList" value="Land4Red,Gruul,Izzet,Rakdos,Boros,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Wolf4Red,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Wand,Equip,Multicolor,Giant,SnowShop"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/mountain_town_identity.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/mountain_town_identity.tmx
@@ -32,7 +32,7 @@
  <object id="38" template="../../obj/entry_up.tx" x="208" y="272"/>
  <object id="41" template="../../obj/shop.tx" x="64" y="115">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
    <property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
@@ -40,7 +40,7 @@
  </object>
  <object id="42" template="../../obj/shop.tx" x="113" y="115">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
    <property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
@@ -48,7 +48,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="161" y="163">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
    <property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
@@ -56,7 +56,7 @@
  </object>
  <object id="44" template="../../obj/shop.tx" x="257" y="162">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
    <property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
@@ -64,7 +64,7 @@
  </object>
  <object id="45" template="../../obj/shop.tx" x="304" y="162">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
    <property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
@@ -72,7 +72,7 @@
  </object>
  <object id="46" template="../../obj/shop.tx" x="367" y="162">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
    <property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
@@ -104,7 +104,7 @@
  </object>
  <object id="56" template="../../obj/shop.tx" x="304" y="97">
   <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="RGU,RWG,RWU,RUB,RWB,RGB,Land4Red,Creature6Red"/>
    <property name="uncommonShopList" value="Gruul,Izzet,Rakdos,Boros,Gruul,Izzet,Rakdos,Boros,Land"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/mountain_town_tribal.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/mountain_town_tribal.tmx
@@ -33,7 +33,8 @@
  <object id="38" template="../../obj/entry_up.tx" x="208" y="272"/>
  <object id="41" template="../../obj/shop.tx" x="64" y="115">
   <properties>
-    <property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red,PhyrexianRed"/>
    <property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
@@ -41,7 +42,8 @@
  </object>
  <object id="42" template="../../obj/shop.tx" x="113" y="115">
   <properties>
-    <property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red,PhyrexianRed"/>
    <property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
@@ -49,7 +51,8 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="161" y="163">
   <properties>
-    <property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red,PhyrexianRed"/>
    <property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
@@ -57,7 +60,8 @@
  </object>
  <object id="44" template="../../obj/shop.tx" x="257" y="162">
   <properties>
-    <property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red,PhyrexianRed"/>
    <property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
@@ -65,7 +69,8 @@
  </object>
  <object id="45" template="../../obj/shop.tx" x="304" y="162">
   <properties>
-    <property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red,PhyrexianRed"/>
    <property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
@@ -73,7 +78,8 @@
  </object>
  <object id="46" template="../../obj/shop.tx" x="367" y="162">
   <properties>
-    <property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red,PhyrexianRed"/>
    <property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
@@ -99,7 +105,8 @@
  </object>
  <object id="52" template="../../obj/shop.tx" x="304" y="97">
   <properties>
-    <property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red,PhyrexianRed"/>
    <property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
@@ -107,7 +114,8 @@
  </object>
  <object id="53" template="../../obj/shop.tx" x="240" y="97">
   <properties>
-    <property name="commonShopList" value="Wolf4Red,Goblin,Devil,Dwarf,Dragon,Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
+    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    Sliver2Red,Knight4Red,Soldier4Red,Minotaur,Shaman,Dinosaur4Red,Ogre4Red,Giant"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
    <property name="rareShopList" value="Gruul,Izzet,Rakdos,Boros,Creature6Red,Multicolor,Land4Red,PhyrexianRed"/>
    <property name="uncommonShopList" value="Creature2Red,Creature,Red"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/plains_town.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/plains_town.tmx
@@ -32,22 +32,22 @@
  <object id="38" template="../../obj/entry_up.tx" x="219" y="383" width="28" height="16"/>
  <object id="41" template="../../obj/shop.tx" x="97" y="305">
   <properties>
-    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
   </properties>
  </object>
  <object id="56" template="../../obj/shop.tx" x="208" y="144">
   <properties>
-    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
   </properties>
  </object>
  <object id="57" template="../../obj/shop.tx" x="240" y="144">
   <properties>
-    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
   </properties>
  </object>
  <object id="43" template="../../obj/shop.tx" x="352" y="306">
   <properties>
-    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
   </properties>
  </object>
  <object id="47" template="../../obj/inn.tx" x="224" y="211"/>
@@ -60,22 +60,22 @@
  </object>
  <object id="49" template="../../obj/shop.tx" x="304" y="306">
   <properties>
-    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
   </properties>
  </object>
  <object id="50" template="../../obj/shop.tx" x="256" y="306">
   <properties>
-    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
   </properties>
  </object>
  <object id="51" template="../../obj/shop.tx" x="192" y="306">
   <properties>
-    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
   </properties>
  </object>
  <object id="52" template="../../obj/shop.tx" x="144" y="306">
   <properties>
-    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
   </properties>
  </object>
  <object id="53" template="../../obj/spellsmith.tx" x="157" y="225"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/plains_town_generic.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/plains_town_generic.tmx
@@ -33,15 +33,15 @@
  <object id="38" template="../../obj/entry_up.tx" x="219" y="383" width="28" height="16"/>
  <object id="41" template="../../obj/shop.tx" x="97" y="305">
   <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
-    <property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,PhyrexianWhite"/>
-    <property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="mythicShopList" value="WhiteBoosterPackShop,BoosterPackShop,Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,PhyrexianWhite"/>
+    <property name="rareShopList" value="WhiteBoosterPackShop,BoosterPackShop,Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
   </properties>
  </object>
  <object id="56" template="../../obj/shop.tx" x="208" y="144">
   <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,PhyrexianWhite"/>
    <property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
@@ -49,7 +49,7 @@
  </object>
  <object id="57" template="../../obj/shop.tx" x="240" y="144">
   <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,PhyrexianWhite"/>
    <property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
@@ -74,7 +74,7 @@
  </object>
  <object id="49" template="../../obj/shop.tx" x="304" y="306">
   <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,PhyrexianWhite"/>
    <property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
@@ -82,7 +82,7 @@
  </object>
  <object id="50" template="../../obj/shop.tx" x="256" y="306">
   <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,PhyrexianWhite"/>
    <property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
@@ -98,7 +98,7 @@
  </object>
  <object id="52" template="../../obj/shop.tx" x="144" y="306">
   <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,PhyrexianWhite"/>
    <property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/plains_town_identity.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/plains_town_identity.tmx
@@ -33,7 +33,7 @@
  <object id="38" template="../../obj/entry_up.tx" x="219" y="383" width="28" height="16"/>
  <object id="41" template="../../obj/shop.tx" x="97" y="305">
   <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
    <property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White,Nobles"/>
    <property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
@@ -41,7 +41,7 @@
  </object>
  <object id="56" template="../../obj/shop.tx" x="208" y="144">
   <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
    <property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White,Nobles"/>
    <property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
@@ -49,7 +49,7 @@
  </object>
  <object id="57" template="../../obj/shop.tx" x="240" y="144">
   <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
    <property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White,Nobles"/>
    <property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
@@ -57,7 +57,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="352" y="306">
   <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
    <property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White,Nobles"/>
    <property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
@@ -74,7 +74,7 @@
  </object>
  <object id="50" template="../../obj/shop.tx" x="256" y="306">
   <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
    <property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White,Nobles"/>
    <property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
@@ -82,7 +82,7 @@
  </object>
  <object id="51" template="../../obj/shop.tx" x="192" y="306">
   <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
    <property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White,Nobles"/>
    <property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
@@ -90,7 +90,7 @@
  </object>
  <object id="52" template="../../obj/shop.tx" x="144" y="306">
   <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
    <property name="rareShopList" value="RWG,RWU,RWB,UWG,UWB,GWB,Land4White,Creature6White,Nobles"/>
    <property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/plains_town_tribal.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/plains_town_tribal.tmx
@@ -33,7 +33,8 @@
  <object id="38" template="../../obj/entry_up.tx" x="219" y="383" width="28" height="16"/>
  <object id="41" template="../../obj/shop.tx" x="97" y="305">
   <properties>
-    <property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,
+    Angel,Sliver2White,Spirit4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White,Gods"/>
    <property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White,PhyrexianWhite"/>
    <property name="uncommonShopList" value="Creature2White,Creature,White,SmallCats"/>
@@ -41,7 +42,7 @@
  </object>
  <object id="56" template="../../obj/shop.tx" x="208" y="144">
   <properties>
-    <property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
    <property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White,PhyrexianWhite"/>
    <property name="uncommonShopList" value="Creature2White,Creature,White"/>
@@ -49,7 +50,7 @@
  </object>
  <object id="57" template="../../obj/shop.tx" x="240" y="144">
   <properties>
-    <property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White"/>
    <property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White,PhyrexianWhite"/>
    <property name="uncommonShopList" value="Creature2White,Creature,White"/>
@@ -57,7 +58,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="352" y="306">
   <properties>
-    <property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White,Gods"/>
    <property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White,PhyrexianWhite"/>
    <property name="uncommonShopList" value="Creature2White,Creature,White,SmallCats"/>
@@ -74,7 +75,7 @@
  </object>
  <object id="49" template="../../obj/shop.tx" x="304" y="306">
   <properties>
-    <property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White,Gods"/>
    <property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White,PhyrexianWhite"/>
    <property name="uncommonShopList" value="Creature2White,Creature,White,SmallCats"/>
@@ -82,7 +83,7 @@
  </object>
  <object id="50" template="../../obj/shop.tx" x="256" y="306">
   <properties>
-    <property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White,Gods"/>
    <property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White,PhyrexianWhite"/>
    <property name="uncommonShopList" value="Creature2White,Creature,White,SmallCats"/>
@@ -90,7 +91,7 @@
  </object>
  <object id="51" template="../../obj/shop.tx" x="192" y="306">
   <properties>
-    <property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White,Gods"/>
    <property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White,PhyrexianWhite"/>
    <property name="uncommonShopList" value="Creature2White,Creature,White,SmallCats"/>
@@ -98,7 +99,7 @@
  </object>
  <object id="52" template="../../obj/shop.tx" x="144" y="306">
   <properties>
-    <property name="commonShopList" value="Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4White,Gods"/>
    <property name="rareShopList" value="Azorius,Boros,Selesnya,Orzhov,Creature6White,Multicolor,Land4White,PhyrexianWhite"/>
    <property name="uncommonShopList" value="Creature2White,Creature,White,SmallCats"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/swamp_town.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/swamp_town.tmx
@@ -32,22 +32,22 @@
  <object id="38" template="../../obj/entry_up.tx" x="208" y="272"/>
  <object id="41" template="../../obj/shop.tx" x="129" y="146">
   <properties>
-    <property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
+    <property name="shopList" value="BlackBoosterPackShop,BoosterPackShop,Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
   </properties>
  </object>
  <object id="42" template="../../obj/shop.tx" x="177" y="145">
   <properties>
-    <property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
+    <property name="shopList" value="BlackBoosterPackShop,BoosterPackShop,Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
   </properties>
  </object>
  <object id="43" template="../../obj/shop.tx" x="321" y="129">
   <properties>
-    <property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
+    <property name="shopList" value="BlackBoosterPackShop,BoosterPackShop,Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
   </properties>
  </object>
  <object id="44" template="../../obj/shop.tx" x="114" y="194">
   <properties>
-    <property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
+    <property name="shopList" value="BlackBoosterPackShop,BoosterPackShop,Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
   </properties>
  </object>
  <object id="45" template="../../obj/shop.tx" x="273" y="130">
@@ -57,7 +57,7 @@
  </object>
  <object id="46" template="../../obj/shop.tx" x="337" y="177">
   <properties>
-    <property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
+    <property name="shopList" value="BlackBoosterPackShop,BoosterPackShop,Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
   </properties>
  </object>
  <object id="47" template="../../obj/inn.tx" x="230" y="98"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/swamp_town_generic.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/swamp_town_generic.tmx
@@ -33,7 +33,7 @@
  <object id="38" template="../../obj/entry_up.tx" x="208" y="272"/>
  <object id="41" template="../../obj/shop.tx" x="129" y="146">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,PhyrexianBlack"/>
    <property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black,Wand,Equip,Multicolor"/>
@@ -41,7 +41,7 @@
  </object>
  <object id="42" template="../../obj/shop.tx" x="177" y="145">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,PhyrexianBlack"/>
    <property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black,Wand,Equip,Multicolor"/>
@@ -49,7 +49,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="321" y="129">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,PhyrexianBlack"/>
    <property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black,Wand,Equip,Multicolor"/>
@@ -57,7 +57,7 @@
  </object>
  <object id="44" template="../../obj/shop.tx" x="114" y="194">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,PhyrexianBlack"/>
    <property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black,Wand,Equip,Multicolor"/>
@@ -65,7 +65,7 @@
  </object>
  <object id="45" template="../../obj/shop.tx" x="273" y="130">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,PhyrexianBlack"/>
    <property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black,Wand,Equip,Multicolor"/>
@@ -73,7 +73,7 @@
  </object>
  <object id="46" template="../../obj/shop.tx" x="337" y="177">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,PhyrexianBlack"/>
    <property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
    <property name="uncommonShopList" value="Artifact,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black,Wand,Equip,Multicolor"/>
@@ -94,7 +94,7 @@
  </object>
  <object id="52" template="../../obj/shop.tx" x="201" y="88">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,PhyrexianBlack"/>
    <property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
    <property name="signXOffset" type="float" value="-4"/>
@@ -103,7 +103,7 @@
  </object>
  <object id="53" template="../../obj/shop.tx" x="167" y="88">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,PhyrexianBlack"/>
    <property name="rareShopList" value="Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle,Colorless"/>
    <property name="signXOffset" type="float" value="4"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/swamp_town_identity.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/swamp_town_identity.tmx
@@ -33,7 +33,7 @@
  <object id="38" template="../../obj/entry_up.tx" x="208" y="272"/>
  <object id="41" template="../../obj/shop.tx" x="129" y="146">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
    <property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
    <property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
@@ -41,7 +41,7 @@
  </object>
  <object id="42" template="../../obj/shop.tx" x="177" y="145">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
    <property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
    <property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
@@ -49,7 +49,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="321" y="129">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
    <property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
    <property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
@@ -57,7 +57,7 @@
  </object>
  <object id="44" template="../../obj/shop.tx" x="114" y="194">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
    <property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
    <property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
@@ -65,7 +65,7 @@
  </object>
  <object id="45" template="../../obj/shop.tx" x="273" y="130">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
    <property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
    <property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
@@ -73,7 +73,7 @@
  </object>
  <object id="46" template="../../obj/shop.tx" x="337" y="177">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
    <property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
    <property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
@@ -94,7 +94,7 @@
  <object id="50" template="../../obj/shardtrader.tx" x="288" y="82"/>
  <object id="51" template="../../obj/shop.tx" x="201" y="88">
   <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Black"/>
    <property name="rareShopList" value="RWB,RUB,RGB,UWB,UGB,UWB,Land4Black,Creature6Black"/>
    <property name="signXOffset" type="float" value="-4"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/swamp_town_tribal.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/swamp_town_tribal.tmx
@@ -33,7 +33,8 @@
  <object id="38" template="../../obj/entry_up.tx" x="208" y="272"/>
  <object id="41" template="../../obj/shop.tx" x="129" y="146">
   <properties>
-    <property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,
+    Knight4Black,Rogue4Black,Sliver2Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
    <property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black,PhyrexianBlack"/>
    <property name="uncommonShopList" value="Creature2Black,Creature,Black,Horrors,Insects,Spiders"/>
@@ -41,7 +42,7 @@
  </object>
  <object id="42" template="../../obj/shop.tx" x="177" y="145">
   <properties>
-    <property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
    <property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black,PhyrexianBlack"/>
    <property name="uncommonShopList" value="Creature2Black,Creature,Black,Horrors,Insects,Spiders"/>
@@ -49,7 +50,7 @@
  </object>
  <object id="43" template="../../obj/shop.tx" x="321" y="129">
   <properties>
-    <property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
    <property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black,PhyrexianBlack"/>
    <property name="uncommonShopList" value="Creature2Black,Creature,Black,Horrors,Insects,Spiders"/>
@@ -57,7 +58,7 @@
  </object>
  <object id="44" template="../../obj/shop.tx" x="114" y="194">
   <properties>
-    <property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
    <property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black,PhyrexianBlack"/>
    <property name="uncommonShopList" value="Creature2Black,Creature,Black,Horrors,Insects,Spiders"/>
@@ -65,7 +66,7 @@
  </object>
  <object id="45" template="../../obj/shop.tx" x="273" y="130">
   <properties>
-    <property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
    <property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black,PhyrexianBlack"/>
    <property name="uncommonShopList" value="Creature2Black,Creature,Black,Horrors,Insects,Spiders"/>
@@ -73,7 +74,7 @@
  </object>
  <object id="46" template="../../obj/shop.tx" x="337" y="177">
   <properties>
-    <property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
    <property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black,PhyrexianBlack"/>
    <property name="uncommonShopList" value="Creature2Black,Creature,Black,Horrors,Insects,Spiders"/>
@@ -94,7 +95,7 @@
  <object id="50" template="../../obj/shardtrader.tx" x="288" y="82"/>
  <object id="51" template="../../obj/shop.tx" x="167" y="88">
   <properties>
-    <property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
    <property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black,PhyrexianBlack"/>
    <property name="signXOffset" type="float" value="4"/>
@@ -103,7 +104,7 @@
  </object>
  <object id="52" template="../../obj/shop.tx" x="201" y="88">
   <properties>
-    <property name="commonShopList" value="Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand"/>
    <property name="rareShopList" value="Dimir,Rakdos,Orzhov,Golgari,Multicolor,Land4Black,Creature6Black,PhyrexianBlack"/>
    <property name="signXOffset" type="float" value="-4"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/waste_town.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/waste_town.tmx
@@ -32,42 +32,44 @@
  <object id="38" template="../../obj/entry_up.tx" x="204" y="368" width="56" height="16"/>
  <object id="41" template="../../obj/shop.tx" x="256" y="208">
   <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+    <property name="shopList" value="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,
+    Artifact,Multicolor,
+    Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
   </properties>
  </object>
  <object id="55" template="../../obj/shop.tx" x="272" y="144">
   <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Golem,Sliver"/>
+    <property name="shopList" value="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Golem,Sliver"/>
   </properties>
  </object>
  <object id="57" template="../../obj/shop.tx" x="320" y="144">
   <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Golem,Sliver"/>
+    <property name="shopList" value="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Golem,Sliver"/>
   </properties>
  </object>
  <object id="50" template="../../obj/shop.tx" x="304" y="208">
   <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+    <property name="shopList" value="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
   </properties>
  </object>
  <object id="51" template="../../obj/shop.tx" x="352" y="208">
   <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+    <property name="shopList" value="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
   </properties>
  </object>
  <object id="52" template="../../obj/shop.tx" x="352" y="272">
   <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+    <property name="shopList" value="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
   </properties>
  </object>
  <object id="53" template="../../obj/shop.tx" x="304" y="272">
   <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+    <property name="shopList" value="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
   </properties>
  </object>
  <object id="54" template="../../obj/shop.tx" x="256" y="272">
   <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+    <property name="shopList" value="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
   </properties>
  </object>
  <object id="47" template="../../obj/inn.tx" x="150" y="273"/>
@@ -78,7 +80,7 @@
  </object>
  <object id="58" template="../../obj/shop.tx" x="97" y="209">
   <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+    <property name="shopList" value="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
   </properties>
  </object>
 </objectgroup>
--- a/forge-gui/res/adventure/common/maps/map/towns/waste_town_generic.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/waste_town_generic.tmx
@@ -36,7 +36,7 @@
    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,PhyrexianColorless"/>
    <property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black,FlipShop,Saga"/>
-    <property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
+    <property name="uncommonShopList" value="ColorlessBoosterPackShop,Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
   </properties>
  </object>
  <object id="55" template="../../obj/shop.tx" x="272" y="144">
@@ -44,7 +44,7 @@
    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,PhyrexianColorless"/>
    <property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black,FlipShop,Saga"/>
-    <property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
+    <property name="uncommonShopList" value="ColorlessBoosterPackShop,Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
   </properties>
  </object>
  <object id="57" template="../../obj/shop.tx" x="320" y="144">
@@ -52,7 +52,7 @@
    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,PhyrexianColorless"/>
    <property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black,FlipShop,Saga"/>
-    <property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
+    <property name="uncommonShopList" value="ColorlessBoosterPackShop,Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
   </properties>
  </object>
  <object id="50" template="../../obj/shop.tx" x="304" y="208">
@@ -60,7 +60,7 @@
    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,PhyrexianColorless"/>
    <property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black,FlipShop,Saga"/>
-    <property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
+    <property name="uncommonShopList" value="ColorlessBoosterPackShop,Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
   </properties>
  </object>
  <object id="51" template="../../obj/shop.tx" x="352" y="208">
@@ -73,7 +73,7 @@
  </object>
  <object id="52" template="../../obj/shop.tx" x="352" y="272">
   <properties>
-    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
+    <property name="commonShopList" value="ColorlessBoosterPackShop,Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,PhyrexianColorless"/>
    <property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black,FlipShop,Saga"/>
    <property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
@@ -81,7 +81,8 @@
  </object>
  <object id="53" template="../../obj/shop.tx" x="304" y="272">
   <properties>
-    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
+    <property name="commonShopList" value="ColorlessBoosterPackShop,Colorless,Colorless,Artifact,Creature2Colorless,
+    Wand,Enchantment,Instant,Creature"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,PhyrexianColorless"/>
    <property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black,FlipShop,Saga"/>
    <property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
@@ -89,7 +90,7 @@
  </object>
  <object id="54" template="../../obj/shop.tx" x="256" y="272">
   <properties>
-    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
+    <property name="commonShopList" value="ColorlessBoosterPackShop,Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,PhyrexianColorless"/>
    <property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black,FlipShop,Saga"/>
    <property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
@@ -98,13 +99,13 @@
  <object id="47" template="../../obj/inn.tx" x="150" y="273"/>
  <object id="48" template="../../obj/shop.tx" x="104" y="272">
   <properties>
-    <property name="commonShopList" value="Equipment"/>
+    <property name="commonShopList" value="cardPackShop"/>
    <property name="noRestock" type="bool" value="true"/>
   </properties>
  </object>
  <object id="58" template="../../obj/shop.tx" x="97" y="209">
   <properties>
-    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
+    <property name="commonShopList" value="ColorlessBoosterPackShop,Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
    <property name="mythicShopList" value="Planeswalker,WUBRG,PhyrexianColorless"/>
    <property name="rareShopList" value="Land4Colorless,Vehicle,White,Blue,Red,Green,Black"/>
    <property name="uncommonShopList" value="Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/waste_town_identity.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/waste_town_identity.tmx
@@ -33,7 +33,7 @@
  <object id="38" template="../../obj/entry_up.tx" x="204" y="368" width="56" height="16"/>
  <object id="41" template="../../obj/shop.tx" x="256" y="208">
   <properties>
-    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
+    <property name="commonShopList" value="ColorlessBoosterPackShop,Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
    <property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
    <property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi,Saga"/>
    <property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
@@ -60,7 +60,7 @@
    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
    <property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
    <property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi"/>
-    <property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
+    <property name="uncommonShopList" value="ColorlessBoosterPackShop,Land,Enchantment,Instant,Creature"/>
   </properties>
  </object>
  <object id="51" template="../../obj/shop.tx" x="352" y="208">
@@ -68,7 +68,7 @@
    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
    <property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
    <property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi,Saga"/>
-    <property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
+    <property name="uncommonShopList" value="ColorlessBoosterPackShop,Land,Enchantment,Instant,Creature"/>
   </properties>
  </object>
  <object id="52" template="../../obj/shop.tx" x="352" y="272">
@@ -76,7 +76,7 @@
    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
    <property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
    <property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi,Saga"/>
-    <property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
+    <property name="uncommonShopList" value="ColorlessBoosterPackShop,Land,Enchantment,Instant,Creature"/>
   </properties>
  </object>
  <object id="53" template="../../obj/shop.tx" x="304" y="272">
@@ -84,7 +84,7 @@
    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
    <property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
    <property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi,Saga"/>
-    <property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
+    <property name="uncommonShopList" value="ColorlessBoosterPackShop,Land,Enchantment,Instant,Creature"/>
   </properties>
  </object>
  <object id="54" template="../../obj/shop.tx" x="256" y="272">
@@ -92,7 +92,7 @@
    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
    <property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
    <property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi,Saga"/>
-    <property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
+    <property name="uncommonShopList" value="ColorlessBoosterPackShop,Land,Enchantment,Instant,Creature"/>
   </properties>
  </object>
  <object id="47" template="../../obj/inn.tx" x="150" y="273"/>
@@ -107,7 +107,7 @@
    <property name="commonShopList" value="Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
    <property name="mythicShopList" value="White,Blue,Red,Green,Black,Legend"/>
    <property name="rareShopList" value="Land4Colorless,Land4Colorless,Creature2Eldrazi"/>
-    <property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
+    <property name="uncommonShopList" value="ColorlessBoosterPackShop,Land,Enchantment,Instant,Creature"/>
   </properties>
  </object>
  <object id="61" template="../../obj/shardtrader.tx" x="400" y="288"/>
--- a/forge-gui/res/adventure/common/maps/map/towns/waste_town_tribal.tmx
+++ b/forge-gui/res/adventure/common/maps/map/towns/waste_town_tribal.tmx
@@ -33,7 +33,7 @@
  <object id="38" template="../../obj/entry_up.tx" x="204" y="368" width="56" height="16"/>
  <object id="41" template="../../obj/shop.tx" x="256" y="208">
   <properties>
-    <property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
    <property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG,Gods"/>
    <property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,PhyrexianColorless,Giant,Spiders,Shapeshifter"/>
    <property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
@@ -41,7 +41,7 @@
  </object>
  <object id="55" template="../../obj/shop.tx" x="272" y="144">
   <properties>
-    <property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="cardPackShop,ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
    <property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG,Gods"/>
    <property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,PhyrexianColorless,Giant,Spiders,Shapeshifter"/>
    <property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
@@ -49,7 +49,7 @@
  </object>
  <object id="57" template="../../obj/shop.tx" x="320" y="144">
   <properties>
-    <property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="cardPackShop,ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
    <property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG,Gods"/>
    <property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,PhyrexianColorless,Giant,Spiders,Shapeshifter"/>
    <property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
@@ -57,7 +57,7 @@
  </object>
  <object id="50" template="../../obj/shop.tx" x="304" y="208">
   <properties>
-    <property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="cardPackShop,ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
    <property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG,Gods"/>
    <property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,PhyrexianColorless,Giant,Spiders,Shapeshifter"/>
    <property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
@@ -65,7 +65,7 @@
  </object>
  <object id="51" template="../../obj/shop.tx" x="352" y="208">
   <properties>
-    <property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="cardPackShop,ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
    <property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG,Gods"/>
    <property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,PhyrexianColorless,Giant,Spiders,Shapeshifter"/>
    <property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
@@ -73,7 +73,7 @@
  </object>
  <object id="52" template="../../obj/shop.tx" x="352" y="272">
   <properties>
-    <property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="cardPackShop,ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
    <property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG,Gods"/>
    <property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,PhyrexianColorless,Giant,Spiders,Shapeshifter"/>
    <property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
@@ -81,7 +81,7 @@
  </object>
  <object id="53" template="../../obj/shop.tx" x="304" y="272">
   <properties>
-    <property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="cardPackShop,ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
    <property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG,Gods"/>
    <property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,PhyrexianColorless,Giant,Spiders,Shapeshifter"/>
    <property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
@@ -89,7 +89,7 @@
  </object>
  <object id="54" template="../../obj/shop.tx" x="256" y="272">
   <properties>
-    <property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="cardPackShop,ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
    <property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG,Gods"/>
    <property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,PhyrexianColorless,Giant,Spiders,Shapeshifter"/>
    <property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
@@ -104,7 +104,7 @@
  </object>
  <object id="58" template="../../obj/shop.tx" x="97" y="209">
   <properties>
-    <property name="commonShopList" value="Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
    <property name="mythicShopList" value="Assassin,Squirrel,Dragon,Vampire,Minotaur,Dwarf,Devil,Soldier,Demon,Druid,Bird,Wolf,Knight,Skeleton,Shaman,Wizard,Pirate,Rogue,Dinosaur,Ogre,Planeswalker,Legend,WUBRG"/>
    <property name="rareShopList" value="Human,Zombie,Goblin,Elf,Merfolk,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,PhyrexianColorless"/>
    <property name="uncommonShopList" value="Land,Vehicle,Equip,Wand,Artifact,Multicolor,Golem,Colorless,Enchantment,Instant"/>
--- a/forge-gui/res/adventure/common/maps/tileset/buildings.atlas
+++ b/forge-gui/res/adventure/common/maps/tileset/buildings.atlas
@@ -141,6 +141,27 @@ UBShop
 NobleShop
  xy: 320, 944
  size: 16, 16
+CarShop
+  xy: 384,944
+  size:16, 16
+CarShopW
+  xy: 288,960
+  size:16,16
+CarShopU
+  xy: 304,960
+  size:16,16
+CarShopB
+  xy: 320,960
+  size:16,16
+CarShopR
+  xy: 336,960
+  size:16,16
+CarShopG
+  xy: 352,960
+  size:16,16
+CarShopC
+  xy: 368,960
+  size:16,16
 MerfolkShop
  xy: 368, 768
  size: 16, 16
--- a/forge-gui/res/adventure/common/maps/tileset/buildings.png
+++ b/forge-gui/res/adventure/common/maps/tileset/buildings.png
--- a/forge-gui/res/adventure/common/maps/tileset/buildings1.png
+++ b/forge-gui/res/adventure/common/maps/tileset/buildings1.png
--- a/forge-gui/res/adventure/common/maps/tileset/buildings2.png
+++ b/forge-gui/res/adventure/common/maps/tileset/buildings2.png
--- a/forge-gui/src/main/java/forge/util/ImageFetcher.java
+++ b/forge-gui/src/main/java/forge/util/ImageFetcher.java
@@ -93,7 +93,22 @@ public abstract class ImageFetcher {
        // Fake card (like the ante prompt) trying to be "fetched"
        if (imageKey.length() < 2)
            return;
+        if (imageKey.startsWith(ImageKeys.BOOSTER_PREFIX))
+        {
+            final ArrayList<String> downloadUrls = new ArrayList<>();
+            final String filename = imageKey.substring(ImageKeys.BOOSTER_PREFIX.length());
+            downloadUrls.add("https://downloads.cardforge.org/images/products/boosters/"+ filename);
+            System.out.println("Fetching from "+downloadUrls);

+
+            FileUtil.ensureDirectoryExists(ForgeConstants.CACHE_BOOSTER_PICS_DIR);
+            File destFile = new File(ForgeConstants.CACHE_BOOSTER_PICS_DIR, filename);
+            System.out.println("Destination File "+ destFile.getAbsolutePath()+" exists: " + destFile.exists());
+            if(destFile.exists())
+                return;
+            setupObserver(destFile.getAbsolutePath(),callback,downloadUrls);
+            return;
+        }
        if (imageKey.equalsIgnoreCase("t:null"))
            return;