From 0d952a54bdd76bb2fe41c7b629c98ac37f6e46e4 Mon Sep 17 00:00:00 2001
From: Heitor Bittencourt <heitorbite@outlook.com>
Date: Mon, 17 Mar 2025 11:06:58 -0300
Subject: [PATCH] feat/adventure: 4 new booster packs,spawn rate changed,
 removed colorless packs

---
 .../src/forge/adventure/data/RewardData.java  | 13 ++++-
 .../res/adventure/Shandalar/world/shops.json  | 57 ++++++++++++++++++-
 .../maps/map/main_story/forest_capital.tmx    | 20 +++----
 .../maps/map/main_story/island_capital.tmx    | 20 +++----
 .../maps/map/main_story/mountain_capital.tmx  | 20 +++----
 .../maps/map/main_story/plains_capital.tmx    | 20 +++----
 .../maps/map/main_story/swamp_capital.tmx     | 20 +++----
 .../common/maps/map/towns/forest_town.tmx     | 12 ++--
 .../maps/map/towns/forest_town_generic.tmx    | 16 +++---
 .../maps/map/towns/forest_town_identity.tmx   | 14 ++---
 .../maps/map/towns/forest_town_tribal.tmx     | 16 +++---
 .../common/maps/map/towns/island_town.tmx     | 12 ++--
 .../maps/map/towns/island_town_generic.tmx    | 16 +++---
 .../maps/map/towns/island_town_identity.tmx   | 14 ++---
 .../maps/map/towns/island_town_tribal.tmx     | 16 +++---
 .../common/maps/map/towns/mountain_town.tmx   | 12 ++--
 .../maps/map/towns/mountain_town_generic.tmx  | 16 +++---
 .../maps/map/towns/mountain_town_identity.tmx | 14 ++---
 .../maps/map/towns/mountain_town_tribal.tmx   | 17 +++---
 .../common/maps/map/towns/plains_town.tmx     | 16 +++---
 .../maps/map/towns/plains_town_generic.tmx    | 16 +++---
 .../maps/map/towns/plains_town_identity.tmx   | 16 +++---
 .../maps/map/towns/plains_town_tribal.tmx     | 19 +++----
 .../common/maps/map/towns/swamp_town.tmx      | 12 ++--
 .../maps/map/towns/swamp_town_generic.tmx     | 16 +++---
 .../maps/map/towns/swamp_town_identity.tmx    | 14 ++---
 .../maps/map/towns/swamp_town_tribal.tmx      | 16 +++---
 .../common/maps/map/towns/waste_town.tmx      | 18 +++---
 .../maps/map/towns/waste_town_generic.tmx     | 16 +++---
 .../maps/map/towns/waste_town_identity.tmx    | 20 +++----
 .../maps/map/towns/waste_town_tribal.tmx      | 19 ++++---
 31 files changed, 303 insertions(+), 240 deletions(-)

diff --git a/forge-gui-mobile/src/forge/adventure/data/RewardData.java b/forge-gui-mobile/src/forge/adventure/data/RewardData.java
index 350d20095c8..0f14a80411d 100644
--- a/forge-gui-mobile/src/forge/adventure/data/RewardData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/RewardData.java
@@ -36,6 +36,8 @@ public class RewardData implements Serializable {
     public String[] itemNames;
     public String[] editions;
     public String[] colors;
+    public int startDate;
+    public int endDate;
     public String[] rarity;
     public String[] subTypes;
     public String[] cardTypes;
@@ -65,6 +67,8 @@ public class RewardData implements Serializable {
         addMaxCount =rewardData.addMaxCount;
         cardName    =rewardData.cardName;
         itemName    =rewardData.itemName;
+        startDate   =rewardData.startDate;
+        endDate     =rewardData.endDate;
         itemNames    =rewardData.itemNames==null?null:rewardData.itemNames.clone();
         editions    =rewardData.editions==null?null:rewardData.editions.clone();
         colors      =rewardData.colors==null?null:rewardData.colors.clone();
@@ -102,7 +106,7 @@ public class RewardData implements Serializable {
             if(input == null)
                 return false;
             if (Iterables.contains(input.getRules().getMainPart().getKeywords(), "Remove CARDNAME from your deck before playing if you're not playing for ante."))
-               return false;
+                return false;
             if(input.getRules().getAiHints().getRemNonCommanderDecks())
                 return false;
             if(configData.allowedEditions != null) {
@@ -238,11 +242,14 @@ public class RewardData implements Serializable {
                         {
                             allEditions.removeIf(
                                     cardEdition -> cardEdition.getAllCardsInSet().stream().anyMatch(
-                                    o -> o.name.equals(restrictedCard))
+                                            o -> o.name.equals(restrictedCard))
                             );
                         }
+
+                        endDate = endDate == 0 ? 9999 : endDate;
+                        allEditions.removeIf(q -> q.getDate().getYear()+1900 < startDate || q.getDate().getYear()+1900 > endDate);
                         for(int i=0;i<count+addedCount;i++) {
-                            ret.add(new Reward(AdventureEventController.instance().generateBooster(Aggregates.random(allEditions).getCode())));
+                            ret.add(new Reward(AdventureEventController.instance().generateBooster(allEditions.get(WorldSave.getCurrentSave().getWorld().getRandom().nextInt(allEditions.size())).getCode())));
                         }
                     }
                     else
diff --git a/forge-gui/res/adventure/Shandalar/world/shops.json b/forge-gui/res/adventure/Shandalar/world/shops.json
index 86d64fbd429..1bfc0ee3d70 100644
--- a/forge-gui/res/adventure/Shandalar/world/shops.json
+++ b/forge-gui/res/adventure/Shandalar/world/shops.json
@@ -5610,5 +5610,60 @@
         "type": "cardPackShop",
         "count": 4
       }]
+  },
+  {
+    "name": "AlphaBoosterPackShop",
+    "description":"Ancient Archives",
+    "spriteAtlas":"maps/tileset/buildings.atlas",
+    "sprite": "CarShop",
+    "overlaySprite":"Overlay2White",
+    "rewards": [
+      {
+        "type": "cardPackShop",
+        "count": 8,
+        "startDate": 1994,
+        "endDate": 2004
+      }]
+  },
+  {
+    "name": "BetaBoosterPackShop",
+    "description":"The Planar Cache",
+    "spriteAtlas":"maps/tileset/buildings.atlas",
+    "sprite": "CarShop",
+    "overlaySprite":"Overlay4White",
+    "rewards": [
+      {
+        "type": "cardPackShop",
+        "count": 8,
+        "startDate": 2005,
+        "endDate": 2013
+      }]
+  },
+  {
+    "name": "GammaBoosterPackShop",
+    "description":"Ravnica Restocked",
+    "spriteAtlas":"maps/tileset/buildings.atlas",
+    "sprite": "CarShop",
+    "overlaySprite":"Overlay6White",
+    "rewards": [
+      {
+        "type": "cardPackShop",
+        "count": 8,
+        "startDate": 2014,
+        "endDate": 2020
+      }]
+  },
+  {
+    "name": "DeltaBoosterPackShop",
+    "description":"The Modern Vault",
+    "spriteAtlas":"maps/tileset/buildings.atlas",
+    "sprite": "CarShop",
+    "overlaySprite":"Overlay8White",
+    "rewards": [
+      {
+        "type": "cardPackShop",
+        "count": 8,
+        "startDate": 2021
+      }]
   }
-]   
+]
diff --git 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
index ddbafda13be..5df4906b875 100644
--- 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="GreenBoosterPackShop,BoosterPackShop,Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="GreenBoosterPackShop,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,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,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,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,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,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,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,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,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,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,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,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,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,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,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,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,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,GreenBoosterPackShop,BoosterPackShop,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
+    <property name="commonShopList" value="Enchantment6Green,Creature6Green,GreenBoosterPackShop,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"/>
diff --git 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
index eafa323d078..8b89ecf9dc7 100644
--- 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,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,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,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,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,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,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,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,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,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,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,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,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,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,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,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,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,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,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,BlueBoosterPackShop,BoosterPackShop,Instant6Blue,Merfolk,Wizard"/>
+    <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,BlueBoosterPackShop,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"/>
diff --git 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
index 25e8e297476..ea59f1630c1 100644
--- 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,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,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,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,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,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,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,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,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,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,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,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,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,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,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,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,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,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,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,RedBoosterPackShop,BoosterPackShop,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
+    <property name="commonShopList" value="Enchantment6Red,Creature6Red,RedBoosterPackShop,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"/>
diff --git 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
index 3f37a23d04f..27700a37978 100644
--- 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,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,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,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,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,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,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,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,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,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,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,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,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,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,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,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White,SmallCats,"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,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,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,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,WhiteBoosterPackShop,BoosterPackShop,Instant6White,Angel,Human4White,Soldier4White"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,WhiteBoosterPackShop,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"/>
diff --git 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
index 36ff4478d1d..0366e4b2ca5 100644
--- 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,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,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,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,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,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,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,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,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,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,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,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,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,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,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,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,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,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,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,BlackBoosterPackShop,BoosterPackShop,Instant6Black,Vampire,Zombie,Skeleton,Demon,Spiders"/>
+    <property name="commonShopList" value="Enchantment6Black,Creature6Black,BlackBoosterPackShop,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"/>
diff --git a/forge-gui/res/adventure/common/maps/map/towns/forest_town.tmx b/forge-gui/res/adventure/common/maps/map/towns/forest_town.tmx
index 6c433602229..ac8e87e54eb 100644
--- 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,GreenBoosterPackShop,BoosterPackShop,Green,Gruul,Selesnya,Golgari,Simic,Elf"/>
+    <property name="shopList" value="Instant,Creature,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,GreenBoosterPackShop,BoosterPackShop,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
+    <property name="shopList" value="Instant,Creature,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,GreenBoosterPackShop,BoosterPackShop,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
+    <property name="shopList" value="Instant,Creature,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,GreenBoosterPackShop,BoosterPackShop,Green,Gruul,Selesnya,Golgari,Simic,Elf"/>
+    <property name="shopList" value="Instant,Creature,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,GreenBoosterPackShop,BoosterPackShop,Green,Gruul,Selesnya,Golgari,Simic,Elf "/>
+    <property name="shopList" value="Instant,Creature,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,GreenBoosterPackShop,BoosterPackShop,Green,Gruul,Selesnya,Golgari,Simic,Elf"/>
+    <property name="shopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,GreenBoosterPackShop,Instant,Creature,Green,Gruul,Selesnya,Golgari,Simic,Elf"/>
    </properties>
   </object>
   <object id="47" template="../../obj/inn.tx" x="137" y="162"/>
diff --git 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
index c22c5691593..29a9eb2af59 100644
--- 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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,GreenBoosterPackShop,Green,Green,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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,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"/>
diff --git 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
index 794d1371420..412e7eade9c 100644
--- 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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,GreenBoosterPackShop,Green,Green,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,GreenBoosterPackShop,BoosterPackShop,Enchantment4Green,Creature2Green,Instant4Green"/>
+    <property name="commonShopList" value="Green,Green,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"/>
diff --git 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
index ec1ea2fb704..9bf4384ff7e 100644
--- 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,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,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,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,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,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,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,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,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,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,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,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,GreenBoosterPackShop,Elf,Wolf,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,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,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,GreenBoosterPackShop,BoosterPackShop,Druid,Squirrel,Sliver2Green,Wolf4Green"/>
+    <property name="commonShopList" value="Elf,Wolf,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"/>
diff --git a/forge-gui/res/adventure/common/maps/map/towns/island_town.tmx b/forge-gui/res/adventure/common/maps/map/towns/island_town.tmx
index bc7a34478ed..717949a067f 100644
--- 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,BlueBoosterPackShop,BoosterPackShop,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
+    <property name="shopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,BlueBoosterPackShop,Instant,Creature,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,BlueBoosterPackShop,BoosterPackShop,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
+    <property name="shopList" value="Instant,Creature,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,BlueBoosterPackShop,BoosterPackShop,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
+    <property name="shopList" value="Instant,Creature,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,BlueBoosterPackShop,BoosterPackShop,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
+    <property name="shopList" value="Instant,Creature,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,BlueBoosterPackShop,BoosterPackShop,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
+    <property name="shopList" value="Instant,Creature,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,BlueBoosterPackShop,BoosterPackShop,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
+    <property name="shopList" value="Instant,Creature,Blue,Azorius,Dimir,Izzet,Simic,Merfolk "/>
    </properties>
   </object>
   <object id="47" template="../../obj/inn.tx" x="215" y="82"/>
diff --git 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
index b4adcf3bf03..2c01d6c4598 100644
--- 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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,BlueBoosterPackShop,Blue,Blue,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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,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"/>
diff --git 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
index b5ba5fafc62..73db45f5119 100644
--- 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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="Blue,Blue,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,BlueBoosterPackShop,BoosterPackShop,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,BlueBoosterPackShop,Blue,Blue,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"/>
diff --git 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
index 49b26437dd7..0eaabd30f6e 100644
--- 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,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="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    <property name="commonShopList" value="Merfolk,Wizard,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"/>
@@ -42,7 +42,7 @@
   </object>
   <object id="42" template="../../obj/shop.tx" x="368" y="162">
    <properties>
-    <property name="commonShopList" value="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    <property name="commonShopList" value="Merfolk,Wizard,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"/>
@@ -51,7 +51,7 @@
   </object>
   <object id="43" template="../../obj/shop.tx" x="353" y="98">
    <properties>
-    <property name="commonShopList" value="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    <property name="commonShopList" value="Merfolk,Wizard,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"/>
@@ -60,7 +60,7 @@
   </object>
   <object id="44" template="../../obj/shop.tx" x="208" y="162">
    <properties>
-    <property name="commonShopList" value="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    <property name="commonShopList" value="Merfolk,Wizard,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"/>
@@ -69,7 +69,7 @@
   </object>
   <object id="45" template="../../obj/shop.tx" x="304" y="162">
    <properties>
-    <property name="commonShopList" value="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    <property name="commonShopList" value="Merfolk,Wizard,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"/>
@@ -78,7 +78,7 @@
   </object>
   <object id="46" template="../../obj/shop.tx" x="336" y="162">
    <properties>
-    <property name="commonShopList" value="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    <property name="commonShopList" value="Merfolk,Wizard,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"/>
@@ -100,7 +100,7 @@
   <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,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,BlueBoosterPackShop,Merfolk,Wizard,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"/>
@@ -109,7 +109,7 @@
   </object>
   <object id="56" template="../../obj/shop.tx" x="256" y="66">
    <properties>
-    <property name="commonShopList" value="Merfolk,Wizard,BlueBoosterPackShop,BoosterPackShop,Bird4Blue,Sliver2Blue,
+    <property name="commonShopList" value="Merfolk,Wizard,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"/>
diff --git a/forge-gui/res/adventure/common/maps/map/towns/mountain_town.tmx b/forge-gui/res/adventure/common/maps/map/towns/mountain_town.tmx
index 74ae6986b1a..7511f26f0f3 100644
--- 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,RedBoosterPackShop,BoosterPackShop,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
+    <property name="shopList" value="Instant,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,RedBoosterPackShop,BoosterPackShop,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
+    <property name="shopList" value="Instant,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,RedBoosterPackShop,BoosterPackShop,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
+    <property name="shopList" value="Instant,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,RedBoosterPackShop,BoosterPackShop,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
+    <property name="shopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,RedBoosterPackShop,Instant,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,RedBoosterPackShop,BoosterPackShop,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
+    <property name="shopList" value="Instant,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,RedBoosterPackShop,BoosterPackShop,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
+    <property name="shopList" value="Instant,Creature,Red,Rakdos,Gruul,Izzet,Boros,Goblin "/>
    </properties>
   </object>
   <object id="47" template="../../obj/inn.tx" x="214" y="114"/>
diff --git 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
index 44bd0afb270..b8f0f4c1877 100644
--- 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,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,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,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,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,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,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,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,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,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,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,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,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,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,RedBoosterPackShop,Red,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,RedBoosterPackShop,BoosterPackShop,Red,Enchantment4Red,Creature2Red,Instant4Red,Goblin"/>
+    <property name="commonShopList" value="Red,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"/>
diff --git 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
index 15f7d856c89..edc0710e62c 100644
--- 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="RedBoosterPackShop,BoosterPackShop,Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="commonShopList" value="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="RedBoosterPackShop,BoosterPackShop,Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="commonShopList" value="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="RedBoosterPackShop,BoosterPackShop,Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="commonShopList" value="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="RedBoosterPackShop,BoosterPackShop,Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,RedBoosterPackShop,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="RedBoosterPackShop,BoosterPackShop,Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="commonShopList" value="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="RedBoosterPackShop,BoosterPackShop,Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="commonShopList" value="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="RedBoosterPackShop,BoosterPackShop,Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="commonShopList" value="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"/>
diff --git 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
index a43b2f50df2..e93a55e46df 100644
--- 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,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="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    <property name="commonShopList" value="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"/>
@@ -42,7 +42,7 @@
   </object>
   <object id="42" template="../../obj/shop.tx" x="113" y="115">
    <properties>
-    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    <property name="commonShopList" value="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"/>
@@ -51,7 +51,7 @@
   </object>
   <object id="43" template="../../obj/shop.tx" x="161" y="163">
    <properties>
-    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    <property name="commonShopList" value="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"/>
@@ -60,7 +60,7 @@
   </object>
   <object id="44" template="../../obj/shop.tx" x="257" y="162">
    <properties>
-    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    <property name="commonShopList" value="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"/>
@@ -69,7 +69,7 @@
   </object>
   <object id="45" template="../../obj/shop.tx" x="304" y="162">
    <properties>
-    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    <property name="commonShopList" value="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"/>
@@ -78,7 +78,7 @@
   </object>
   <object id="46" template="../../obj/shop.tx" x="367" y="162">
    <properties>
-    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    <property name="commonShopList" value="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"/>
@@ -105,7 +105,7 @@
   </object>
   <object id="52" template="../../obj/shop.tx" x="304" y="97">
    <properties>
-    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    <property name="commonShopList" value="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"/>
@@ -114,7 +114,8 @@
   </object>
   <object id="53" template="../../obj/shop.tx" x="240" y="97">
    <properties>
-    <property name="commonShopList" value="RedBoosterPackShop,BoosterPackShop,Wolf4Red,Goblin,Devil,Dwarf,Dragon,
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,
+    GammaBoosterPackShop,DeltaBoosterPackShop,RedBoosterPackShop,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"/>
diff --git a/forge-gui/res/adventure/common/maps/map/towns/plains_town.tmx b/forge-gui/res/adventure/common/maps/map/towns/plains_town.tmx
index 5bcda622c41..5fdc306e0e4 100644
--- 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="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="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="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="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="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="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="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="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="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="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="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="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="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,WhiteBoosterPackShop,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="WhiteBoosterPackShop,BoosterPackShop,Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
    </properties>
   </object>
   <object id="53" template="../../obj/spellsmith.tx" x="157" y="225"/>
diff --git 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
index 1864f1d9550..4c2c09ade38 100644
--- 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="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="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="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="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <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="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="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <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="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="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <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="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="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,WhiteBoosterPackShop,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="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <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="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
diff --git 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
index 543a32fbccb..fffdade7685 100644
--- 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="61">
+<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="62">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -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="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="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="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="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="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="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="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="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="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="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="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,WhiteBoosterPackShop,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="WhiteBoosterPackShop,BoosterPackShop,White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="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"/>
diff --git 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
index b764f604f92..0036ba48cc1 100644
--- 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="60">
+<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="62">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -33,8 +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="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,
-    Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="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"/>
@@ -42,7 +41,7 @@
   </object>
   <object id="56" template="../../obj/shop.tx" x="208" y="144">
    <properties>
-    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="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"/>
@@ -50,7 +49,7 @@
   </object>
   <object id="57" template="../../obj/shop.tx" x="240" y="144">
    <properties>
-    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="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"/>
@@ -58,7 +57,7 @@
   </object>
   <object id="43" template="../../obj/shop.tx" x="352" y="306">
    <properties>
-    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="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"/>
@@ -75,7 +74,7 @@
   </object>
   <object id="49" template="../../obj/shop.tx" x="304" y="306">
    <properties>
-    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="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"/>
@@ -83,7 +82,7 @@
   </object>
   <object id="50" template="../../obj/shop.tx" x="256" y="306">
    <properties>
-    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="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"/>
@@ -91,7 +90,7 @@
   </object>
   <object id="51" template="../../obj/shop.tx" x="192" y="306">
    <properties>
-    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,WhiteBoosterPackShop,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"/>
@@ -99,7 +98,7 @@
   </object>
   <object id="52" template="../../obj/shop.tx" x="144" y="306">
    <properties>
-    <property name="commonShopList" value="WhiteBoosterPackShop,BoosterPackShop,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White"/>
+    <property name="commonShopList" value="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"/>
diff --git a/forge-gui/res/adventure/common/maps/map/towns/swamp_town.tmx b/forge-gui/res/adventure/common/maps/map/towns/swamp_town.tmx
index 22adf5631a3..f16b37d15e2 100644
--- 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,32 +32,32 @@
   <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="BlackBoosterPackShop,BoosterPackShop,Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
+    <property name="shopList" value="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="BlackBoosterPackShop,BoosterPackShop,Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
+    <property name="shopList" value="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="BlackBoosterPackShop,BoosterPackShop,Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
+    <property name="shopList" value="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="BlackBoosterPackShop,BoosterPackShop,Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
+    <property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
    </properties>
   </object>
   <object id="45" template="../../obj/shop.tx" x="273" y="130">
    <properties>
-    <property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
+    <property name="shopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,BlackBoosterPackShop,Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
    </properties>
   </object>
   <object id="46" template="../../obj/shop.tx" x="337" y="177">
    <properties>
-    <property name="shopList" value="BlackBoosterPackShop,BoosterPackShop,Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
+    <property name="shopList" value="Instant,Creature,Black,Dimir,Rakdos,Orzhov,Golgari,Zombie,Horror"/>
    </properties>
   </object>
   <object id="47" template="../../obj/inn.tx" x="230" y="98"/>
diff --git 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
index 40cbd22cf00..8943cf89e6b 100644
--- 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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,BlackBoosterPackShop,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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="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"/>
diff --git 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
index f0473389ffa..371bcdb1b9c 100644
--- 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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="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="BlackBoosterPackShop,BoosterPackShop,Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="commonShopList" value="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"/>
diff --git 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
index c638bfe52a6..88c8f0b81b9 100644
--- 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,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="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,BlackBoosterPackShop,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"/>
@@ -42,7 +42,7 @@
   </object>
   <object id="42" template="../../obj/shop.tx" x="177" y="145">
    <properties>
-    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="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"/>
@@ -50,7 +50,7 @@
   </object>
   <object id="43" template="../../obj/shop.tx" x="321" y="129">
    <properties>
-    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="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"/>
@@ -58,7 +58,7 @@
   </object>
   <object id="44" template="../../obj/shop.tx" x="114" y="194">
    <properties>
-    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="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"/>
@@ -66,7 +66,7 @@
   </object>
   <object id="45" template="../../obj/shop.tx" x="273" y="130">
    <properties>
-    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="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"/>
@@ -74,7 +74,7 @@
   </object>
   <object id="46" template="../../obj/shop.tx" x="337" y="177">
    <properties>
-    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="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"/>
@@ -95,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="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="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"/>
@@ -104,7 +104,7 @@
   </object>
   <object id="52" template="../../obj/shop.tx" x="201" y="88">
    <properties>
-    <property name="commonShopList" value="BlackBoosterPackShop,BoosterPackShop,Vampire,Zombie,Skeleton,Demon,Knight4Black,Rogue4Black,Sliver2Black"/>
+    <property name="commonShopList" value="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"/>
diff --git a/forge-gui/res/adventure/common/maps/map/towns/waste_town.tmx b/forge-gui/res/adventure/common/maps/map/towns/waste_town.tmx
index de84487811c..cce1547831c 100644
--- 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,44 +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="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,
+    <property name="shopList" value=" 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="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Golem,Sliver"/>
+    <property name="shopList" value=" 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="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Golem,Sliver"/>
+    <property name="shopList" value=" 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="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+    <property name="shopList" value=" 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="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+    <property name="shopList" value=" 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="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+    <property name="shopList" value=" 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="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+    <property name="shopList" value=" 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="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+    <property name="shopList" value=" 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"/>
@@ -80,7 +80,7 @@
   </object>
   <object id="58" template="../../obj/shop.tx" x="97" y="209">
    <properties>
-    <property name="shopList" value="ColorlessBoosterPackShop, BoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+    <property name="shopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
    </properties>
   </object>
  </objectgroup>
diff --git 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
index b1d46cc2ef7..1f207e37af7 100644
--- 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="ColorlessBoosterPackShop,Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
+    <property name="uncommonShopList" value="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="ColorlessBoosterPackShop,Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
+    <property name="uncommonShopList" value="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="ColorlessBoosterPackShop,Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
+    <property name="uncommonShopList" value="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="ColorlessBoosterPackShop,Artifact,Land,Assembly,Golem,Sliver,Wall,Equip,Enchantment,Instant,Creature,Battle"/>
+    <property name="uncommonShopList" value="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="ColorlessBoosterPackShop,Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
+    <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"/>
@@ -81,7 +81,7 @@
   </object>
   <object id="53" template="../../obj/shop.tx" x="304" y="272">
    <properties>
-    <property name="commonShopList" value="ColorlessBoosterPackShop,Colorless,Colorless,Artifact,Creature2Colorless,
+    <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"/>
@@ -90,7 +90,7 @@
   </object>
   <object id="54" template="../../obj/shop.tx" x="256" y="272">
    <properties>
-    <property name="commonShopList" value="ColorlessBoosterPackShop,Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
+    <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"/>
@@ -105,7 +105,7 @@
   </object>
   <object id="58" template="../../obj/shop.tx" x="97" y="209">
    <properties>
-    <property name="commonShopList" value="ColorlessBoosterPackShop,Colorless,Colorless,Artifact,Creature2Colorless,Wand,Enchantment,Instant,Creature"/>
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,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"/>
diff --git 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
index 92c971d4eab..e1e2af77f06 100644
--- 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="ColorlessBoosterPackShop,Colorless,Colorless,Artifact,Creature2Colorless,Vehicle,Equip,Wand"/>
+    <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"/>
@@ -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="ColorlessBoosterPackShop,Land,Enchantment,Instant,Creature"/>
+    <property name="uncommonShopList" value="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="ColorlessBoosterPackShop,Land,Enchantment,Instant,Creature"/>
+    <property name="uncommonShopList" value="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="ColorlessBoosterPackShop,Land,Enchantment,Instant,Creature"/>
+    <property name="uncommonShopList" value="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="ColorlessBoosterPackShop,Land,Enchantment,Instant,Creature"/>
+    <property name="uncommonShopList" value="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="ColorlessBoosterPackShop,Land,Enchantment,Instant,Creature"/>
+    <property name="uncommonShopList" value="Land,Enchantment,Instant,Creature"/>
    </properties>
   </object>
   <object id="47" template="../../obj/inn.tx" x="150" y="273"/>
@@ -104,10 +104,10 @@
   </object>
   <object id="58" template="../../obj/shop.tx" x="97" y="209">
    <properties>
-    <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="ColorlessBoosterPackShop,Land,Enchantment,Instant,Creature"/>
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,GammaBoosterPackShop,DeltaBoosterPackShop,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"/>
    </properties>
   </object>
   <object id="61" template="../../obj/shardtrader.tx" x="400" y="288"/>
diff --git 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
index 79bdbb6e7d1..3bb94579d26 100644
--- 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="ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="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="cardPackShop,ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="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="cardPackShop,ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="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="cardPackShop,ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="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="cardPackShop,ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="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="cardPackShop,ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="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="cardPackShop,ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="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="cardPackShop,ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="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,8 @@
   </object>
   <object id="58" template="../../obj/shop.tx" x="97" y="209">
    <properties>
-    <property name="commonShopList" value="ColorlessBoosterPackShop,Creature,Creature2Blue,Creature2Red,Creature2Black,Creature2White,Creature2Green,Creature2Colorless,Sliver,Wall,Assembly,Human"/>
+    <property name="commonShopList" value="BoosterPackShop,AlphaBoosterPackShop,BetaBoosterPackShop,
+    GammaBoosterPackShop,DeltaBoosterPackShop,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"/>