Addition of rotating mechanic based shops in color Identity towns and capitals.

forge-core/src/main/java/forge/card/DeckHints.java

@@ -42,7 +42,7 @@ public class DeckHints {
     }
 
     private boolean valid = false;
-    private List<Pair<Type, String>> filters = null;
+    public List<Pair<Type, String>> filters = null;
 
     /**
      * Construct a DeckHints from the SVar string.

forge-gui-mobile/src/forge/adventure/data/RewardData.java

@@ -45,6 +45,8 @@ public class RewardData {
     public boolean matchAllSubTypes;
     public boolean matchAllColors;
     public RewardData[] cardUnion;
+    public String[] deckNeeds;
+    public RewardData[] rotation;
 
     public RewardData() { }
 
@@ -69,6 +71,8 @@ public class RewardData {
         matchAllSubTypes    =rewardData.matchAllSubTypes;
         matchAllColors =rewardData.matchAllColors;
         cardUnion         =rewardData.cardUnion==null?null:rewardData.cardUnion.clone();
+        rotation          =rewardData.rotation==null?null:rewardData.rotation.clone();
+        deckNeeds         =rewardData.deckNeeds==null?null:rewardData.deckNeeds.clone();
     }
 
     private static Iterable<PaperCard> allCards;
@@ -131,8 +135,10 @@ public class RewardData {
                     }
                     ArrayList<PaperCard> finalPool = new ArrayList(pool);
 
-                    for(int i = 0; i < count; i++) {
+                    if (finalPool.size() > 0){
-                        ret.add(new Reward(finalPool.get(WorldSave.getCurrentSave().getWorld().getRandom().nextInt(finalPool.size()))));
+                        for (int i = 0; i < count; i++) {
+                            ret.add(new Reward(finalPool.get(WorldSave.getCurrentSave().getWorld().getRandom().nextInt(finalPool.size()))));
+                        }
                     }
                     break;
                 case "card":

forge-gui-mobile/src/forge/adventure/pointofintrest/PointOfInterestChanges.java

@@ -107,6 +107,13 @@ public class PointOfInterestChanges implements SaveFileContent  {
         cardsBought.put(objectID, new HashSet<>()); //Allows cards to appear in slots of previous purchases
     }
 
+    public void setRotatingShopSeed(int objectID, long seed){
+        if (shopSeeds.containsKey(objectID) && shopSeeds.get(objectID) != seed) {
+            cardsBought.put(objectID, new HashSet<>()); //Allows cards to appear in slots of previous purchases
+        }
+        shopSeeds.put(objectID, seed);
+    }
+
     public float getShopPriceModifier(int objectID){
         if (!shopModifiers.containsKey(objectID))
         {

forge-gui-mobile/src/forge/adventure/scene/RewardScene.java

@@ -231,12 +231,16 @@ public class RewardScene extends UIScene {
     }
 
     void updateRestockButton(){
+        if (!shopActor.canRestock())
+            return;
         int price = shopActor.getRestockPrice();
         restockButton.setText("Refresh\n " + price + "[+shards]");
         restockButton.setDisabled(WorldSave.getCurrentSave().getPlayer().getShards() < price);
     }
 
     void restockShop(){
+        if (!shopActor.canRestock())
+            return;
         int price = shopActor.getRestockPrice();
         if(changes!=null)
             changes.generateNewShopSeed(shopActor.getObjectId());
@@ -329,6 +333,10 @@ public class RewardScene extends UIScene {
                 if (shopActor.canRestock()) {
                     restockButton.setVisible(true);
                 }
+                else{
+                    restockButton.setVisible(false);
+                    restockButton.setDisabled(true);
+                }
                 break;
             case Loot:
                 shopNameLabel.setVisible(false);

forge-gui-mobile/src/forge/adventure/scene/ShardTraderScene.java

@@ -15,7 +15,7 @@ public class ShardTraderScene extends UIScene {
     private static ShardTraderScene object;
 
     public static final String spriteAtlas = "maps/tileset/buildings.atlas";
-    public static final String sprite = "shard_trader";
+    public static final String sprite = "ShardTrader";
 
     public static ShardTraderScene instance() {
         if(object==null)

forge-gui-mobile/src/forge/adventure/stage/MapStage.java

@@ -46,6 +46,7 @@ import forge.sound.SoundEffectType;
 import forge.sound.SoundSystem;
 
 import java.util.Map;
+import java.util.Random;
 
 
 /**
@@ -392,6 +393,8 @@ public class MapStage extends GameStage {
                     continue;
                 boolean hidden = !obj.isVisible(); //Check if the object is invisible.
 
+                String rotatingShop = "";
+
                 switch (type) {
                     case "entry":
                         float x = Float.parseFloat(prop.get("x").toString());
@@ -536,35 +539,70 @@ public class MapStage extends GameStage {
                             addMapActor(obj, dialog);
                         }
                         break;
-                    case "shop":
-                        String shopList = "";
-                        int restockPrice = 0;
 
-                        int rarity = WorldSave.getCurrentSave().getWorld().getRandom().nextInt(100);
+                    case "Rotating":
-                        if (rarity > 95 & prop.containsKey("mythicShopList")) {
+                        String rotation = "";
-                            shopList = prop.get("mythicShopList").toString();
+                        if (prop.containsKey("rotation")) {
-                            restockPrice = 5;
+                            rotation = prop.get("rotation").toString();
                         }
-                        if (shopList.isEmpty() && (rarity > 85 & prop.containsKey("rareShopList"))) {
+
-                            shopList = prop.get("rareShopList").toString();
+                        Array<String> possibleShops = new Array<>(rotation.split(","));
-                            restockPrice = 4;
+
+                        if (possibleShops.size > 0){
+                            long rotatingRandomSeed = WorldSave.getCurrentSave().getWorld().getRandom().nextLong() + java.time.LocalDate.now().plusDays(5).toEpochDay();
+                            Random rotatingShopRandom = new Random(rotatingRandomSeed);
+                            rotatingShop = possibleShops.get(rotatingShopRandom.nextInt(possibleShops.size));
+                            changes.setRotatingShopSeed(id, rotatingRandomSeed);
                         }
-                        if (shopList.isEmpty() && (rarity > 55 & prop.containsKey("uncommonShopList"))) {
+
-                            shopList = prop.get("uncommonShopList").toString();
+                    //Intentionally not breaking here.
-                            restockPrice = 3;
+                    //Flow continues into "shop" case with above data overriding base logic.
+
+                    case "shop":
+
+                        int restockPrice = 0;
+                        String shopList = "";
+
+                        boolean isRotatingShop = !rotatingShop.isEmpty();
+
+                        if (isRotatingShop){
+                            shopList = rotatingShop;
+                            restockPrice = 7;
                         }
-                        if (shopList.isEmpty() && prop.containsKey("commonShopList")) {
+                        else{
-                            shopList = prop.get("commonShopList").toString();
+                            int rarity = WorldSave.getCurrentSave().getWorld().getRandom().nextInt(100);
-                            restockPrice = 2;
+                            if (rarity > 95 & prop.containsKey("mythicShopList")) {
+                                shopList = prop.get("mythicShopList").toString();
+                                restockPrice = 5;
+                            }
+                            if (shopList.isEmpty() && (rarity > 85 & prop.containsKey("rareShopList"))) {
+                                shopList = prop.get("rareShopList").toString();
+                                restockPrice = 4;
+                            }
+                            if (shopList.isEmpty() && (rarity > 55 & prop.containsKey("uncommonShopList"))) {
+                                shopList = prop.get("uncommonShopList").toString();
+                                restockPrice = 3;
+                            }
+                            if (shopList.isEmpty() && prop.containsKey("commonShopList")) {
+                                shopList = prop.get("commonShopList").toString();
+                                restockPrice = 2;
+                            }
+                            if (shopList.trim().isEmpty() && prop.containsKey("shopList")) {
+                                shopList = prop.get("shopList").toString(); //removed but included to not break existing custom planes
+                                restockPrice = 0; //Tied to restock button
+                            }
+                            shopList = shopList.replaceAll("\\s", "");
+
                         }
-                        if (shopList.trim().isEmpty() && prop.containsKey("shopList")) {
+
-                            shopList = prop.get("shopList").toString(); //removed but included to not break existing custom planes
+                        if (prop.containsKey("noRestock") && (boolean)prop.get("noRestock")){
-                            restockPrice = 0; //Tied to restock button
+                            restockPrice = 0;
                         }
-                        shopList = shopList.replaceAll("\\s", "");
+
-                        Array<String> possibleShops = new Array<>(shopList.split(","));
+                        possibleShops = new Array<>(shopList.split(","));
                         Array<String> filteredPossibleShops = possibleShops;
-                        filteredPossibleShops.removeAll(shopsAlreadyPresent, false);
+                        if (!isRotatingShop)
+                            filteredPossibleShops.removeAll(shopsAlreadyPresent, false);
                         if (filteredPossibleShops.notEmpty()){
                             possibleShops = filteredPossibleShops;
                         }

forge-gui-mobile/src/forge/adventure/util/CardUtil.java

@@ -19,10 +19,7 @@ import forge.item.PaperCard;
 import forge.model.FModel;
 
 import java.io.File;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
 import java.util.regex.Pattern;
 
 import static forge.adventure.data.RewardData.generateAllCards;
@@ -52,6 +49,7 @@ public class CardUtil {
         private  int colors;
         private final ColorType colorType;
         private final boolean shouldBeEqual;
+        private final List<String> deckNeeds=new ArrayList<>();
 
         @Override
         public boolean apply(final PaperCard card) {
@@ -171,6 +169,28 @@ public class CardUtil {
                     return !this.shouldBeEqual;
             }
 
+            if(!this.deckNeeds.isEmpty())
+            {
+                boolean found = false;
+                for(String need:this.deckNeeds)
+                {
+                    //FormatExpected: X$Y, where X is DeckHints.Type and Y is a string descriptor
+                    String[] parts = need.split("\\$");
+
+                    if (parts.length != 2){
+                        continue;
+                    }
+                    DeckHints.Type t = DeckHints.Type.valueOf(parts[0].toUpperCase());
+
+                    DeckHints hints = card.getRules().getAiHints().getDeckHints();
+                    if (hints != null && hints.contains(t, parts[1])){
+                        found=true;
+                        break;
+                    }
+                }
+                if(!found)
+                    return !this.shouldBeEqual;
+            }
 
 
             return this.shouldBeEqual;
@@ -237,6 +257,9 @@ public class CardUtil {
             {
                 this.colorType=ColorType.Any;
             }
+            if(type.deckNeeds!=null&&type.deckNeeds.length!=0){
+                deckNeeds.addAll(Arrays.asList(type.deckNeeds));
+            }
         }
     }
 
@@ -244,6 +267,9 @@ public class CardUtil {
     {
         List<PaperCard> result = new ArrayList<>();
         CardPredicate pre = new CardPredicate(data, true);
+
+        java.util.Map<String, String> tempMap = new HashMap<>();
+
         for (final PaperCard item : cards)
         {
             if(pre.apply(item))

forge-gui/res/adventure/Shandalar/custom_cards/cursed_treasure.txt

@@ -0,0 +1,8 @@
+Name:Cursed Treasure
+ManaCost:no cost
+Types:Artifact
+S:Mode$ Continuous | Description$ Provided by Cursed Treasure (Equipped Item - Right)
+StackDescription$ Create a Treasure token. You lose 2 life. | SpellDescription$ Create a Treasure token. You lose 2 life.
+A:AB$ Token | Cost$ PayShards<1> Sac<1/CARDNAME> | TokenScript$ c_a_treasure_sac | SubAbility$ DBLoseLife2 | SpellDescription$ Create a Treasure token.
+SVar:DBLoseLife2:DB$ LoseLife | LifeAmount$ 2 | Defined$ You
+Oracle: Provided by Cursed Treasure. Pay {M}, sacrifice Cursed Treasure: Create a Treasure token. You lose 2 life.

forge-gui/res/adventure/Shandalar/custom_cards/farmers_tools.txt

@@ -0,0 +1,6 @@
+Name:Farmer's Tools
+ManaCost:no cost
+Types:Artifact
+S:Mode$ Continuous | Description$ Provided by Farmer's Tools (Equipped Item - Left)
+A:AB$ ChangeZone | Cost$ PayShards<2> Sac<1/CARDNAME> | ExileOnMoved$ Battlefield | Optional$ True | Origin$ Hand | Destination$ Battlefield | ChangeType$ Land | DefinedPlayer$ Player | ChangeNum$ 1 | StackDescription$  Each player may put a land card from their hand onto the battlefield.
+Oracle: Provided by Farmer's Tools. Pay {M}{M}, sacrifice Farmer's Tools: Starting with you, each player may place a land card from their hand onto the battlefield.

forge-gui/res/adventure/Shandalar/custom_cards/hill_giant_club.txt

@@ -0,0 +1,10 @@
+Name:Hill Giant Club
+ManaCost:no cost
+Types:Artifact
+S:Mode$ Continuous | Description$ Provided by Hill Giant Club (Equipped Item - Right)
+A:AB$ Effect | Cost$ PayShards<2> Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | ExileOnMoved$ Battlefield | StaticAbilities$ UnblockableLE2 | RememberObjects$ Targeted | StackDescription$ {c:Targeted} can't be blocked by creatures with power 2 or less this turn. | SpellDescription$ Targe creature can't be blocked by creatures with power 2 or less this turn.
+SVar:UnblockableLE2:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | ValidBlocker$ Creature.powerLE2 | Description$ {c:Targeted} can't be blocked by creatures with power 2 or less this turn.
+Oracle: Provided by Hill Giant Club. Pay {M}{M}, sacrifice Hill Giant Club: Target creature can't be blocked by creatures with power 2 or less this turn.
+
+
+

forge-gui/res/adventure/Shandalar/custom_cards/sleep_wand.txt

@@ -0,0 +1,6 @@
+Name:Sleep Wand
+ManaCost:no cost
+Types:Artifact
+S:Mode$ Continuous | Description$ Provided by Sleep Wand (Equipped Item - Left)
+A:AB$ PutCounter | Cost$ PayShards<2> Sac<1/CARDNAME> | ValidTgts$ Creature | ExileOnMoved$ Battlefield ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ Stun | CounterNum$ 1 | StackDescription$ Put a stun counter on target creature. (If a permanent with a stun counter would become untapped, remove one from it instead.)
+Oracle: Provided by Sleep Wand. Pay {M}, sacrifice Sleep Wand: Put a stun counter on target creature.

forge-gui/res/adventure/Shandalar/maps/map/forest_town_generic.tmx

@@ -82,6 +82,7 @@
   <object id="48" template="../obj/shop.tx" x="304" y="48">
    <properties>
     <property name="commonShopList" value="Forest"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="49" template="../obj/quest.tx" x="98" y="162">

forge-gui/res/adventure/Shandalar/maps/map/forest_town_identity.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="53">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="54">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -82,6 +82,7 @@
   <object id="48" template="../obj/shop.tx" x="304" y="48">
    <properties>
     <property name="commonShopList" value="Forest"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="49" template="../obj/quest.tx" x="98" y="162">
@@ -90,14 +91,6 @@
    </properties>
   </object>
   <object id="50" template="../obj/shardtrader.tx" x="98" y="98"/>
-  <object id="51" template="../obj/shop.tx" x="208" y="50">
-   <properties>
-    <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
-    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Green"/>
-    <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"/>
-   </properties>
-  </object>
   <object id="52" template="../obj/shop.tx" x="272" y="98">
    <properties>
     <property name="commonShopList" value="Green,Green,Enchantment4Green,Creature2Green,Instant4Green"/>
@@ -106,5 +99,10 @@
     <property name="uncommonShopList" value="Simic,Golgari,Gruul,Selesnya,Simic,Golgari,Gruul,Selesnya,Land"/>
    </properties>
   </object>
+  <object id="53" template="../obj/RotatingShop.tx" x="208" y="50">
+   <properties>
+    <property name="rotation" value="Green1,Green2,Green3,Green4,Green5,Green6"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>

forge-gui/res/adventure/Shandalar/maps/map/forest_town_tribal.tmx

@@ -82,6 +82,7 @@
   <object id="48" template="../obj/shop.tx" x="304" y="48">
    <properties>
     <property name="commonShopList" value="Forest"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="51" template="../obj/quest.tx" x="98" y="162">

forge-gui/res/adventure/Shandalar/maps/map/island_town_generic.tmx

@@ -82,6 +82,7 @@
   <object id="48" template="../obj/shop.tx" x="176" y="192">
    <properties>
     <property name="commonShopList" value="Island"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="50" template="../obj/quest.tx" x="176" y="162">

forge-gui/res/adventure/Shandalar/maps/map/island_town_identity.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="56">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="58">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -82,6 +82,7 @@
   <object id="48" template="../obj/shop.tx" x="176" y="192">
    <properties>
     <property name="commonShopList" value="Island"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="52" template="../obj/quest.tx" x="176" y="162">
@@ -98,12 +99,11 @@
     <property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
    </properties>
   </object>
-  <object id="55" template="../obj/shop.tx" x="168" y="82">
+  <object id="57" template="../obj/RotatingShop.tx" x="168" y="82">
    <properties>
-    <property name="commonShopList" value="Blue,Blue,Enchantment4Blue,Creature2Blue,Instant4Blue"/>
+    <property name="rotation" value="Blue1,Blue2,Blue3,Blue4,Blue5,Blue6"/>
-    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Blue"/>
+    <property name="signXOffset" type="float" value="-16"/>
-    <property name="rareShopList" value="RWU,RGU,UWG,RUB,UWB,UGB,Land4Blue,Creature6Blue"/>
+    <property name="signYOffset" type="float" value="-16"/>
-    <property name="uncommonShopList" value="Azorius,Izzet,Simic,Dimir,Azorius,Izzet,Simic,Dimir,Land"/>
    </properties>
   </object>
  </objectgroup>

forge-gui/res/adventure/Shandalar/maps/map/island_town_tribal.tmx

@@ -82,6 +82,7 @@
   <object id="48" template="../obj/shop.tx" x="176" y="192">
    <properties>
     <property name="commonShopList" value="Island"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="52" template="../obj/quest.tx" x="176" y="162">

forge-gui/res/adventure/Shandalar/maps/map/main_story/forest_capital.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="78">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="81">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -17,7 +17,7 @@
  </layer>
  <layer id="6" name="Ground2" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJzNmElOw0AQAOcEkRIUKywfSHAC5gY3+Ah3lnBn+wAETogHwBsA8QFIAgjEK3gBOxcQbcWjdIbu2eyEtNSSl/G43Nu0JywIEYGGoFXQYZDphCdKtAzaAm0PCV8TOCoJY8x2D7pZFGJrSHS72GWUPi0FQowPiU4EXTu2Fb4p0PN/0kmFD0uJuFdl4qORF+IA6WG+9/5+nn7OJBQDdc80fzPJpxaTV4Pgk+9YjfRzlgmeIzg/Tq6tKc/PzwmxMNd7rebIJ4h36kT9ngew56NHrXLhi32IGevIDpQN1O/BzFhm0bG0rRznwpeFYL6Kxfh+8FG2pPgoUWPbhU+Na1+hGO+YsYPw7wkk42nNPK4ffFd+r9UKjg8fvnpGfraRNPZrMGtZWsFxnoZP9oxxv/MOc34Y7PoNMfjjGIeufDj/mxn1sLranjY/cN+i+vkZmp0XruGxFB8+XKukDeO+9qqQfSy68lG1da/QicWoD/9TafyrxiJlw0VY/JeSBuATxn8xObTOXM9y/cCMOB6jUbvnscic8eWbNjBiX9dz0J+OdHQj58bpwsf1Ja/gmzfG12puc30AN3ca/+r6GZzXXN7YrN22fDeGeThWLm+k3KLj5Rk9Q9uCXeYs12cSr3CuPevM+ivXAh0fJab/OXUdpMavWNQX+Z22fOUxninUIxu5OL6Q4Nv13M+JJe0e007RzJdmPyerPSbKv2eB217OJTq+CP7Ocek437kyn2o/X3mq6c99heJTa85/Slb2cxHZvuJ1r0WMi2vftSefTS15cJ+2pzeXbNGA7afuax4QTKoOUmTNoDhCZDN8/gsMt+8u
+   eJzNmElOw0AQAOcEkRKUKCwfSHAC5gY3+Ah3lnBn+wAETogHwBsA8QFwAgjEK3gBOxcQbcWjdIbu2eyEtNSSl/G43Nu0JygIEYIGoDXQYZDphCdMtALaAm0PCV8EHNWEMWa7B90sCrE1JLpd7DJKn5ZLQowPiU6UunZsK3xToOf/pJMKH5Yyca/GxEczL8QB0sN87/39PP2cSSgG6p5p/ijJpxaTV4Pgk+9YDfVzVgieIzg/Tq6tKc/PzwmxMNd7re7IJ4h36kT9ngew56NHrXLhi32IGRvIDpQN1O/BzFhm0bG0rRznwpeFYL6qxfh+8FG2pPgoUWPbhU+Na1+hGO+YsYPw7wkk42ndPK4ffFd+r9UKjg8fvkZGfraRNPZrMmtZWsFxnoZP9oxxv/MOc34Y7PoNMfjjGIcufGruRxn1sLranjY/cN+i+vkZmp0XruGxFB8+XKukDeO+9qqQfSy68lG1da/QicWwD/9TafyL4zFibLgIi/9S0gB8wvgvJofWmetZrh+YEcdjOGr3PBaZM7580wZG7OtGDvrTkY5u5Nw4Xfi4vuQVfPPG+FrNba4P4OZO419dP4Pzmssbm7Xblu/GMA/HyuWNlFt0vDyjZ2hbsMuc5fpM4hXOtWedWX/lWqDjo8T0P6eug9T4FYv6Ir/Tlq8yxjMFemQjF8cXEHy7nvs5saTdY9opmvnS7OdktcdE+fes5LaXc4mOL0p/57h0nO9cmU+1n6881fXnvkLxqTXnPyUr+7mIbF/xutcixsW179qTz6aWPLhP29ObS7ZwwPZT9zUPCCZVBymyZlAcAbIZPv8FDvfvLg==
   </data>
  </layer>
  <layer id="3" name="Walls" width="40" height="40">
@@ -39,6 +39,7 @@
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
     <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
   </object>
@@ -47,6 +48,7 @@
   <object id="55" template="../../obj/shop.tx" x="479" y="453">
    <properties>
     <property name="commonShopList" value="Forest"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
@@ -60,14 +62,16 @@
   <object id="62" template="../../obj/shop.tx" x="361" y="370">
    <properties>
     <property name="commonShopList" value="GreenEquipment"/>
-    <property name="hasSign" type="bool" value="false"/>
+    <property name="hasSign" type="bool" value="true"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
   <object id="63" template="../../obj/shop.tx" x="216" y="290">
    <properties>
     <property name="commonShopList" value="GreenItems"/>
-    <property name="hasSign" type="bool" value="false"/>
+    <property name="hasSign" type="bool" value="true"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
@@ -76,6 +80,7 @@
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
     <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
   </object>
@@ -84,6 +89,7 @@
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
     <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
   </object>
@@ -92,6 +98,7 @@
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
     <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
   </object>
@@ -100,6 +107,7 @@
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
     <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
   </object>
@@ -108,6 +116,7 @@
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
     <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
   </object>
@@ -116,6 +125,7 @@
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
     <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
   </object>
@@ -124,6 +134,7 @@
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
     <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
   </object>
@@ -204,7 +215,7 @@
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
   </object>
-  <object id="77" template="../../obj/shop.tx" x="112" y="304">
+  <object id="77" template="../../obj/shop.tx" x="96" y="304">
    <properties>
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green"/>
@@ -214,5 +225,22 @@
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
   </object>
+  <object id="78" template="../../obj/RotatingShop.tx" x="462" y="369">
+   <properties>
+    <property name="rotation" value="Green1,Green2,Green3,Green4,Green5,Green6"/>
+   </properties>
+  </object>
+  <object id="79" template="../../obj/RotatingShop.tx" x="160" y="161">
+   <properties>
+    <property name="rotation" value="Green1,Green2,Green3,Green4,Green5,Green6"/>
+    <property name="signYOffset" type="float" value="0"/>
+   </properties>
+  </object>
+  <object id="80" template="../../obj/RotatingShop.tx" x="160" y="370">
+   <properties>
+    <property name="rotation" value="Green1,Green2,Green3,Green4,Green5,Green6"/>
+    <property name="signYOffset" type="float" value="0"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>

forge-gui/res/adventure/Shandalar/maps/map/main_story/island_capital.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="68">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="72">
  <editorsettings>
   <export format="tmx"/>
  </editorsettings>
@@ -7,17 +7,17 @@
  <tileset firstgid="10113" source="../../tileset/buildings.tsx"/>
  <layer id="1" name="Background" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJzNmG1SgzAQhvkBtJfxY6oexxPoD71Bj6BtaU/lZVRs/Sc78I7Lukk2ECrM7DiiJE/e/Ug2+yLLPvIsuy379tm82xfzsENj93nfqn/g4DpxfebCxzkqx/sYPqz3XYmPIXHi4ntt7Lt7f2zs1NgmoD/ZXfl3XdJuyv4afLzEcXLMD3aXbsRm4bHyxuYf2DeCCeM8L8azSc6xubRrfm6Ldr2XZcv/lZhxiJaaL4mTxtFyKQWnldEXZ5Uj18/FmCoHpmKcSpsY285UOxlHQ9jqvK0/VItS5rE2R2j/1b67YPUgNaNv37Lw8dxNXWtqB1eMb4lpV/R5YzQkhpduj+LvT51fuD+JifbrMRpcl3GxAX2exD5Jv9M68fdV+avD0HpL8z0uwny1iCmcf/j/4GwjYw1rGsJXsfl2nu8rdsZ4aziWS3c8YJ/HeDH+kXqQdiE2HrPE+bBov7POJ3OQ5g7FesV8FGKTc8F/VxF7AGl48MQiHn6mHZpP2yLeX5xJqxd4+Lk+RjdX3FprEph4jvEeAM8YJo3PouExd9ds5CaeFGw8fi3r9fVBY/2oGeqZdVyNz7q2qc3l2zmcT31xNyUf/IXcc+Ww796C3yOkNuxfMOpXJWMoZ6dmlDpxf1nYzslIekJDS62TfTzq9JSc2B9Wxr5Su2+YSkuuGT+fanrJvJV9ckotuz5o7bu/Q7/h2w+1PCfOrodYk1l40Zeh9/DFmeSoHPpYcynk+5iclHzat9odYMyYFh9Yx0p1/52ST7vf/QF0/Bm1
+   eJzNmEtOwzAQhrPIoxdhyUMFjsMJYAE36BGgbdpTcRmgtGwqMkp+MRnG9jhxCpVGVVPF/vzPwx5viix7z7PspuzbR/NsU/wP2zZ2l/et/gMOrhPX57/wcY7a8TyGD+t9U+JjSJy4+F4a++qe7xs7NLYM6E92W/5el7Trsr8GHy9xHBzzg92lG7FZeKy8sfkH9qVgwjhP1Xg2yTk2l9bN96po13tRtvyfiRmHaKn5kjhpHC2XUnBaGX1xVjty/VSMoRw4Vq1NwWdhDGkzNR/iaEz9IL6zBHXGZ7LGWdl2eVt/qBalzGNtjtD+q713zupBakbfvmXh47mbutbsHFwxviWmddHnjdGQGJ67PQo5Rt+Hzi/cn8RE+/UYDa7KuNiAPo9Vn49+0zrx/7z80WFovaX5Hqow307EFM4/nA9nGxlrWNMQvprNt/a8X7MzxmvDMZu54wH7PMaL8Y/Ug7QLsfGYJc77qn3POp/MQZo7FOs181GITc4F/11G1HbScOuJRfrgPIs4GppPqyLeX5xJqxf0OVb9c32Mbq64tdYkMPEc4z0AzgNjmDQ+i4b73F2zkZupzyqIX8t6fX3QWD9qhnpmHVfjs65tiMWcHV2+nersHsPni7sp+eAv5J4rh333FvweIbVh/4JRvyoZQzk7NaPUifvLwnZKRtITGlpqnezjUaen5MT+MDf2ldp9w1Racs34+VTTS+at7JNTatn1QQvf/R36Dd9+qOU5cXY9xILMwou+DL2HL84kR+3Qx5pLId/H5KTk097V7gBjxrT4wDpWqvvvlHza/e435SQojA==
   </data>
  </layer>
  <layer id="2" name="Ground" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJzVWFlOwzAQNSI1iAh1uQGID/hKOQWXQIj/ggAJcR+6qVVBXAHxn3IJDoItMnQ6GS+J3RSeNKIJduZ5dlmI/4XjrhAn3W2zMOOqJ8R1b3v6jwy2eW6WhhF72yawYXydrj9Lqc4sy+uyRIjzxL63CeSKw2fi/75pVOHXJF3wK/CYinWfNmk/To3Wnyp+B/Lnbz8x/+4zsRgTNNazQv9cyU3LLTPElculKuByjPpKPy8r+G/A8OTsWSW/JfKNthXmAvpuW/zeqSfPEFuCjcCHPly4mmf7dkj+5AU3Ey/THk7nRMkiEr+hQddIybgmPwpXfPjApovOEllSrinUzwFUSsiYnLAB/IUltDbPHPq42Bvyy538RmFUfwGzV9XeNJarugH5PrHUDogHU67bbFeHn8++IVkXEgPQW+GMvmXU91yUn2/dBAxQ73TVANPMYtOp40HHgo4BKd25SPueKQ84gK3xrOWjM0dnmhdccS8KmbWxbcAWKeKEdUpDPcyLc8C6mKBxBhyXhpmQ45CTGovP7FuPoA7QuQ3ze0HvcP3DsyHlljG869QMahc8b+H5COINc8O+7SO9sJ/7Zp16M5bmmXiZrOsDwb4FvgDbnB0yL3C8Z7Lc16i4ZrRYvQ8D6gDuaxwvV5+LgX2PNdSWppoBry7PYjL0wwDNBzHjKAR6np6g579yp2GCjd/joXu/LVThXvCibf/Gnfr/PSMP7RU/2xpfPDHn0dxM95eARUf1DCJvSl47K36L4h1dp9e4UPV+uUp9wv6tW1beFbePDd1/DyL0gE3ef++kQuymcb/5Ddm+2qY=
+   eJzVWEtOwzAQ9SI1iAr1cwMQC1ilnIJLIMS+IEBC3If+1KogroDYp1yCg2CLDJ1OZmwnTlN40ogm2Jnn+ctK/S8c95Q66e2ahYyrvlLX/d3pPxJs89wsDRF7uyawZXydbj5rbc6si+vSRKnzxL23CWSGw2cS/r5plOHXJF3wK/CYqU2fNmk/To3V3zb8DvTP30Ei/x4wsVgnaKynuf6FkZuWX+aIK5dLZcDlGPWVfV6V8N+Q4cnZs0x+a+QbayvMBfTdtvi9M/J8ecbzjLEl2Ah8GMKFq3mub8fkT5Zzk3hJezidUyPLmviNBF1jI5OK/Ch88RECly46S6RJsaZQP0dQKSBlcsIF8BeW2No89+jjYm/EL/fyG8dR/QXMXmV700Sv6wbk+9RROyAepFx32a4Kv5B9I7IuJgagt8IZQ8to6Lkov9C6CRii3umrAdLM4tJp48HGgo0Brf25SPuelAccwNZ41grRmaEzLXKuuBfFzNrYNmCLNuKEdWqhHmb5OWBdnaBxBhxXwkzIcchIjcVnDq1HUAfo3Ib5vaB3uP7h2ZBySxneVWoGtQuet/B8BPGGuWHfDpBe2M99s0q9mWh5Jl4lm/pAsG+BL8A1Z8fMCxzvuS72NSq+Ga2u3ocBdQD3NY6Xr8/Vgf2ANdSWUs2AVzDvN4khmg/qjKMY2Hl6ip7/yp2GBBe/x0P/fleowr3gRcf9jTvz/3tGHjprfq41oXhizmO5SfeXgGXX9Awib0Zeu2t+y/wdXWfX+FD2frlMfcL+rVpW3g23jy3df9eRH9u6/4YeHHtvQfENf1fcDQ==
   </data>
  </layer>
  <layer id="8" name="Bridges" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJzt1skNgDAMRFF3AW2FrSvWRsNWAI6UnLiBUCzxnzT3OVgjiwAA8J2mEGljuiJ3m7tdOx0xp8F+Uykyxyxl7jawzOn9Vpra4B0HXnutmo1+j1jv1+s+DZqRncrKGd6AwBu+4YB+7/Q/2oD021qVfkcAACByAcsGH1s=
+   eJzt1kkOgkAUhOG3cXYPW2fDbXC6FU4XxekAFkmTEMWYELVLUl/yNqz+hOY1ZiJSV53IrBv5rnhtgrYpcZ98xiowW7vZBL5rnl3QdHVzI+zbh2YHN8fQd40wi3F+F5gl4TnOpOg6Yc7qq6Ssj+meT7CftphdYU/pnv+9mHgHZFLCb6yBM9p055Sxb4C2IXFfUfKwA+os/7etqoV32v7ifsz/Hd/poaFf0jHCszHB/p6hYU7QISIi/+0OQfQkaQ==
   </data>
  </layer>
  <layer id="6" name="Ground2" width="40" height="40">
@@ -44,6 +44,7 @@
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
     <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
   </object>
@@ -52,6 +53,7 @@
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
     <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
   </object>
@@ -60,6 +62,7 @@
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
     <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
   </object>
@@ -68,6 +71,7 @@
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
     <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
   </object>
@@ -77,6 +81,7 @@
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
     <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
   </object>
@@ -85,6 +90,7 @@
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
     <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
   </object>
@@ -93,6 +99,7 @@
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
     <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
   </object>
@@ -101,6 +108,7 @@
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
     <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
   </object>
@@ -108,6 +116,7 @@
   <object id="55" template="../../obj/shop.tx" x="462" y="515">
    <properties>
     <property name="commonShopList" value="Island"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
@@ -171,14 +180,16 @@
   <object id="62" template="../../obj/shop.tx" x="360" y="370">
    <properties>
     <property name="commonShopList" value="BlueItems"/>
-    <property name="hasSign" type="bool" value="false"/>
+    <property name="hasSign" type="bool" value="true"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
   <object id="63" template="../../obj/shop.tx" x="263" y="371">
    <properties>
     <property name="commonShopList" value="BlueEquipment"/>
-    <property name="hasSign" type="bool" value="false"/>
+    <property name="hasSign" type="bool" value="true"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
@@ -192,6 +203,7 @@
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
     <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
   </object>
@@ -200,8 +212,34 @@
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue"/>
     <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
   </object>
+  <object id="68" template="../../obj/RotatingShop.tx" x="574" y="471">
+   <properties>
+    <property name="rotation" value="Blue1,Blue2,Blue3,Blue4,Blue5,Blue6"/>
+    <property name="signXOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="69" template="../../obj/RotatingShop.tx" x="50" y="472">
+   <properties>
+    <property name="rotation" value="Blue1,Blue2,Blue3,Blue4,Blue5,Blue6"/>
+    <property name="signXOffset" type="float" value="14"/>
+    <property name="signYOffset" type="float" value="14"/>
+   </properties>
+  </object>
+  <object id="70" template="../../obj/RotatingShop.tx" x="136" y="130">
+   <properties>
+    <property name="rotation" value="Blue1,Blue2,Blue3,Blue4,Blue5,Blue6"/>
+    <property name="signXOffset" type="float" value="-16"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="71" template="../../obj/shardtrader.tx" x="400.909" y="208.727">
+   <properties>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>

forge-gui/res/adventure/Shandalar/maps/map/main_story/mountain_capital.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="70">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="73">
  <editorsettings>
   <export format="tmx"/>
  </editorsettings>
@@ -12,12 +12,12 @@
  </layer>
  <layer id="2" name="Ground" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJzVmUtv00AQx6exVEjV5NLYNyCc8lDEQ0A5wAXxDQpn6HeAU0EiLRceJTSipSDOfAIeB75FQeEOghOhSQDlzA7eVcbjXXttnMgZabTO7nr983/s9e6kVgZ4XAr7tnBlmy7Afdcvt5jfE37Sm/Sti/GaZQjZWgHgiQMwEuVY+qHwp87EB6RN+UMN24NS8BonPJ8By6rwtuSqekG2KBtqmHaccJ8RcexfKwe5Gob7p4Y6HhNc3yt2bGgdqc+vQrity/ooNixNmnHbJcdKxyjtzi7oGblmvF/HCcbcVjNbe2bZT8fPDZ9ZfA/2hD/Pme+XfC2R75zQ7nzO/IKMJ8Y1z3xo88Z3UfjHGftqAj7aNiuLYphXvt4KgOdm659XsuNz3ex1Mo1pYtjNOV9UmxqrVxdxqfvHP1oA/VZ4/Hei7j2p/9kQa5WGPEeU/cb0+BaLAEcs/HVE29Gink99h2fx/F1Ziu+TpX63KsnezUYxvs9tw5pRx9BfjmdPYjb6mUzHgHuFw+Xp8g1qYt1em/xeaAIUmnZ8aLr1Vdb68Xpdv6R8p8U9npH3+VvMDX/k/GCqV9e9JNouy/Y3Yr552/Lr78q556b8fUf+Xm9F8+nWf9hmO6dQv7qkr//C6r8m0C+uLYmpuH1YDNZvSI2UZhtMO9Q2KZ9NTGk95UvzHifl+5/4qnhSHdeZdjeYprOMbxqbFh9dI9Lvh2mdlwXfywT7VPyeqv0q6rfH6m39RcmeL43jeMiX1V5wHvhM64O88D2SOciDcvp9a0+WnyTfAatP6zgerl++VSZ5PF1OCXNI1zU5O53x+UV37iu7of4ZxncrJtc4NOQUbfjw3G0H4FrBd8p6ypBf65JjjG/b1TOuyTExZ2y6hg3fmORr1Ti28cD4bspccpsx0nzxgFwjSksdH82HjwknZexC2NSzoXLJx72gjkMylsq7x2lg4hsxzqj75HFDLpWLr5K8si5XTfPvPI+s4+tE/HfANVRsVAv0v8dYoa0=
+   eJzVmUtv00AQx7exVETU+NLYNyCc8iDiIaAc4ILgExTO0O8Ap4JEWi48SiCiLSCu8AlaOPAtCgpnqOBEaBJAObODd+TxenezdtzUjDRaZ3c9/vk/fqwnVZexx6W4r3FHW/EYu+8F7ark97gf98O5NR6v4bKYLRYYe+IwNuTtSPge96dO6H0yhv5QwfagFD3GMT9ggLbCvSW4Kn6UzWQDBdMzJz5nSBzmV90oV11z/tRAxyOc63vZjg2sLfT5VYiPdaQ5yAatTjPZ1sk26mjS7syMmlHWTJ7XdqI5t9XM1p5bzlPxywbXLNwHG9w3c+YvSoGWwHeWa3cuZ35e5BPymmc+sP+N7wL3j1P2hQR8dGxaZmI4aD73RDq+7jxjvpetf56P810upuPzvOy1wpigGbYmvvUD4qOMk+rXrfG81ILtH03Ges34cd/xvvek/2edr1XqYh/e9urRmG8OM3ZI+O6EfLMklsnfWszZ8oL2ajHQD9/D07j+IE/jDGPSuWnv31vlZPfmtsWc2+WQD68/HUNvbry2WeuH9qUY5lynH3wr7M3tL1+/ytft1fD3TIOxQiM+T8egWl9lrZ/cr5qXlO8UP8fT4jx/82fDH/F80PXjcS/ysUtifIs/b7abQf9d8ey5KX7fEb+XmmY+1foPxmyfKdSvFNX9X6X+3QT6jRtLYpi3D7PR/mWhEWq2LGkH2ibls8kp7ad8Se5jE4NpbJL8Yj6pjkuSdjckTaeZ3zS2X3x0jUjfH6p1XlZ8rxJ8p8L7FL9XQb8Nqd/WX5bs+dI4xFOt4yaJl3c+3fogL3yPRA1yx03/3doV7SfBtyP1p3WIB+uXb+WwjqeqKUEN6bqiZqcy+fmi2ve1Xah/BvldHVNrHGhqijZ8sO+aw9i1QuCU9aSmvtYh25DflqdmXBQxoWasO4YN34jUazGObT4gvyuiltySGGm9uE+OYdJSxUfr4SPCSRk7LG54bWAt+agf1XFAYmHdfZwGOr6hxGk6TzlvwIW1+AqpK6tq1bT+LteRVXxtw38HsobIRrUA/wuF8ano
   </data>
  </layer>
  <layer id="6" name="Ground2" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJzt1cEJwCAMhWEHsOAApWt002I7rQVvgpBCbCL+30UQDzGRZwgAAOh6ou456KHnWN25WVfgl7feSOvJb67dgmzzdj/gD/z7c5Nk21d54Ju4Ojnb27eyp7oeybYOjMF8AbQKejsINQ==
+   eJzt1UEKgCAQhWG3QYEHiNZ1gm4a1mkLWkTBhMTYK/i/jSAuxlHehAAAgK+l9j0HP/QcCn2lruAwNuoKzgZ6Y8qtJ225Nmdk29fuB7yBuf9vd9n2dH6kgn9iMnLW2ldp4752UVsHyuB9AVytTOkIyg==
   </data>
  </layer>
  <layer id="3" name="Walls" width="40" height="40">
@@ -39,39 +39,44 @@
     <property name="commonShopList" value="Enchantment6Red,Creature6Red,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"/>
     <property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
    </properties>
   </object>
-  <object id="56" template="../../obj/shop.tx" x="153" y="371">
+  <object id="56" template="../../obj/shop.tx" x="152" y="370">
    <properties>
     <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
     <property name="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"/>
     <property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
    </properties>
   </object>
-  <object id="57" template="../../obj/shop.tx" x="201" y="418">
+  <object id="57" template="../../obj/shop.tx" x="200" y="418">
    <properties>
     <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
     <property name="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"/>
     <property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
    </properties>
   </object>
-  <object id="43" template="../../obj/shop.tx" x="105" y="370">
+  <object id="43" template="../../obj/shop.tx" x="104" y="370">
    <properties>
     <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
     <property name="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"/>
     <property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
    </properties>
   </object>
   <object id="47" template="../../obj/inn.tx" x="376" y="370"/>
-  <object id="49" template="../../obj/shop.tx" x="105" y="418">
+  <object id="49" template="../../obj/shop.tx" x="104" y="418">
    <properties>
     <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
     <property name="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"/>
     <property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
    </properties>
   </object>
@@ -80,14 +85,16 @@
     <property name="commonShopList" value="Enchantment6Red,Creature6Red,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"/>
     <property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
    </properties>
   </object>
-  <object id="51" template="../../obj/shop.tx" x="248" y="417">
+  <object id="51" template="../../obj/shop.tx" x="248" y="418">
    <properties>
     <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
     <property name="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"/>
     <property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
    </properties>
   </object>
@@ -95,6 +102,7 @@
   <object id="55" template="../../obj/shop.tx" x="366" y="433">
    <properties>
     <property name="commonShopList" value="Mountain"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
@@ -173,22 +181,25 @@
   <object id="62" template="../../obj/shop.tx" x="361" y="258">
    <properties>
     <property name="commonShopList" value="RedEquipment"/>
-    <property name="hasSign" type="bool" value="false"/>
+    <property name="hasSign" type="bool" value="true"/>
-    <property name="signYOffset" type="float" value="0"/>
+    <property name="noRestock" type="bool" value="true"/>
+    <property name="signYOffset" type="float" value="-4"/>
    </properties>
   </object>
   <object id="63" template="../../obj/shop.tx" x="409" y="259">
    <properties>
     <property name="commonShopList" value="RedItems"/>
-    <property name="hasSign" type="bool" value="false"/>
+    <property name="hasSign" type="bool" value="true"/>
-    <property name="signYOffset" type="float" value="0"/>
+    <property name="noRestock" type="bool" value="true"/>
+    <property name="signYOffset" type="float" value="-4"/>
    </properties>
   </object>
-  <object id="65" template="../../obj/shop.tx" x="202" y="367.25">
+  <object id="65" template="../../obj/shop.tx" x="200" y="370">
    <properties>
     <property name="commonShopList" value="Enchantment6Red,Creature6Red,Instant6Red,Goblin,Devil,Dwarf,Dragon,Minotaur,Shaman"/>
     <property name="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"/>
     <property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
    </properties>
   </object>
@@ -197,10 +208,10 @@
     <property name="questtype" value="mountain_capital"/>
    </properties>
   </object>
-  <object id="67" template="../../obj/shardtrader.tx" x="336" y="402">
+  <object id="67" template="../../obj/shardtrader.tx" x="337" y="403">
    <properties>
     <property name="signXOffset" type="float" value="14"/>
-    <property name="signYOffset" type="float" value="-8"/>
+    <property name="signYOffset" type="float" value="-2"/>
    </properties>
   </object>
   <object id="68" template="../../obj/shop.tx" x="400" y="337">
@@ -208,6 +219,7 @@
     <property name="commonShopList" value="Enchantment6Red,Creature6Red,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"/>
     <property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
    </properties>
   </object>
@@ -216,8 +228,28 @@
     <property name="commonShopList" value="Enchantment6Red,Creature6Red,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"/>
     <property name="uncommonShopList" value="Wolf4Red,Sliver4Red,Knight4Red,Soldier4Red,Dinosaur4Red,Ogre4Red,Multicolor8Red"/>
    </properties>
   </object>
+  <object id="70" template="../../obj/RotatingShop.tx" x="495.917" y="305.432">
+   <properties>
+    <property name="rotation" value="Red1,Red2,Red3,Red4,Red5,Red6"/>
+    <property name="signXOffset" type="float" value="16"/>
+    <property name="signYOffset" type="float" value="0"/>
+   </properties>
+  </object>
+  <object id="71" template="../../obj/RotatingShop.tx" x="511.091" y="227.455">
+   <properties>
+    <property name="rotation" value="Red1,Red2,Red3,Red4,Red5,Red6"/>
+    <property name="signYOffset" type="float" value="0"/>
+   </properties>
+  </object>
+  <object id="72" template="../../obj/RotatingShop.tx" x="527.455" y="193.455">
+   <properties>
+    <property name="rotation" value="Red1,Red2,Red3,Red4,Red5,Red6"/>
+    <property name="signYOffset" type="float" value="0"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>

forge-gui/res/adventure/Shandalar/maps/map/main_story/plains_capital.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="69">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="73">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -12,12 +12,12 @@
  </layer>
  <layer id="2" name="Ground" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJztmF1OwkAQgPfJbssl9I0ERa9gjOI99CLic9FwBdRj6FUU9BkQDuBOyqSToVtmu7tSEyeZsCnN9uv8b5Vqn8y1UmeZUqN03yTVkqcFW0y+y0SpqwY6SErbxeSbmed8NtCvpGT71u3lA7aTTPasYafUpnyDrlLX3WLNhfNVsUHOnJprC/O71NtcXF35bgzbrZCvym40Zx5IXDZhq+I7MHsmFfqSbvNViZRPKtL4Oze2WvWUWvfq+XrmvrUu+PrEz65cTfgk9gMZExtyO/7z/X0+miMu9XEffI+evS80H51pfH0bgy8PGHvINyG117ZGPrwm5Qvh3/es7BMflvXFZj3N3PigRi895pvY/vW1YUg+nhuh+ELFH/TelWE8Jj04RH0OGX8o6Oc21Oc5i3/qZzrD7IsvZ/7jOeJjw9B8YLu6MyHEr8s58TD140NfosDsUvfOfJ9QauMbk/MlsraNr5+V61GL7Ldg31/yjS3bwkdzFPn6O/xLa61En4X3TWv4MP6wfwDfm7n+Ksw9F7tQferY/6N8vH8B31Eqrw27+OBdh7pQyTvD/ffa3v/vdLmfjwIL8NFaK9mbsvn21zqZJdt8NuFnMpxPfOfjUHz0TAtMmAuxbOfKZ/vuE1Oa8MWMNy4ufOBPmIt/iw3EhW+X/ADqlHWN
+   eJztmF1OwkAQgPfJ7pZL6BsJilyBGMV76EXEZ9BwharHwKso6jMgHMCdlEknQ7s/3a3UxEkmbEu7/To/O7MVon2ylEIMUiGm6tAk5TJROVuTfJeJEFc1dJQUtmuS70M/57OGfiUF27dsLx+wnaVuzxp3Cq3LN+oKcd3Nx1w4Xxkb5My5PrfSv2u5z8XVl+9Gs9068pXZjebMA4lL5MmUnw0535G+PynRF7XPVyY2vmEa5t8qhXk3PSG2PTNfT1+3lTlfn/jZN+7q8LnYD2RGbMjt+M/39/lojvisj4fgewysfbH5aE+TWXybKfMx8mVkbasau/JR28E9Jr5haj5GPvps2xh/Xfhi+fctLerEe8X4YjdeePLBGr0O6G9ixx/nC7Whb/zhuTI+mhsx+WLFH9TejWY8JTU4xvocM/5Q0M9tWJ+XLP6pn2kPcyi+CfMfz5EQG8bmA9uZ9oSQXz77xGMVxoe+RIHexfTOfJ5YWsU3I/tLZG0bXz8txtMW2W/Fvr9MdrZsCx/NUeTrW/xL11oXfXa8bmHgw/jD+gF8r/r83DH3fOxC9alT/R/l4/UL+E6U+9pg44N3HctcXd4Zrr+X1fX/Thbzheh81+PStdZlbsoWWl9Ngr2LrdaD8D0Z9ieh/XEsPrqnBSbMhaZs58tX9d2nSanD12S8cfHhA39CX/xbbCA+fDb5AV5mcmA=
   </data>
  </layer>
  <layer id="6" name="Ground2" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJztlMsKwjAQRS/daQXzAdK6LKW60T9R975AP0P8chtKsQ5BSpvaId4Dw0wekMOQBCC+eMb+gn708+W3y4B9GYdMp5/2/tGPfqH4rXJgnev168O/+W0KYFt8r2tcc0P7+YZ+uvx4/+in1e8SfY6vkXvfWH5dSGfAsozppMp1LEyVE/Nes1nWzTkX90aPTi36pYmzAl9557RyFJ43Bd7SSY7bvF/iRvZySB7z350VKvY/tyRmXA9CQucFNwz/RA==
+   eJztl80KwjAMgIM3f8A+gEyPY0wv+ibqXaeojyE+uStzOMomTc3a0OWD0J8d+pGMLQUQqHhN6SIGv+uItx8Wn37FJ3c3RA67ztqnAIcyjinOD1s/V78h1peT34mozj7zd3ZwDlnfu4WvD791BrDJ8P6+/Lq4MMnfP1D7bXOAXf57XtO217cfNeLHy0/eP/Hj6mf+L2x6We75W84AVmVMxtVYx0JVY6K+z/Rozpt7bTwaOXLpr0JSMPC16VE4YPb7Nr1p35hO5pr6LjokqO53Njzn/s6KFf091yQqrIcgxM4bns4Cfg==
   </data>
  </layer>
  <layer id="3" name="Walls" width="40" height="40">
@@ -25,12 +25,12 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJztmMkOgjAQhudgYiDB90CjV3E5aDzrA7pw8Z3Um8sj+ARCsLHidGNYSuyfTGg7mekHpZO0AO3QNgDYWWL74Jcv6gFM3jZP7EywWYEcM27+aU/Oh/lNFBXIoZo/4t750gDfifuOIj7qdysjlyi27XxHjz4HJVaVc+nT56DEOj5aLD/+HHzGWZvxYT5+rA6+W8LS9TK7v9sr/7vPtx++3hyphn2AUZ/Gh8mm9cVkE986BNiEenzjZK2i3HpVzYfVYp4v78/369wfzFbIvmBmsj/K4MNk0/+HySY+WX3O+7F+k/XZ/X/t5Ysl572UT/cMegiq4ROdCdPzUsp3EvhFMWXzYeOLTva8+t/9qlTH+Ygix0dTm/liyf2RSlvk/gkbU8WLahP1fgiLN8mpcz/E/KI6rarJMj5VTiyel0nt1a3NRXNS78+cnP5FLxlP310=
+   eJztmEsOwiAQhlmYmJLUe1ijW6t1oXHvAX1tvFN15+MInkCJEsc6QNvpAyJ/MhFmMsPXWiYBxtzQOmRsY4ltw1++uMfY5G2zpx0JlpSokYD1pz09HxYvorhEDdP6MXjmUwt8KXiPKj7qe6uilirXdb5DQF+DkmuqueD0NSi5no+WC/33wccvx5IPi0FfE3yXJ0s3eNn1PV7y7zkc33i+NYSGEWOjiMaHyab/F5NNfKLXrfpqPtgLx9Fvb6ybD3tX0JeNZ+dN7g9pS2RfSCuyP6rgw2TT94fJJj5df87GsXmb/dl/f+7y7TXnPcGX9wy6C+vhU50JxXlJ8KWKuCqnaj7MP++8fs/8e16XmjgfUeT5aHKZb6+5PzJpjdw/YT5Tvqo3Ue+HsPwiNfPcD8m4qk+berKOz1QTy4cq0nvz9uayNan3Z15e/6IHVk/fZg==
   </data>
  </layer>
  <layer id="5" name="Overlay" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJzt1E0KwjAQBeAHHqDoRqGCLtumm7rRoofyBK3LnsNDaY/jLP1JAlLqJPV9EEjaLB6ZZAAiGmKfAQcZdaadhGzuBuiNdopXXa6dYDw3Y5+7/r3vidm8ABaFdor/Vsnb2jne10Zqs32qTyrztaNeyxJYlf65be8QR8ly4v0hjHf/fP3Z9m1K/ZnoW00CtDIuiXaST9eZfx2bc+5fh6IONFcs50ekJeR+TkS/8wCuWBuR
+   eJxjYBgFo2AUUALMNRgYLIDYUmOgXTIKsIHr2gwMN7QH2hWooENzoF1AO3BNGzsblxy6mqEMBLUYGIS0BtoVIxsYAvOWEY78JQ+MGwWk+JEGsmVwxJe4DgODhA5+Nja1hIAvnrxvDXSLDZp7LEbT04gEtEp/+MpnbGLDqXweBaOAVFDHz8BQD8QN/APtEkywiBk/f6iBAk38/MECLAepu4ZK+I2CUTBQYDCX56NgFIwC+gEAuogcaQ==
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
@@ -39,6 +39,7 @@
     <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
     <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
    </properties>
   </object>
@@ -47,6 +48,7 @@
     <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
     <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
    </properties>
   </object>
@@ -55,6 +57,7 @@
     <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
     <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
    </properties>
   </object>
@@ -63,6 +66,7 @@
     <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
     <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
    </properties>
   </object>
@@ -72,6 +76,7 @@
     <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
     <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
    </properties>
   </object>
@@ -80,6 +85,7 @@
     <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
     <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
    </properties>
   </object>
@@ -88,6 +94,7 @@
     <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
     <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
    </properties>
   </object>
@@ -96,6 +103,7 @@
     <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
     <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
    </properties>
   </object>
@@ -103,7 +111,8 @@
   <object id="55" template="../../obj/shop.tx" x="465" y="515">
    <properties>
     <property name="commonShopList" value="Plains"/>
-    <property name="signYOffset" type="float" value="0"/>
+    <property name="noRestock" type="bool" value="true"/>
+    <property name="signYOffset" type="float" value="-2"/>
    </properties>
   </object>
   <object id="58" template="../../obj/entry_up.tx" x="320" y="644" width="80" height="20">
@@ -167,15 +176,17 @@
 }</property>
    </properties>
   </object>
-  <object id="62" template="../../obj/shop.tx" x="263" y="257">
+  <object id="62" template="../../obj/shop.tx" x="80" y="338">
    <properties>
     <property name="commonShopList" value="WhiteItems"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
   <object id="63" template="../../obj/shop.tx" x="82" y="257">
    <properties>
     <property name="commonShopList" value="WhiteEquipment"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
@@ -200,6 +211,7 @@
     <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
     <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
+    <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
    </properties>
   </object>
@@ -208,8 +220,32 @@
     <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
     <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
+    <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
    </properties>
   </object>
+  <object id="69" template="../../obj/RotatingShop.tx" x="481.667" y="418.667">
+   <properties>
+    <property name="rotation" value="White1,White2,White3,White4,White5,White6"/>
+    <property name="signYOffset" type="float" value="-2"/>
+   </properties>
+  </object>
+  <object id="70" template="../../obj/RotatingShop.tx" x="541" y="193">
+   <properties>
+    <property name="rotation" value="White1,White2,White3,White4,White5,White6"/>
+    <property name="signYOffset" type="float" value="-2"/>
+   </properties>
+  </object>
+  <object id="71" template="../../obj/RotatingShop.tx" x="401" y="161">
+   <properties>
+    <property name="rotation" value="White1,White2,White3,White4,White5,White6"/>
+    <property name="signYOffset" type="float" value="-2"/>
+   </properties>
+  </object>
+  <object id="72" template="../../obj/shardtrader.tx" x="272" y="338">
+   <properties>
+    <property name="signYOffset" type="float" value="-2"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>

forge-gui/res/adventure/Shandalar/maps/map/main_story/swamp_capital.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="85">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="94">
  <editorsettings>
   <export format="tmx"/>
  </editorsettings>
@@ -12,12 +12,12 @@
  </layer>
  <layer id="2" name="Ground" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJzNWM1S20AM3uKEabg4yUswcOn0XDp9BLhAXwBcKHQKbd+jhZ4DHcPbUOBZ+DsWkFpr+Kxo15vUSawZjYdFu/70fZLsOEudS7rOtZXPkX9I/c57Nul6RlexLBCrz+e9p91n30qH78/7Wp69Ot5ynYPGIRiss+YhL7Yc4vD+udovnOTdcn4+t87U+BMD85nClylNhDe2lnGmz7fT8rmydx5y0phRS43LOieDnDS+cTXFdVxLInK29rQj8VXV8aRd8GkcPj1i63Ict3IXfNhPjy+de7cw7K4z7KF13Gdd0V90yrkLVgvfgGKPp+wnHXveWPhyY//qsnNry9PDJxhj8e0Str0p4xOLwVflnwn7/n/g/6XwrZO270Ffnjsye8fBVzd/h4Tnp5ovMktmgU/zJxxa+kr/HpBeXwzNvtLat5pr0aq/Q+AP9Z3FfLH4w/6Ytb5V/du0/tD48J2xCc+PpuGrqr82aNyU+SKG7w3cI03TV1sd+P4sOvewWA9/+KybVf2F+MNn3aTwrS81S99J1l/T+lfbG/o9sEKedMLXFYhrkc8ZcdYeXJe/3y7E4wuZ7iWxgcHBq55zr3tx5/nOHdWklzL1LSEvaggx7fad+9QPY/tBZ92nwz1q5RAyzUWufhsLvguK2emXY3UuYre0dp36cWHcvdqvz9RcyLc0fOdhfBy3p2J1Lnjf77S+AfwID8iHxCGHvjPx//h9YTDijGBjTY8KFw6F/4/kV73nGmCebyp09ukk+EaZET5jfJeFMz7m7q7Q1+IRsSXFOxjntJGWdcnH4M8yro/fhOu8969GBB/jYh7vjFr8e3/Qk3W5ScuxdfHHdSfasgk+dB+HaLr3YvkL1Qib7i/kQjxUizKLrHeKGP6q+s4yzWFoXvrW69LXh485Oyq41DMpxiaF7wlOe1vw
+   eJzNmM9u00AQxpc6qUgvTvISkXJBPbeIR4AL5QWKW/pH0Jb3gJZzAJm+TVt4FtLmCHQGPOrnyex6E5zEI42sbmfXv/1mZu04S51Lus61la+R76V+5zm7dL2kq1gWiNXr89xv3Qd/nU7fn+e1PHN1vOV6D5pDGKy11mFfbDnE4f1zNV80ybvl/fncWlPzJwbzpeLLVE5EN7aWsabP99PyujJ3HfakmTGXmstaJ4M9ab55c4rjOJZE7Nma047kq6rjRbvwaQ5fPmLrch639i582E9/Hjv3bGPaXWfaQ+M4z7qiP+qU9y6sFt+IYj8v2b907PPG4suN+c+Hzr0YLo9PGGP5DontaMl8YjF8Vf6W2N/9B/9XxfeScvsK8svnjpy98/DVrd858XxS54ucJavg0/qJhlZ+pX9PKF+nRs7OaOx9zbVo1d856If5XcX5YumH/bHq/Fb1b9P6Q/PhO2MTnh9N46uqvzbkuCnnixi+N3CPNC2/2urg+zVw7vegHv3wWbeq+gvph8+6JvItIr+L5Gta/2rbot8D2+RJJ3zdhrgW+ZoRZ83Bcfn76UY8X8h0L4mNDA2e9Jzb7MWt51t3VpNeytS3hLyoIWQ67Dt33A+zfaS1Jul0j1p7CJnWIle/jYXvhmLe9Muxei9itzT2M/VzYdxEzddrai3kWxq+8zAfxx2pWL0XvO8HGt8BfUQH1EPiUEPfmvh//L4wmvGMYOOcXhQuGor+B+Q/eg81wDqPK/Lsy5PwzXJG+Iz5vhfOfKzdXZFfS0dkS4p3MN7TTlrOSz6HfpZxfVwT11XvX40IH3OxjndGLf69P+ST8zJOy7F16cd1J7llEz50n4Zouvdi9QvVCJvuL9RCPFSLchZZ7xQx+lX1nWVaw9B56RuvK78+PtbsotBSn0kxtii+e9gCXBk=
   </data>
  </layer>
  <layer id="6" name="Ground2" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJztV0tOwzAQHQk2iZNcoWGbK8AK0SB6D7gH5SpA20OBShvugUeNlcHyP25akJ80iuPYnpd5Hn8AEhIS/gteS4C3E9l7aed3WwG03L4mtjm3u8qNn0u72HD1G4PfPgf4zv36TMnvmQG8ML8+Y/n5xITy+2gAPhs/v0+G9jp+6HOV6ftR/th2zsuto2G/sfHbZGbN6Hfkl/H33GJLdnheFeP52eJH+dn+RWBJ2sh+dRrTdqhZ19t9PmjWSc9W+o5l07/Y+C0aPUfabsbjXhd6feg3lh00xToWIX46hK4vqKmImcgPGt9OMqxDfrr8WDjoa8M1H+OmGTjZ8oPGuybaxMgPFWjOUH6u+RHiV7S74HG57GOjK8v8TPrKOtNyyPq3l8ZU+dDlLM0rkTcqXcV7iL7Uh5zDwkct8VBp6qr1sfNXtad1uftaeIz5R7EhOsrxRv1i86N7h27+0TqMk2/OhvJbl8P8U61ZqnrWr8+h95dV6cZv63lv6LjtqmH/2PZ1IXeQnee8f2h+P00wnZnlcVzG8+X2aBnTdv6KyS0EIXeOKRGy504Jm76nBj3/nSPOff7NCrd9LCHhL+EHYaXfpQ==
+   eJztV0tOwzAQHQk2iZtcoWFJrgArRIPoniPAPShXgZYeClRacw88aqwMlv9x06rKk0ZxHNvzMs/jD8CIESPOBe8FwMeRbFm4+d2VAI2wn4FtJuy+9OPn0y41fP2m4LfLAX7zsD5D8ntlAG8srE9ffiExofy+aoDvOszvi6W9iR/6XGXmfpQ/tp2JcuNp2K9v/NaZXTP6Hfll4j132ILtn1eT/vxc8aP8XP8isSBtVL8mjWk71Iy39pB3mnHl2SjfsWz7Fxe/eW3mSNtNRdyriVkf+o1le02xjiWInwmx6wtqKmMm84PGlyuGdcjPlB9zD31duBFj3NYdJ1d+0HhXRJsU+aEDzRnKzzc/YvzKdhciLpdtbExllZ9NX1VnWo5Z/3bKmDofppyleSXzRqerfI/Rl/pQc1j6qBQeOk19tT50/ur2NJ77r4WHmH8Ua6KjGm/U7+k6LT+6d5jmH63DOIXmbCy/z6Kbf7o1S1fP2vU59v6yKvz4bQLvDVzYtuz2j01bF3MH2QbO+8f6/9MG25lZHcdnvFBuz44xXeevlNxiEHPnGBIxe+6QcOl7bNDz3yni1OfftD2HjBhxTvgDGpfgIw==
   </data>
  </layer>
  <layer id="3" name="Walls" width="40" height="40">
@@ -25,12 +25,12 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJztzsEJgDAMBdAsIHQA8d7OrZPpDnr0JAXBQxEV4T0I5EM+JAIAuGsuEUupec0RW/7uHwCAt0xd2xzGxt65/4Q+1X1I13cAwD/scwwWyg==
+   eJzt0sEJwCAMheG3gOAA0rvOXSdrd9BjT8UiFipFRPg/CCSQQCCRAADAX0eQzlDq5KXs5+0DzPL8/S851sJ9AbRE0xe3vXOunh/B2ZJv9r0PAACs4QIr1ijS
   </data>
  </layer>
  <layer id="5" name="Overlay" width="40" height="40">
   <data encoding="base64" compression="zlib">
-   eJzt0rENgzAQBdC/ASNAh+x1IAnThKwWGtgBGtIkG5AyV6SwBCIUdk62/pMsnb9k+aQ7gIiISE9lgdqu87tknZP3Ug/OfTTAZML3R2snmcN5Y2YXyZqNnPxyd/9I/W+L/Ps2x2vfctnBIuI9DDnfp7x5mf36F+35xmwugUep3YUeH/tHabhmQPs9t0y7GyIiIkrdB4cVPLM=
+   eJzt0sEJg0AQheHXgSWYm6ztRGOqibZmLqYHc0kuWkbmEGHBJeTgsiT+HwizD4SBeRIAAOkcS6kq13lv2dXLB5tv3nt00t3F3w9rtd3hFLhZY9k5kGNbfve/mfcmtw4efriHMe872T+z+zwjnkchPYvUW6RD/7C4ZFL7/ros9TYAAODfvQDOSyqr
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
@@ -39,7 +39,8 @@
   <object id="55" template="../../obj/shop.tx" x="416" y="402">
    <properties>
     <property name="commonShopList" value="Swamp"/>
-    <property name="signYOffset" type="float" value="0"/>
+    <property name="noRestock" type="bool" value="true"/>
+    <property name="signYOffset" type="float" value="-2"/>
    </properties>
   </object>
   <object id="58" template="../../obj/entry_up.tx" x="258" y="639" width="97" height="20">
@@ -107,14 +108,16 @@
   <object id="62" template="../../obj/shop.tx" x="216" y="241">
    <properties>
     <property name="commonShopList" value="BlackItems"/>
-    <property name="hasSign" type="bool" value="false"/>
+    <property name="hasSign" type="bool" value="true"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
   <object id="63" template="../../obj/shop.tx" x="115" y="241">
    <properties>
     <property name="commonShopList" value="BlackEquipment"/>
-    <property name="hasSign" type="bool" value="false"/>
+    <property name="hasSign" type="bool" value="true"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
@@ -123,6 +126,7 @@
     <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
     <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
     <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
    </properties>
   </object>
@@ -131,6 +135,7 @@
     <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
     <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
     <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
    </properties>
   </object>
@@ -139,6 +144,8 @@
     <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
     <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
     <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
+    <property name="signXOffset" type="float" value="18"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
    </properties>
   </object>
@@ -147,6 +154,7 @@
     <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
     <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
     <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
    </properties>
   </object>
@@ -155,6 +163,7 @@
     <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
     <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
     <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
    </properties>
   </object>
@@ -163,6 +172,7 @@
     <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
     <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
     <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
    </properties>
   </object>
@@ -171,6 +181,7 @@
     <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
     <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
     <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
    </properties>
   </object>
@@ -179,6 +190,7 @@
     <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
     <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
     <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
    </properties>
   </object>
@@ -192,6 +204,7 @@
     <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
     <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
     <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
    </properties>
   </object>
@@ -200,8 +213,32 @@
     <property name="commonShopList" value="Enchantment6Black,Creature6Black,Instant6Black,Vampire,Zombie,Skeleton,Demon"/>
     <property name="mythicShopList" value="Planeswalker4Black,WUBRG,RWB,RUB,RGB,UWB,UGB,UWB,Legend4Black"/>
     <property name="rareShopList" value="Artifact4Black,Land4Black,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Black,Wand4Black"/>
+    <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Rogue4Black,Sliver4Black,Knight4Black,Multicolor8Black"/>
    </properties>
   </object>
+  <object id="90" template="../../obj/RotatingShop.tx" class="RotatingShop" x="200" y="402">
+   <properties>
+    <property name="rotation" value="Black1,Black2,Black3,Black4,Black5,Black6"/>
+    <property name="signYOffset" type="float" value="-8"/>
+   </properties>
+  </object>
+  <object id="91" template="../../obj/RotatingShop.tx" class="RotatingShop" x="153" y="402">
+   <properties>
+    <property name="rotation" value="Black1,Black2,Black3,Black4,Black5,Black6"/>
+    <property name="signYOffset" type="float" value="-8"/>
+   </properties>
+  </object>
+  <object id="92" template="../../obj/RotatingShop.tx" class="RotatingShop" x="106" y="402">
+   <properties>
+    <property name="rotation" value="Black1,Black2,Black3,Black4,Black5,Black6"/>
+    <property name="signYOffset" type="float" value="-8"/>
+   </properties>
+  </object>
+  <object id="93" template="../../obj/shardtrader.tx" x="152" y="339">
+   <properties>
+    <property name="signYOffset" type="float" value="-8"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>

forge-gui/res/adventure/Shandalar/maps/map/mountain_town_generic.tmx

@@ -82,6 +82,7 @@
   <object id="48" template="../obj/shop.tx" x="160" y="96">
    <properties>
     <property name="commonShopList" value="Mountain"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="50" template="../obj/shardtrader.tx" x="335" y="81">

forge-gui/res/adventure/Shandalar/maps/map/mountain_town_identity.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="54">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="57">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -82,6 +82,7 @@
   <object id="48" template="../obj/shop.tx" x="160" y="96">
    <properties>
     <property name="commonShopList" value="Mountain"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="50" template="../obj/shardtrader.tx" x="335" y="81">
@@ -95,15 +96,13 @@
     <property name="questtype" value="mountain_town_identity"/>
    </properties>
   </object>
-  <object id="52" template="../obj/shop.tx" x="240" y="97">
+  <object id="55" template="../obj/RotatingShop.tx" x="240" y="97">
    <properties>
-    <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
+    <property name="rotation" value="Red1,Red2,Red3,Red4,Red5,Red6"/>
-    <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>
+    <property name="signYOffset" type="float" value="0"/>
-    <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"/>
    </properties>
   </object>
-  <object id="53" template="../obj/shop.tx" x="304" y="97">
+  <object id="56" template="../obj/shop.tx" x="304" y="97">
    <properties>
     <property name="commonShopList" value="Red,Red,Enchantment4Red,Creature2Red,Instant4Red"/>
     <property name="mythicShopList" value="Planeswalker,WUBRG,Vehicle,Artifact,Equip,Wand,Legend4Red"/>

forge-gui/res/adventure/Shandalar/maps/map/mountain_town_tribal.tmx

@@ -82,6 +82,7 @@
   <object id="48" template="../obj/shop.tx" x="160" y="96">
    <properties>
     <property name="commonShopList" value="Mountain"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="50" template="../obj/shardtrader.tx" x="335" y="81">

forge-gui/res/adventure/Shandalar/maps/map/plains_town_generic.tmx

@@ -56,16 +56,17 @@
   </object>
   <object id="43" template="../obj/shop.tx" x="352" y="306">
    <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="White1, White2, White3, White4, White5"/>
-    <property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB"/>
+    <property name="mythicShopList" value=""/>
-    <property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
+    <property name="rareShopList" value=""/>
-    <property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
+    <property name="uncommonShopList" value=""/>
    </properties>
   </object>
   <object id="47" template="../obj/inn.tx" x="224" y="211"/>
   <object id="48" template="../obj/shop.tx" x="290" y="225">
    <properties>
     <property name="commonShopList" value="Plains"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signXOffset" type="float" value="-32"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
@@ -88,10 +89,10 @@
   </object>
   <object id="51" template="../obj/shop.tx" x="192" y="306">
    <properties>
-    <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
+    <property name="commonShopList" value="Everything"/>
-    <property name="mythicShopList" value="Planeswalker,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB"/>
+    <property name="mythicShopList" value=""/>
-    <property name="rareShopList" value="Land4White,Azorius,Boros,Selesnya,Orzhov,Vehicle,Colorless"/>
+    <property name="rareShopList" value=""/>
-    <property name="uncommonShopList" value="Artifact,Knight4White,Bird4White,Soldier4White,Angel,Sliver2White,Spirit4White,Wand,Equip,Multicolor"/>
+    <property name="uncommonShopList" value=""/>
    </properties>
   </object>
   <object id="52" template="../obj/shop.tx" x="144" y="306">
@@ -116,6 +117,7 @@
   <object id="55" template="../obj/shop.tx" x="160" y="151">
    <properties>
     <property name="commonShopList" value="Plains"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>

forge-gui/res/adventure/Shandalar/maps/map/plains_town_identity.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="60">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="61">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -66,18 +66,11 @@
   <object id="48" template="../obj/shop.tx" x="290" y="225">
    <properties>
     <property name="commonShopList" value="Plains"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signXOffset" type="float" value="-32"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
-  <object id="49" template="../obj/shop.tx" x="304" y="306">
-   <properties>
-    <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"/>
-    <property name="uncommonShopList" value="Azorius,Boros,Selesnya,Orzhov,Azorius,Boros,Selesnya,Orzhov,Land"/>
-   </properties>
-  </object>
   <object id="50" template="../obj/shop.tx" x="256" y="306">
    <properties>
     <property name="commonShopList" value="White,White,Enchantment4White,Creature2White,Instant4White"/>
@@ -116,6 +109,7 @@
   <object id="55" template="../obj/shop.tx" x="160" y="151">
    <properties>
     <property name="commonShopList" value="Plains"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
@@ -125,5 +119,11 @@
    </properties>
   </object>
   <object id="59" template="../obj/shardtrader.tx" x="128" y="130"/>
+  <object id="60" template="../obj/RotatingShop.tx" x="304" y="306">
+   <properties>
+    <property name="rotation" value="White1,White2,White3,White4,White5,White6"/>
+    <property name="signYOffset" type="float" value="-16"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>

forge-gui/res/adventure/Shandalar/maps/map/plains_town_tribal.tmx

@@ -66,6 +66,7 @@
   <object id="48" template="../obj/shop.tx" x="290" y="225">
    <properties>
     <property name="commonShopList" value="Plains"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signXOffset" type="float" value="-32"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
@@ -116,6 +117,7 @@
   <object id="55" template="../obj/shop.tx" x="160" y="151">
    <properties>
     <property name="commonShopList" value="Plains"/>
+    <property name="noRestock" type="bool" value="true"/>
     <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>

forge-gui/res/adventure/Shandalar/maps/map/swamp_town_generic.tmx

@@ -82,6 +82,7 @@
   <object id="48" template="../obj/shop.tx" x="336" y="80">
    <properties>
     <property name="commonShopList" value="Swamp"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="50" template="../obj/shardtrader.tx" x="304" y="194"/>

forge-gui/res/adventure/Shandalar/maps/map/swamp_town_identity.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="53">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="54">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -82,6 +82,7 @@
   <object id="48" template="../obj/shop.tx" x="336" y="80">
    <properties>
     <property name="commonShopList" value="Swamp"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="49" template="../obj/quest.tx" x="114" y="114">
@@ -99,13 +100,11 @@
     <property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
    </properties>
   </object>
-  <object id="52" template="../obj/shop.tx" x="167" y="88">
+  <object id="53" template="../obj/RotatingShop.tx" class="RotatingShop" x="167" y="88">
    <properties>
-    <property name="commonShopList" value="Black,Black,Enchantment4Black,Creature2Black,Instant4Black"/>
+    <property name="rotation" value="Black1,Black2,Black3,Black4,Black5,Black6"/>
-    <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"/>
-    <property name="uncommonShopList" value="Dimir,Rakdos,Orzhov,Golgari,Dimir,Rakdos,Orzhov,Golgari,Land"/>
+    <property name="signYOffset" type="float" value="-16"/>
    </properties>
   </object>
  </objectgroup>

forge-gui/res/adventure/Shandalar/maps/map/swamp_town_tribal.tmx

@@ -82,6 +82,7 @@
   <object id="48" template="../obj/shop.tx" x="336" y="80">
    <properties>
     <property name="commonShopList" value="Swamp"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="49" template="../obj/quest.tx" x="114" y="114">

forge-gui/res/adventure/Shandalar/maps/map/waste_town_generic.tmx

@@ -98,6 +98,7 @@
   <object id="48" template="../obj/shop.tx" x="104" y="272">
    <properties>
     <property name="commonShopList" value="Equipment"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="58" template="../obj/shop.tx" x="97" y="209">

forge-gui/res/adventure/Shandalar/maps/map/waste_town_identity.tmx

@@ -98,6 +98,7 @@
   <object id="48" template="../obj/shop.tx" x="104" y="272">
    <properties>
     <property name="commonShopList" value="Equipment"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="58" template="../obj/shop.tx" x="97" y="209">

forge-gui/res/adventure/Shandalar/maps/map/waste_town_tribal.tmx

@@ -98,6 +98,7 @@
   <object id="48" template="../obj/shop.tx" x="104" y="272">
    <properties>
     <property name="commonShopList" value="Equipment"/>
+    <property name="noRestock" type="bool" value="true"/>
    </properties>
   </object>
   <object id="58" template="../obj/shop.tx" x="97" y="209">

forge-gui/res/adventure/Shandalar/maps/obj/RotatingShop.tx

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+ <tileset firstgid="1" source="../tileset/buildings.tsx"/>
+ <object name="RotatingShop" class="RotatingShop" gid="1251" width="16" height="16">
+  <properties>
+   <property name="hasSign" type="bool" value="true"/>
+   <property name="rotation" value=""/>
+   <property name="signXOffset" type="float" value="16"/>
+   <property name="signYOffset" type="float" value="-16"/>
+   <property name="type" value="Rotating"/>
+  </properties>
+ </object>
+</template>

forge-gui/res/adventure/Shandalar/maps/obj/shop.tx

@@ -6,6 +6,7 @@
    <property name="commonShopList" value=""/>
    <property name="hasSign" type="bool" value="true"/>
    <property name="mythicShopList" value=""/>
+   <property name="noRestock" type="bool" value="false"/>
    <property name="rareShopList" value=""/>
    <property name="signXOffset" type="float" value="16"/>
    <property name="signYOffset" type="float" value="-16"/>

forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas

@@ -125,7 +125,7 @@ EquipmentShop
   xy: 304, 784   
   size: 16, 16   
 ItemShop
-  xy: 304, 800   
+  xy: 288, 912
   size: 16, 16
 CapitalShop
   xy: 304, 816   
@@ -253,6 +253,9 @@ DnDShop
 DemonShop
   xy: 384, 864
   size: 16, 16
+RotatingShop
+  xy: 288, 880
+  size: 16, 16
 DruidShop
   xy: 304, 880
   size: 16, 16
@@ -289,6 +292,9 @@ WizardShop
 LegendShop
   xy: 384, 896
   size: 16, 16
+ShardTrader  
+  xy: 288, 896
+  size: 16, 16
 Overlay8Black
   xy: 400, 704
   size: 5, 16  
@@ -577,6 +583,3 @@ red_castle
 final_castle 
   xy: 128, 864
   size: 64, 64       
-shard_trader  
-  xy: 288, 896
-  size: 16, 16

forge-gui/res/adventure/Shandalar/sprites/items.atlas

@@ -51,6 +51,21 @@ Status
 Menu 
   xy: 32, 64
   size: 16, 16  
+CursedTreasure
+  xy: 336, 64
+  size: 16, 16  
+PipersCharm
+  xy: 240, 976
+  size: 16, 16  
+HillGiantClub
+  xy: 192, 576
+  size: 16, 16  
+SleepWand
+  xy: 304, 544
+  size: 16, 16  
+FarmersTools
+  xy: 288, 976
+  size: 16, 16  
 SolRing
   xy: 320, 144
   size: 16, 16          

forge-gui/res/adventure/Shandalar/world/items.json

@@ -1,13 +1,49 @@
 [ 
   {
-    "name": "PCharm",
+    "name": "Piper's Charm",
     "equipmentSlot": "Neck",
-    "iconName": "SolRing",
+    "iconName": "PipersCharm",
     "effect": {
       "startBattleWithCard": [
         "Piper's Charm"
       ]
     }
+  },{
+    "name": "Sleep Wand",
+    "equipmentSlot": "Left",
+    "iconName": "SleepWand",
+    "effect": {
+      "startBattleWithCard": [
+        "Sleep Wand"
+      ]
+    }
+  },{
+    "name": "Hill Giant Club",
+    "equipmentSlot": "Right",
+    "iconName": "HillGiantClub",
+    "effect": {
+      "startBattleWithCard": [
+        "Hill Giant Club"
+      ]
+    }
+  },{
+    "name": "Cursed Treasure",
+    "equipmentSlot": "Right",
+    "iconName": "CursedTreasure",
+    "effect": {
+      "startBattleWithCard": [
+        "Cursed Treasure"
+      ]
+    }
+  },{
+    "name": "Farmer's Tools",
+    "equipmentSlot": "Left",
+    "iconName": "FarmersTools",
+    "effect": {
+      "startBattleWithCard": [
+        "Farmer's Tools"
+      ]
+    }
   },{
     "name": "Sol Ring",
     "equipmentSlot": "Left",