diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
index 1e6da2c07ff..6466a7961ce 100644
--- a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
+++ b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
@@ -3,13 +3,13 @@
         "height": 4300,
         "width": 2
     },
-    "activeFile": "map/grove_4.tmx",
+    "activeFile": "map/nahiri.tmx",
     "automapping.whileDrawing": false,
     "expandedProjectPaths": [
-        "map",
+        "tileset",
         "map/main_story",
-        "obj",
-        "tileset"
+        "map",
+        "obj"
     ],
     "file.lastUsedOpenFilter": "All Files (*)",
     "fileStates": {
@@ -34,19 +34,25 @@
             "scaleInDock": 1
         },
         "map/aerie_1.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
             "scale": 3,
-            "selectedLayer": 0,
+            "selectedLayer": 4,
             "viewCenter": {
-                "x": 239.83333333333331,
+                "x": 245.83333333333334,
                 "y": 136.16666666666663
             }
         },
         "map/aerie_1B.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
             "scale": 2,
-            "selectedLayer": -1,
+            "selectedLayer": 4,
             "viewCenter": {
-                "x": 239.75,
-                "y": 136
+                "x": 240.25,
+                "y": 136.25
             }
         },
         "map/aerie_1C.tmx": {
@@ -54,10 +60,10 @@
                 4
             ],
             "scale": 2,
-            "selectedLayer": -1,
+            "selectedLayer": 4,
             "viewCenter": {
-                "x": 399.25,
-                "y": 320
+                "x": 459.25,
+                "y": 319.25
             }
         },
         "map/barbariancamp_1.tmx": {
@@ -104,8 +110,8 @@
             "scale": 3,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 209.83333333333331,
-                "y": 207
+                "x": 279.5,
+                "y": 217.5
             }
         },
         "map/castle_plains_2.tmx": {
@@ -1740,11 +1746,11 @@
             "expandedObjectLayers": [
                 4
             ],
-            "scale": 2.0504166666666666,
-            "selectedLayer": 4,
+            "scale": 4,
+            "selectedLayer": 3,
             "viewCenter": {
-                "x": 271.89595610648246,
-                "y": 215.8097947571632
+                "x": 271.875,
+                "y": 215.875
             }
         },
         "map/graveyard.tmx": {
@@ -1766,7 +1772,7 @@
             "selectedLayer": 3,
             "viewCenter": {
                 "x": 240.5,
-                "y": 136
+                "y": 136.5
             }
         },
         "map/graveyard_3.tmx": {
@@ -1987,7 +1993,7 @@
             "scale": 1.5,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 240.33333333333337,
+                "x": 240.99999999999997,
                 "y": 136.33333333333334
             }
         },
@@ -2007,9 +2013,9 @@
                 4
             ],
             "scale": 2,
-            "selectedLayer": 4,
+            "selectedLayer": 3,
             "viewCenter": {
-                "x": 264.75,
+                "x": 454.75,
                 "y": 123.25
             }
         },
@@ -2214,10 +2220,10 @@
                 4
             ],
             "scale": 2,
-            "selectedLayer": 3,
+            "selectedLayer": 5,
             "viewCenter": {
-                "x": 384,
-                "y": 383.75
+                "x": 383.25,
+                "y": 499.75
             }
         },
         "map/main_story/black_castle_f1.tmx": {
@@ -2249,7 +2255,7 @@
             "scale": 1.7891666666666666,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 240.33535165346996,
+                "x": 240.61481136469493,
                 "y": 239.4969725197951
             }
         },
@@ -2383,8 +2389,8 @@
             "scale": 1.5,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 240.33333333333331,
-                "y": 238.33333333333334
+                "x": 240.33333333333337,
+                "y": 238.3333333333333
             }
         },
         "map/main_story/spawn.tmx": {
@@ -2481,7 +2487,7 @@
         },
         "map/merfolkpool_1.tmx": {
             "scale": 2,
-            "selectedLayer": 2,
+            "selectedLayer": 3,
             "viewCenter": {
                 "x": 239.75,
                 "y": 136.25
@@ -2604,11 +2610,22 @@
             "expandedObjectLayers": [
                 4
             ],
-            "scale": 1.5333593749999999,
+            "scale": 2,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 319.88587150354107,
-                "y": 209.01818922912318
+                "x": 495.25,
+                "y": 208.25
+            }
+        },
+        "map/nahiricave.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
+            "scale": 1,
+            "selectedLayer": 4,
+            "viewCenter": {
+                "x": 368.5,
+                "y": 200.5
             }
         },
         "map/nest_blue_1.tmx": {
@@ -2875,9 +2892,9 @@
                 4
             ],
             "scale": 3,
-            "selectedLayer": 0,
+            "selectedLayer": 3,
             "viewCenter": {
-                "x": 263.8333333333333,
+                "x": 263.83333333333337,
                 "y": 191.83333333333331
             }
         },
@@ -2910,9 +2927,9 @@
                 11
             ],
             "scale": 3,
-            "selectedLayer": 4,
+            "selectedLayer": 2,
             "viewCenter": {
-                "x": 295.8333333333333,
+                "x": 504.8333333333333,
                 "y": 183.83333333333331
             }
         },
@@ -3089,12 +3106,12 @@
             }
         },
         "tileset/buildings.tsx": {
-            "scaleInDock": 1,
+            "scaleInDock": 2,
             "scaleInEditor": 1.5
         },
         "tileset/main.tsx": {
             "dynamicWrapping": false,
-            "scaleInDock": 1,
+            "scaleInDock": 2,
             "scaleInEditor": 1
         }
     },
@@ -3108,56 +3125,30 @@
     "map.tileWidth": 16,
     "map.width": 90,
     "openFiles": [
-        "map/jacehold.tmx",
-        "map/forest_town_generic.tmx",
-        "map/fort_9.tmx",
-        "map/kiora_island.tmx",
-        "map/kobold_mine.tmx",
-        "map/lavaforge_1.tmx",
-        "map/lavaforge_2.tmx",
-        "map/garruk.tmx",
-        "map/grove_4.tmx",
-        "map/swamp_town.tmx",
-        "tileset/main.tsx",
-        "map/snowabbey_2.tmx",
-        "map/catlair_3.tmx",
-        "map/vampirecastle_2.tmx",
-        "map/catlair_1.tmx",
-        "map/cave_13.tmx",
-        "map/maze_3.tmx",
-        "map/maze_2.tmx",
-        "map/grove_6.tmx",
-        "map/scarecrow_farm.tmx",
         "map/aerie_1.tmx",
-        "map/evilgrove_1.tmx",
-        "map/grove_1.tmx",
-        "map/grove_2.tmx",
-        "map/grove_3.tmx",
-        "map/grove_5.tmx",
-        "map/grove_7.tmx",
-        "map/grove_8.tmx",
-        "map/grove_9.tmx",
-        "map/merfolkpool_1.tmx",
-        "map/merfolkpool_2.tmx",
-        "map/merfolkpool_3.tmx",
-        "map/merfolkpool_4.tmx",
-        "map/merfolkpool_5.tmx"
+        "map/nahiri.tmx",
+        "map/nahiricave.tmx",
+        "map/aerie_1B.tmx",
+        "map/graveyard_2.tmx",
+        "map/garruk.tmx",
+        "map/scarecrow_farm.tmx",
+        "map/slime_hive.tmx"
     ],
     "project": "main.tiled-project",
     "property.type": "string",
     "recentFiles": [
-        "map/jacehold.tmx",
-        "map/forest_town_generic.tmx",
-        "map/fort_9.tmx",
-        "map/kiora_island.tmx",
-        "map/kobold_mine.tmx",
-        "map/lavaforge_1.tmx",
-        "map/lavaforge_2.tmx",
+        "map/aerie_1.tmx",
+        "map/slime_hive.tmx",
+        "map/scarecrow_farm.tmx",
         "map/garruk.tmx",
-        "map/merfolkpool_5.tmx",
-        "map/merfolkpool_4.tmx",
-        "map/merfolkpool_3.tmx",
-        "map/merfolkpool_2.tmx"
+        "map/graveyard_2.tmx",
+        "map/aerie_1B.tmx",
+        "map/nahiricave.tmx",
+        "map/nahiri.tmx",
+        "map/swamp_town.tmx",
+        "map/grove_4.tmx",
+        "map/lavaforge_2.tmx",
+        "map/lavaforge_1.tmx"
     ],
     "resizeMap.removeObjects": true,
     "textEdit.monospace": true
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/garruk.tmx b/forge-gui/res/adventure/Shandalar/maps/map/garruk.tmx
index 4f2819e131b..e531e095fcb 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/garruk.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/garruk.tmx
@@ -17,7 +17,7 @@
  </layer>
  <layer id="7" name="Background" width="34" height="27">
   <data encoding="base64" compression="zlib">
-   eJzFljtOw0AQhkcgY1uxBA1H4FXRUSFOwRkoKFxSU2EeDdyAU8ABQkDpKGigCxwB0bOj7MiT8exLdiDSr2TXm51v/5mx3YwALo2ujK6NGjtuxPyN0c9afz1kAI9Zd36rAtg22jHardqxnN+r+sdHHZvf+0X3+tjs/2Q0MXqudB9w/mUAjrs8fj35UJdzcR9wnOV+uXxI5RhbhgljIQbUmRWPzccuhvsVgI/VNA8ppsbB4xcb7fdn4WbQ6mEIDjw/xuY6Lxf3OCn13pjC4vgNdIZp3uXg4nkgBhxLDl+PdmI6WDTOzPLx2NwPmRf+CcUKxfblivRVzOXqVdShrc/3BJaQwJFfZNLOIVmGEPUsieqR+xXjC1dfj+jsyMFZfJ7E1Gyf3BCLyw/O8q1ck57QWXz1iroYuTnqctEjznEAXU9mkTFlfG395nq3RnAd5+mTm9OI+zF5A6D7gGNcE8shc66pLtu4MjfcJ8ni4wjd33BfmQP5zHFJctzmfj9mPXs3Vq8wfO829t019X/L4khhSanTvxCxHA307h/jWSg3Wo+TUu5pIQ7XXjw3Lo5l+yE5/rtGNI5ff6f+Yg==
+   eJzFljtOxDAQhkegkEQbCRqOwKuio0KcgjNsQZGSmorwaOAGnAIOsCxoO4ptoFs4AqLHo80ok8k4tuUsRPq1a8fxfP5n7KQaAVwZXRvdGFV1uxL9t0Y/G/F6TACekm7/TgGwa7RntF80bdl/UMTHR52a/4dZ9/7EzP9sNDV6KXQfsP91AI771H88+VDmS3EfxqadpP2isXhxH0I5JjXDlLFgP/4ix3ktHpu3+cUZHtYAPtbDPKT4GofmQbbVeKExaPUwBAeun2LbcoJjtb0xg3Z7DjrDLO1ykDiH9OIib2rCtUc7MS0sGmdS8/HYXJ9Zuz755Yrlit2XKxIyfFnyT/VxXNfnewCLS9J7YkcmbR2SZQiN87aoj/vl4wtXrEe0ds7k8sSnZmNyQyw2PzjLt3JPekJr6atX1OXIzlGKvHGOI+h6svCMKeNr47c3l+9BXiNzaPPE5ObM4zwmbwB0H7CNY3w5ZM41lXkTV+aG+yRZ+jhc5xvOK3Mg3zk2SY67tN+PReTe9dUbDL93q/rbNfS5VXGEsITU6V+IWE4G+vb38cyVG22Pk0LONBeHbS6eGxvHqv2QHP9dIxrHLxGZ8XM=
   </data>
  </layer>
  <layer id="9" name="Tree" width="34" height="27">
@@ -25,7 +25,7 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJydV8tOwlAQvUqkEFp/ohEwimsTv8adceHKuNUViCb0a/AHAJPuWbryF/oDdtJOejqd+6g3OSnFcufMOTPTaxobk5ZYTirkUXVNYz8uAp4hbM+M+arBi2K8K3Ho++uSw+MonIcPU+Ahly0GauHjsSux78FnK3RwxQjlMYubPU8HxvzG7TzlnvcnXT9cnEN50HpNuhrLGMzB5cfMwuOhrI0bT51yTM79p7yeRd0YkgP6oYF+8wn3vn6hxbERm6Ex2bDJQ6sJ6oNsqEPL1ceDvWEO2PesaRZ1eaDvDFtd5VE7lsblZVw9i3owd+YyHTfgnGkmuDzGXDXOad2nh1jP50r5zWKk13KI/pp2Lk8xz6cy76Np5qTGRerr8oU05f0XUaOlzSMEcSFMYT+skz56oIZ5FD4z2VfSZA/7SU18eqxF/b4lFY95/fdLJe5c3BOHXdzUE3tr08TlCy6bHt8WPY6iJsnL//JA9PWF5uER4tl6R85Oya0w7f6gJbUPqRFtb9RE5i2/w/MHL80Dmy+MVQ8e2nc4O1DbPnoweAu63g3C68M2/5FHqEfcW+s6jq9O5XmBefD5gj4/J34fbJ4xD9sMsemBszSD9zhzkn2983Cic05huppos4LvPyZNL90m7fe4jVth3DwOcRNbnpWxv/Be834GnLG3c0tuWp6sZSiPEOB7h/isPOclen5zXn2mGsHzsqu+5VXqxF6zHq7/o3Atlb6RcfoCeWCdyp7i+iqAi61WCX9fbgUK
+   eJy1lsFOAjEQhqsEgSz4EmQBE/Fs4tN4Mx48Ga96EpFEnkZfADXhvkdPvgIvYCf0z/47tN0uapMJsHQ73/wznXbUN2Zk7cTau7V1x5jcPfsLG1t7bRvz5gwj5EPmn1qG6+7/cOgR40jRArqFbKLmfiiOWWbMk7XPX3LIPIzDljHffX+cYLg8SMtHEw4w3A+qvh+z7eeKdAFDaj7Yx5WtjbMIy1jpIePLWrtT8sA0A54zKxt8LOyceRbXBAzwLXW9PKqaxCH+uCbA4JsP8/lh5onnf+RGmNvO78zFAU2XnV0OmY86fXLzMbi2USPsS2sj7971tuuKT2iQ0//yfNQrDTGjJwydcVw6VmaeR/IJwzuYB5Zp11/LPg75z7dnsKbUfCynHOeNjbtwOQ2xQN+YHrxnsP7U9VfhlTU4t9rEr7CI5bQe10kTPVhDXVehHsjvFqbKoTVZJeqB8TDY3cPDGo7CVHuE5FV+hzRJ4YAeqWceOFhPyWVTjiHx835P5UAfLMgfeorOTa7ekTGkeDamuj/4nVRNWA/uKawJ9MBZyHrw/QPrNOVYqD7JdeLjCPWxdafMyT4cvBaWkM+LVnp9aA7UvdikIYfWpa5OuX8wB+4X8v12UPbIpgYOX53G9OBeyue4jJR7oC8/G7OrCXOgBnxang+q53iIbROpH94LMvRdOQ/ooXmes/I7+IRdfK9VbHUM+l6UwhHTmM8d4ZkFzhyuv5fjskb0fZnjbMKBXEOPuvsj6+GrkX1qn3twHQfX2oZYYhw/MLwVSw==
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
@@ -40,7 +40,7 @@
     <property name="enemy" value="Viper"/>
    </properties>
   </object>
-  <object id="55" template="../obj/enemy.tx" x="253.388" y="115.167">
+  <object id="55" template="../obj/enemy.tx" x="273.384" y="109.802">
    <properties>
     <property name="effect">{ &quot;startBattleWithCardInCommandZone&quot;: [ &quot;Garruk's Boss Effect Phase One&quot;,&quot;Garruk's Boss Effect Phase Two&quot;]
 }</property>
@@ -85,6 +85,6 @@
   <object id="68" template="../obj/treasure.tx" x="222.685" y="60.7665"/>
   <object id="70" template="../obj/gold.tx" x="68.0821" y="226.099"/>
   <object id="71" template="../obj/gold.tx" x="401.185" y="431.423"/>
-  <object id="72" template="../obj/gold.tx" x="63.6927" y="29.0656"/>
+  <object id="72" template="../obj/gold.tx" x="63.6927" y="15.8975"/>
  </objectgroup>
 </map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/nahiri.tmx b/forge-gui/res/adventure/Shandalar/maps/map/nahiri.tmx
index c3b42c3f499..3c15c1a65a9 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/nahiri.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/nahiri.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="26" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="74">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="26" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="79">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -7,17 +7,17 @@
  <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="1" name="Background" width="40" height="26">
   <data encoding="base64" compression="zlib">
-   eJzllm0KgCAMhoX80xE9SdAhg6BbeIkQCsJm23TOQcH7o5jt0X0ZZudCpTb/FsUGsi2tbxHHL2YrzYf5vX1BvNS9SfPkXFi8of+2sFE546VkH/03X+kbl6/2LClxl4qxROxzPskc5OQBVgOcvWBKTw0flB/cetcQla93fKl8Oad2HnLOr2SnGWvJXteb7/m+EOtuBG9is8pnme1P2qfxDBxZ6gkafCPmhPYZl+4jVmY8dqdbnQ0+yPfoOcq5695rDuGedAJSX/Xt
+   eJzVltsJhTAMhgsq4oDnwUkEp3AyQXALl5CCgsTUJG3a5gj/g5KaL7e24+DcGKm1fYtjg9mG1qdI4pey1eaj/N6+MF5ubNo8kIuqN/bfFDYu53HJ2x/tN1/om5QvNpecumvVWKP2kE+zByV9QM2AJBZK/onhw/pDOu8lxOXLXV8uH+Qs3YeS/IXsStZac6/Lzfd8n5hzV4PXs1nly8X26+rH9k98W2Obz3r+oPzcaTLm2Ae/+GL9LX1ajJDP0hlP3elmZ4MP8137HJXcde81e6PLcAIa5vV6
   </data>
  </layer>
  <layer id="2" name="Ground" width="40" height="26">
   <data encoding="base64" compression="zlib">
-   eJz7x8nAcI5lYDAIILNBYD8HA8N/oJsYuBgY4jgheKDchuw+ZAxy0yGgO/8A6dcDFHbo4QfmcyHYCZy43T8QOBYaj7Bww+Z+XPgoljSALdxh5g0mf+OLL3LNwJc2KcHUSsu0dONIcB+sDPw/gGUz3vAb4LKZGDzY3TcU8GDNH0PFfaN4FA8lfJN34N0wijHxnUFajy1jRcUD6Q587kJ3H73rDVzuIRR+9HInKW5DbpOCAABBQjfn
+   eJztlkEKgCAQRWdRkd2x6HRBpwiCtl2kK0SmlDSFiYQxEznw0IWLxx8dXATAmNCgC+91dTmAVE5QAFRig8oN+2G0U688Z7VORNlZnYtjX4t7fwrKvY8mt2v/XQyWO8Apd+/+BOgHrtB+oTJ90/EPfmYGSsLZ7MyPeDb7wN3vC3B9H1/xi0Qikae0Gb2DiyY9Q+nh8uLg5wNnP3MW/0l1rewQO7c=
   </data>
  </layer>
  <layer id="7" name="Mountain Walls" width="40" height="26">
   <data encoding="base64" compression="zlib">
-   eJy9ljFOwzAUhpPS0i7QpW1IjgAXYEXiFByDqYWiDqxsSFyAC1Q0kFyCMrFwhG4IwUxM8iuvL362k1T80q/WsRN/ee/ZTuB7XuDgi45sPnaU+Zl57DhPHdN5wAKhHZP5Mf7F9yqK/fa8/L1180iKG4yvwzkqnn9teOZr333+Opw2RsUEQ587ZJlmvjL0Tyxsc88cN+iNMJ92t/vmhvtUjNLMM4HTxBdmjix5hS57nnci1NjcgVHl8cmvMppynBTvxvP7uOcALPDdD+ozSjEEH3IMn3Urj/+LX1uB8YjlwYUP5rFsy7fulgaLiuGiBh+Y/osvYDGUahB8oYaR1zvnuz1oxkvr0BZDXn88z5SR83WKNXQ3yC0p3a9em5AzwYUvKhgjvzRdL6a9o65uMq8c1wj4wJgSh8SRsO81kS52El/KGBPSTlj7o2G96fh47NQZuBL4VO7A10Ydw56+Jvvp+aGemX9DjQlf4sjXdM3ahO8tmvO4AR+ViRV9au1+ke+KY7+M36J6W0U0vy7S1SDde11E97+ZhZOuW5vCYTZ2WLYRI34+uDKizqRvL7Vm6Np10ZTVNmXCfxvr+37uZT93zDjhld+cj7JQPhgMsO6a0pLUpm3/qyPKovNDb9ubfv5L+7lM58cu2CDd3JsiTt+B/Nxd8NnYbPoR+KTz4xdQH9Hf
+   eJzFljtOw0AQhncDeTRAE7CShh4uQMs1OAMVVUiCKGjpkLgAF4iIIb4EUNFwhHQIQY1H3pHH45192EH80q/I3vXOl9mZtROtVOLx67bdZ53CfP4w9xPzfkCcWGMcYKGCa7gPbCmJL80Hpbo9L//fz7oeR1LaYH4M59CsP3Os+dIPjx/D6WMEJjTqcwMsUt3y/T/wsM0Zm61+QG+E+YTNmQfyTVWd0cU3yj3WYXwXXaWOhRqbC4wuXpRrj1e5M13dX3j2YcsTTIgNuhvUx2n/xuwx8uEez0ysU0sOIX9tFVuDlA9te74NH2eyMfr4MHf/xSfVIPKNdLm30h5wvpud9ry+HPL6c51VnK9jeuh2UFhS1pMZ6TvHxTfWdS7OuyldKfuaNBbnw/sZu/4LPmlNHi8xLCtdsq0I86Exjn80rLcQvomFD5mwZ7OI7w+bOo4znbJI55+PL2QPm/asT+mG+KhcrDgGvftFviuOCMd1QAzkw55wabJb1KBU1zGC+Y95zEvl5sSzJYQPNN4r52GOmvQ4/V7IDOeUzYGewV4N5YMcIhP95fdca733Ci/6hc+7VU70Uvv5eL0CHz8LbHORAW27B1qQ2rS9PzJdP6OlmDG+71a97he/dJzL9X5z5cyXUz7PFntt8vSd1Mdi+ThLDJtPPwIf1MzSwvcLyvwheQ==
   </data>
  </layer>
  <layer id="3" name="Clutter" width="40" height="26">
@@ -25,17 +25,17 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJyllz1vE0EQhueQnSgIG6OgmIPCpS+WIVCAKCG/A5CgpkJCNkFA/gFQ8tHxB5BwTAR0qSEFEaFLDwIpSY+Y1e3o5uZmP85+pVd7vq99bmZ2NuklAD3r7hwege55RWxjPH6E3nDc9ycD+Is+RB9lBRd/TjJdWcrH36fK77o7BLg3rMe3YudLE/2+pVWAk+gWur1a8NFz55L4eD1Btqc1+EwMJjhuWT4+zyd2/HUxH9MBwPlBfkzPTRU+GTep0HXiW2F5Ir4LC4Ul31Vku2b5eH5DtajFl2rAxzcR+TXvud6oGqB6zPNbZy3FiuqP59dVg5p4fuuu93n5uh2cl9nkd9rRLSXn5znu1vh+4iNLPtIwKY+kQ6zxI/SxUusjMZKIL3Z9aHzmnVpcSI9b+fgcxxfol63qNdIN7Jc30etZ/jvUa2P5YnSxDXAJvdZ233MLuW6j71g+vqZm4aP4a4zLOMfZTH8X5eszXv8i7nnQLN45idivXHxyz5Jaw3kvO/hI+3j9p73nGNfUvxNlvp0sPoau/JJ53z6zoPdF4x+O8+Rl1ucPsmoMPjj4Ug9byvKt9cTTdg81c1B8fNq2o9y3jVxrOQ2wcUttMHO+ZxifTZtfquFvjcLdpNzXfeJ8IY3b+rea35zvDbK9zcrXTQ0aDWr0Zo1P67cUg7Gnh/hq01ef+40wH8+f1m9JPj7SO0d8KL4UP9rr+HdprHJP8/Vb4pP7g2+Pk3xGO6I/UX60HPQC9Rezj/CYd9jfxR+RYzur8h0E+ievb977ZpUr5t+RYy/L4/CwWcSd1vH9Zm6fQnxabxmBuwdtQm7eT4xN/OS5XfT7RT+fr8/5OHhflzZ8FBseIzO+6gO87ufHu4G1K+MX2uv4/wC+58zcJi7cv+y4hWzTfnF+Vr6Y/cT1rGTzOaT/W07H9w==
+   eJytlrtvE0EQxtfIzkMixijIzpmC0ivrQkgBogT+DkCCGhokdMYOj46OQBmgS0WHhGMsoKMGCiICVXqoID1iRrejnRvP7tkWI33ae+zjd3O7326rYkyrRG3QHlMyY/1Qm2mijA01Aj2GutaVQ2XMPjzPTP585MbeXM7LX8d9G9SN1Jib6fx88vsp9qvFtkPBuObqrijjLLHr+8D2IC32PQvfGmv3TmmTdOEbuvl1032DbIeBeYsF5XUevtMLXhSfFvPyPLBdYHzUbgvu70XUV8bHOdAMMIbmG/JdrE4KQ143A31oIn7JqfHF+pH/KRb0f8uUCM6+6GMevlYD1iIT/t9RQxeu3Yz1n4nxMqZEyYFkJP8p46NIK8WS4jfM8T+gI2UtZKKkGDoPwvVBa30Wvi3X56hhgjFwHW9D+RT0bMV7yEAYzCVrzGXQFZvf98zkPOR83L81Pi3/oVivG3MWtFEP17kKXNdA161n0eZ5Ipj49RmFU/ODVRjjlNU5yO/ew/sPos6dWl7if+G+ruVwWj6NcQPGPRfgoziA999dnSNYU3+PFfk+Wj2HsXUc4uOedXJB90XUt8Bz0irz+UOF740peqnGlwQU8sQTqc8J5ScWY1fi+hiYYr84N6TXcz7kkOeCJ7Agt5eKZxIe3NM430PIzyPr62B8rnrxswzvl5hDa7Yt6qewN64v+/te3X8rD7znfC+A7aUtvsc5iNGN+II8OyWCD3Ot+S3loCc8hNtcbG7G5ucBO7PJfA4ZH+WO+60MyafFbiA/lF/KX899N/8uzkoh97SY3/5wzHJ/iO1xkg+D/IWC/o/2D8rOLHLv1HLIc95g5/a3wDG2k3yHJf7J5/esZyqNL5Tzr8Cxb/M83K35vNM6fgX5ulWLn6HL+HCe8D0E+Wh/j52TuZ+gMH/y2RfQ68U4F1+7fclick+i8yQp5lNt1xfmhQsDy52OMc87+fXtiKdrfeMeMq5MxxE72+LYmBeun67cA7ZRxz+fhut/CvkkW0yxwP7+Ac3T4hA=
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
-  <object id="48" template="../obj/treasure.tx" x="122.611" y="290.898"/>
+  <object id="48" template="../obj/treasure.tx" x="142.944" y="306.398"/>
   <object id="50" template="../obj/enemy.tx" x="181.5" y="221.5">
    <properties>
     <property name="enemy" value="Armored Knight"/>
    </properties>
   </object>
-  <object id="51" template="../obj/treasure.tx" x="135.833" y="53.833"/>
+  <object id="51" template="../obj/treasure.tx" x="176.166" y="54.6663"/>
   <object id="57" template="../obj/enemy.tx" x="469.833" y="71.8337">
    <properties>
     <property name="enemy" value="Bear"/>
@@ -56,7 +56,7 @@
     <property name="direction" value="right"/>
    </properties>
   </object>
-  <object id="67" template="../obj/gold.tx" x="140.978" y="184.022"/>
+  <object id="67" template="../obj/gold.tx" x="416.978" y="181.522"/>
   <object id="68" template="../obj/enemy.tx" x="471" y="285">
    <properties>
     <property name="enemy" value="Kor Warrior"/>
@@ -72,18 +72,31 @@
     <property name="enemy" value="Armored Knight "/>
    </properties>
   </object>
-  <object id="71" template="../obj/enemy.tx" x="177" y="94">
+  <object id="71" template="../obj/enemy.tx" x="176" y="107.5">
    <properties>
     <property name="effect">{ &quot;startBattleWithCardInCommandZone&quot;: [ &quot;Nahiri Boss Effect&quot;]
 }</property>
     <property name="enemy" value="Nahiri"/>
    </properties>
   </object>
-  <object id="72" template="../obj/treasure.tx" x="399.107" y="62.4997"/>
+  <object id="72" template="../obj/treasure.tx" x="142.274" y="323.667"/>
   <object id="73" template="../obj/enemy.tx" x="446.557" y="366.341">
    <properties>
     <property name="enemy" value="Armored Knight "/>
    </properties>
   </object>
+  <object id="77" template="../obj/door_down.tx" x="119" y="286.5">
+   <properties>
+    <property name="teleport" value="maps/map/nahiricave.tmx"/>
+    <property name="teleportObjectId" value="67"/>
+   </properties>
+  </object>
+  <object id="78" template="../obj/door_down.tx" x="469" y="53">
+   <properties>
+    <property name="direction" value="down"/>
+    <property name="teleport" value="maps/map/nahiricave.tmx"/>
+    <property name="teleportObjectId" value="58"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/nahiricave.tmx b/forge-gui/res/adventure/Shandalar/maps/map/nahiricave.tmx
new file mode 100644
index 00000000000..06c68c85210
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/nahiricave.tmx
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="46" height="25" tilewidth="16" tileheight="16" infinite="0" nextlayerid="10" nextobjectid="68">
+ <editorsettings>
+  <export target="wastetown..tmx" format="tmx"/>
+ </editorsettings>
+ <tileset firstgid="1" source="../tileset/main.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <layer id="7" name="background" width="46" height="25">
+  <data encoding="base64" compression="zlib">
+   eJzt1EsOgCAMBFAWbrwYx/cW3sO4MCEEaqcdPlGadAf1QalxDyGuXPnjrMVol9U98xm0cWx9Dd71t/dJqV5p/5tDCsYZU3dpXalGrbY2NG5NL1N37jgBT7ofNUu91b4r5P4Y92x1eyySDTFY5rs0n0w3akcjn1GNCf0+26wJ9C6ZbnRtbZ/W4nV7++OZfa/BMxfW/wDjPbeoPauZ1UPvO57V3dLPrN3T3bJ/oz1fdl+Y8gOQ
+  </data>
+ </layer>
+ <layer id="9" name="Tilelaag 4" width="46" height="25">
+  <data encoding="base64" compression="zlib">
+   eJxjYKAfCJSlo2WjYBSMglEwAOAcy0C7gDTwjBNCg9xNa7cv56CuHSC3w9xNK7fTymzkcKcmoHV4POXEFFvAjso/xkqamfRIe6NgFIyCUTAKRsEoGAUjGQAAmOwSmQ==
+  </data>
+ </layer>
+ <layer id="8" name="Tilelaag 3" width="46" height="25">
+  <data encoding="base64" compression="zlib">
+   eJztlEEOwjAMBHsAFX7DO3gg5974CUfehKoqwrJMvNs4ViOxkqU2ddaTOOk05WmZtxhNf+5cZXO/T3awOgo3u4ZMboS5NzdbL+JsFBVmyf06f8OrjyqTWXJ7PWX2ukWSuYRmXsdq9eT4/erX3NMjLYtRPpeo7fPzgjOz3LqXMiTfjTwH6zvKizL+6i0yjv6b9p5XtBbKaOWw9RlmdB1ejucfze3Ns3Ie6nttDsPBcrfke+tFvVkG9m60zmfE3r0o3yMyI/5Rnr3Ug9vy7aFI70zuSGnuUTQi9wfig/q9
+  </data>
+ </layer>
+ <layer id="6" name="Tilelaag 1" width="46" height="25">
+  <properties>
+   <property name="spriteLayer" type="bool" value="true"/>
+  </properties>
+  <data encoding="base64" compression="zlib">
+   eJztl0FqwzAQRVXIwoIeputuC63x7brpFUKcnqWXaK30GM1gfTyejqyRagSBfhiInEjz9KWRHOfaqffODb5hwp30z91WrbnHzrmziPeufJzW3L2S69OXz6ElN3k9XXO9xvbFr+PUzXOwsNdya+ttYX66n9vfSs4Qn4H9lBhz7H6PMWbWC98Tw8dhHVvMpGM3+6oxc3HfJTvmL5mn2B6UuXDeYxwTny8bLEEZMydtz4CP18OZMRMHzWfLW+pLz3PMUOl+7GNO3kfWNHIjiPn5Gi9+7SevHxLaFgXD/oBG5hU8x7OHwxLSd4ovv/SVPu15Bmn1PbGxsfbwH6F5qfkvua3nVY4xJfANfvGa11SNl9hnWCcL/6jUifSHeyfrSNZUjZdB9LHsGRr3za1ZU/s9MHbqI88ELV+Id0OOhbNb6o2vkWV9QsL/FDf6WFisv+P3AnlSWhtyDjW1ZZW8q6SsZ6JUYOx7vFdKZn4nyahlluykx7vl+V/O5tS7wt4Cu6XOLcL9QCo5J2tUcgfnxLlJe+yLFuLct/S/NTDuW/CZ9AO3tOux
+  </data>
+ </layer>
+ <objectgroup id="4" name="Objects">
+  <object id="53" template="../obj/treasure.tx" x="120.5" y="177"/>
+  <object id="58" template="../obj/entry_up.tx" x="695" y="136">
+   <properties>
+    <property name="teleport" value="maps/map/nahiri.tmx"/>
+    <property name="teleportObjectId" value="78"/>
+   </properties>
+  </object>
+  <object id="59" template="../obj/enemy.tx" x="320" y="189">
+   <properties>
+    <property name="enemy" value="Cave Spider"/>
+   </properties>
+  </object>
+  <object id="60" template="../obj/enemy.tx" x="405.5" y="284.5">
+   <properties>
+    <property name="enemy" value="Horror"/>
+   </properties>
+  </object>
+  <object id="61" template="../obj/enemy.tx" x="204" y="235">
+   <properties>
+    <property name="enemy" value="Skeleton"/>
+   </properties>
+  </object>
+  <object id="62" template="../obj/enemy.tx" x="441.5" y="199.5">
+   <properties>
+    <property name="enemy" value="Water Elemental"/>
+   </properties>
+  </object>
+  <object id="63" template="../obj/enemy.tx" x="649.5" y="190">
+   <properties>
+    <property name="enemy" value="Zombie"/>
+   </properties>
+  </object>
+  <object id="64" template="../obj/gold.tx" x="681" y="244"/>
+  <object id="65" template="../obj/gold.tx" x="498" y="322"/>
+  <object id="66" template="../obj/gold.tx" x="147" y="312"/>
+  <object id="67" template="../obj/door_right.tx" x="45" y="395.333">
+   <properties>
+    <property name="teleport" value="maps/map/nahiri.tmx"/>
+    <property name="teleportObjectId" value="77"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/scarecrow_farm.tmx b/forge-gui/res/adventure/Shandalar/maps/map/scarecrow_farm.tmx
index c7a809204d8..4f21defa57d 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/scarecrow_farm.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/scarecrow_farm.tmx
@@ -10,7 +10,7 @@
  <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="11" name="collision" width="33" height="24">
   <data encoding="base64" compression="zlib">
-   eJxjYKAfCGSlo2V43EANd4jyI7ADH/luoTYg1S3UcgOyvddwmCnOghtTC8DMwuWGgQDU9N8oGAXkAMNBkB8GgxtGASooYIfgwQBgbsGFR8EoGAVDCwAAAuYKwA==
+   eJxjYKAfCGSlo2V43EANd4jyI7ADH/luoTYg1S3UcgOyvddwmCnOghtTC8DMwuUGWoEubtxy1PTfKBgF5ADDQVD2DgY3jAJUUMAOwYMBwNyCC4+CUTAKhhYAAE4eC1U=
   </data>
  </layer>
  <layer id="1" name="Background" width="33" height="24">
@@ -28,7 +28,7 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJy9lbtvE0EQxjfE57soR0FBEuyKBPlF7EhI/AG0dEiho09AlFQ0gHgnJHEgEjRIVLQUCYYeBLJARGnpAAUKnjEPQcd82h3d3HrXPoWIkT7t3d7tzG9m5/ZagVKtDFoOlbo67FfbPJ+I/fqVd8/D/0d69on0mfQln40Ba10MLo5DQ3r+/i6lZgbcDNdp/RxpnnQj9NfiO/HdChP9oftJGpdoPBXpWAdV2upmBAObXQ/4LtP6CqlKqkW992OOfM2TrpB+5nX+YEEs3MPAccJcn9lN7BaXiyGrwFChNdU4zfAjr/PEHNcdcX9bdWOthP/G8IzWPDcMU+NpBuZgIV+8088aPWrPOpvTej2Y+FcqqcNN0p7BbiHfa/TedKk3A/wtWX14uKjH4ZpSMWmRYjXC9BoY+vFkpHvSpXrofyYFf3VPLcoUv1JL8j1Ce/BkQMdHfpjbLCj13qEPBf38IuVzychnpdhdCwj2iMajI0rNRjovaS93mAG1mKZ8m6EWM8BwLmyY3toQPdY2TE/N/eY2GeT3zvVoWjVBLTj2FvGMBVrVIT3uC9IsMOzVTJSNgb93e08mo/Q3w3FxjXpBYIDxc2Y5oLqZ5LxtpTgRGB6aOIumzgthEhM6nk/Wtq3+kKySiQ017Dgk42+Z/9UU5b9G58GoR61cwuDqEx8T7htRt7gPOD7yR/xO0O2T7ViQrsOrcS3JIpk4FnJbN/N8xmCUjJw/4i/vT3zYOTLDrDifcIYxi08yNox5ZE2kfzu2vMY7j3NpLtTkDX2Pbz16V3Dvb8vyw/5lPFkP2IO9ac7bZaXulLMxYN3d2F1Tad8Cdx+OkUbMteyVVYq/lpHhqxUPewGGLP+ULHrR5//UJK3mdI3XrX2V59h2dbmo63COxvMeXSjqeNhbZrgX/38G1z53dpAB/4Z+DLLHeTw9odRfR6Z21g==
+   eJy9lbtvE0EQxifE57vIpqAgBLvCkJwdYkdC4g+gpbMUOvoERElFA4iXwyNxAAkaJCpaigRDb6eIQERp6QAFCp4xD0HHfNod3d7enu1AxEg/7d3t3c43j9tteUStAVjyicbzRBMOQmYtZb7CdJhV5meWqM1j2XoH63/guY/MJ+ZzNl1DW69ns6o1uOYxd2SE6GqO6NEuotmhpA6sP8/fX2duMDf99Fx8Y313/IjffD/F4yKPpwPl6zDFrapHaBBDPsYtDSF/X2YqzGTQux7XeK0GM8/8yKr4oQW+cA+DjpP6+uxu1m7pcmkYFLMn0AOi4Xs20ib64PeXlTfhrlW37WpoG3WeLkUa7D4IdQ/inX5W65F74VxG8WpY1VVqK3m4zewZToJ4G/zezERvDVhv0erDo0U15iaJ8swC+6r50TfIAQz9eCpQPemi6qfPmaB21ZRchOy/PBnFe4x9t4eUf8SHZ5sFoncO3hfU/CWO57ImzaS/7FwA2FMej48SzQUqLtNe7LAG5GKG4236CtEAw76woXtrw+ixNa2po2u6+Q8aAGoi+WhaOUEuxPcW6xnzFJURNe734lqkVrPB9jTYNZkK4v+M+MU18gWgASbzouUQJTWZz81nuDbPFvT7E+1nQef5lh/5BCeyyVqImVpNTeILOew6MM+2LX1eTXP8K7wf7EuhlYk0uPokTRPua0GSjuUf8cN/10uuKVb34nl4WVKYWkxN4guxYa9v5OKYGiV++F86EK1hxyga5oz9CXuYaEkD5jrfzZygZnXP7du8xjvPMnFdyMlr/h/fpPC24K4v6tqwzru6F/dn5gP2eG9c572Q6H44mAZ89yCfzKmdl6+euw/HmFF9bfbKMvtfGVDDF6vH1ktKwyBnyiA873M+NZnljMrxulVXcx/7W64UVR7O83ghhYtF5Q+1FQ0P8/9fg6vO3R3UgLOhnwazx2U8c5DoD3L5idM=
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
@@ -60,7 +60,7 @@
     <property name="enemy" value="Scarecrow"/>
    </properties>
   </object>
-  <object id="63" template="../obj/enemy.tx" x="354.896" y="52.7154">
+  <object id="63" template="../obj/enemy.tx" x="352.229" y="67.0487">
    <properties>
     <property name="enemy" value="Squirrel"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/slime_hive.tmx b/forge-gui/res/adventure/Shandalar/maps/map/slime_hive.tmx
index e9cb5a86113..3f38d718eeb 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/slime_hive.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/slime_hive.tmx
@@ -12,12 +12,12 @@
  </layer>
  <layer id="10" name="sublaag" width="37" height="23">
   <data encoding="base64" compression="zlib">
-   eJy1lj1uwzAMhbXYgfNTdO7egxQFuvcWvUKm9hQdfZYepVPmHKEgFAIP7CMp2c4DHmxTNvWZVOSMp1LGwD87bnvP68N2bmW5DNUeE15jftQ9mdi9NhYx4TUT4/k4/mdSRUzsnZkOj9wRE9bJ9qzFmXB+FmMsyoH+HEv5GtsY1zJZLjunnIs0jucen6fvqTrrHauJzf8yVEfPXIaSKmKSuJc/6sXvbd7zYXsmHRdla1v0dKzH510148rE6oKM8ltXI4+M7W/O8ivXe45Dmawt07VUZ88pix73Zm2uYRK/TdUek8eI0pp64y0c6Hmq+6xw9dbJymPr4cG9v5cJ1xv2cCkT+xYpk82p82uPbd89Jta7iE847LXkZ+8ZMWmczcnyWNv/DoypOHVSHpz/Wni817r3sLpp7oxJe2xjWzPNUx8T87yCq4UJ11ULzz24bO96OKyjtc3WsQj3AByT74vkxO/NEnssS/wHYQ/U7g==
+   eJy1ljFuwzAMRbXYgZO0yNy9BykKdM8tcoVO7Sk6+iw5SqfMOUJBKAQ+2E9Sip0PfNimbOqZVOSMT6WMgc8bbnvP+/N6bmW5DNUeE15jftQjmdi9NhYx4TUT4znt/zOpIib2zky7A3fEhHWyPWtxJpyfxRiLcqC/xlK+xzbGpUyWy84p5yKN47nH5+lnqs56x2pi878N1dEzl6Gkipgk7uWPevF7m/dztz6TjouytS162dfj66aacWVidUFG+a2rkUfGtjdn+ZXrmONQJmvLdC3V2XPKosetWZtLmMQfU7XH5DGitKbeeAsHep7qPitcvXWy8th6eHDv72XC9YY9XMJkv0XKZHPq/Npj23ePifUu4hMOey352XtGTBpnc7I81va/A2MqTp2UB+e/Fh7vte49rG6aO2PSHtvY2kzz1MfEPC/gamHCddXC8wgu27seDutobbN1LMI9AMfk+yI58Xtzjz2We/wHYwbUuA==
   </data>
  </layer>
  <layer id="9" name="slim" width="37" height="23">
   <data encoding="base64" compression="zlib">
-   eJydlm1ugzAMhqnWbYS20i6xK+wGlIqT7AY7Ev06xK6x7s+kfnGGaj+GRd7xYhxKa8lKlID92EmcRFFX5q7RzNVjKfVz6ossXK1anma23iPCso6jaBvXvouqLb1f9IcyiZ2NtyV2mekWZuRnX+nRtwffTz3vcSAT5xlMrIgd7AfXtSEq/54qPXtdVd9+Ptea0twyrlswWTFzntfe5+TFVrEnqpmwj5hbcgKmnGxD99SXmDn/wl+q2ENM4u8y7eYbueS1EBYI8oSYViqu3FhDLRZPSnnQsqB99B/rY/sbyQfnsIibtdQ50TL366yZSoqV1+CgWMDzlUTRjvQ76XJujfg0C1Qz5a49/zBrq14LkY9J3f54jp3BlA7IT4gppTnrPz5vZ+Ob1+eGS0TYoH3C5+JoML1Pa/9or2lIsJbCY/GzZMa83oNzatk39i/2sLSJj0fEOjPX2ENM8IOzhj5qNmyKf9ZQLYGgjxqFWLg2b+Lu2dHxlWptrBg0W6J4mEvzgfFtZH+Hb1FDNA/OAaSIm3oIxf0SypXF1DeG8dEsvIdPrqkBe9e+x5k7d+19yLEwK+LncStm5Ee/HaxciaTKf3aFyfJv5Sk1ciJ2LoZP2C9UDJjHXcpjY+OtA4YksI7MhJqF/c9MImDSdR7+rXrFXGDBuvE7h4Xtwyf+zZV93H+lGu8T2B7PuvsR+yNz7fcD5nU9LwzfQ2t3iOvXePdwTvC2Q+1exu13Ydnj+xYe/ofPrgjHrffjvXfZrUz6jW6dr6H6B2+d87s=
+   eJydlm1ugzAMhpnWrYS20i6xK+wGKRUn2Q12JPp1iF1j3Z9J/eIM1X4Mi7zjxRhKa8lKlID92EmcRFFb5q7W1FVjnvoZ9UUWrlItzzNb7xFhWcdRtI0r33nZFsEv+kOZxM4m2BK7zHQLM/KzL/UY2kPo+8B7HMjEeQYTK2IH+8G1bYjKv6dSz0FX5bef40o9zS3jqgWTFTPneR18Tl5sFXuimgn7iLklJ2DKyDZ0T32JmfMv/IWKvYtJ/F2m7Xwjl7wWwgJBnhDTSsWVGWuoxeLxlActC9pH/7E+Nb+RfHAO87heS50TLfOwzpqpoFh5DQ6KBTxfSRTtSL+TNufWiE+zQDVT5przj7Om6rUQ+ZhU7U/g2BlMfkB+upg8zVn/8Xk7G9+8jmsuEWGD9gmfi6PB9D6t/KO9pl2CtRQei58lNeb1HpxTy76xf7GHpU1CPCLWmbnG3sUEPzhr6KNmw6b4Z+2qJRD0UaMQC9fmTdw+Ozq+Qq2NFYNmSxQPc2k+ML492N/pbzUPzgEkj+t6CMX90pUry0/fGI/z2rOeXF0D9q55jzN35pr7kGNhVtRQHrdiRn7028HKlYhX/tMrTJZ/K0/eyInYuRg+YT9XMWAedymPjYy3DhiSjnVkJtQs7H9mEgGTrvPwb9Ur5gIL1o3fOSxsHz7xb6bs4/4r1HifwPZo1t6P2B+pa74fMK/reW74Hlq7u7h+jXcP5wRvO9TuZdx8FxY9vm/h4X/47Ipw3Ho/3nuX3cqk3+jW+Rqqf6YK8do=
   </data>
  </layer>
  <layer id="12" name="clutter" width="37" height="23">
@@ -25,7 +25,7 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJzNlkFOwzAQRQ0SYBeCuuQusE1b9QTchVNwANhSKDdimbb0GHhwvjKZ2rGNg9ovjZI2jv38ZzKJUn/TzHTnten/PpZSmWami9i1kn3JNcZgGhoX0u7ChW+uEFNozQ+t1FrEpy5jktpm8FAsbFxPlXqx415tvFmefaJPNPZdx5lyeDjT/ZlSDzYak+4TjZUeNAneDvH87s8ev43bL7Hl+BTS18Qd4SM4YyySed76lSvki+5F3N04LuljChOdb9pcERM8yhH32MeFOltGaggiFqon7Ae1dFl1IYWa5oLHCPhGXLTPlU5jgicL039+SCEm5Pi8cj0Eov08VW4e6VsdYeFMTZs3mm/ZrsX9kz2dP6e1GI/1aU7qb1vT/2/DaiSlH8Mv7r8U76/IMR0n08PAHOSbrDG537k5ZCGf92ytkLhHIVG+MCfCV/s8l9IH+LyO8IApxh2SrHte6+jX3NP/Emplpfu9GP2Te+HLb44er/LZkG/UoG/dEqYSDa1H155vh6+n8I71LbuLzHMM/0p0Ct/4UMp7IeW9MaZ+AIaemRA=
+   eJzNllFSgzAQhqMzVVLF6aN30Veo0xN4F0/hAfTVar2Rj7SVYzRr+IdlS8hGcOo/swMtIfny77JgzO9U2va8sN3fp5KWqbRtxK6N2ZdcYwqmoXEh7Wc++uYKMYXW/MiM2Yj4zMYxSe0SeCgeXFwtjHlx415dvDmeWukTjX3P4kwpPJzp7syYexeV1ftEY6UHlcLbIZ6f/bnjt/X7JbYUn0L6mvsjfARnjEUyLxu/UoV80b2I22vPJX3UMNH5tskVmOpEb7jHfVyos1WkhiBioXrCflBLF3kbUqhpLuwHAd+Ii/K3znRMqBti4s8PKcSEHJ/nvodAtJ+n3M8jfSsiLJypavJG862atbh/sqfz57QQ47E+zUn9bWe7/21ZjWj6Mfzi/kvx/ooc03G+OA7MQb7JGpP7XdpjFvK5ZmuFxD0KifKFORF9tc9zKX2AzxvGE3rmSgV3SLLuea2jX3NP/0qolXXW7cXon9yLvvym6PEynQ35Rg3KdccyjdHQenTt+Wb4uoZ3qm/ZfWSeU/g3Rv/hGx/SvBc0740pdQCOCZmI
   </data>
  </layer>
  <objectgroup id="11" name="obj">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/wastetown..tmx b/forge-gui/res/adventure/Shandalar/maps/map/wastetown..tmx
new file mode 100644
index 00000000000..51befc25a29
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/wastetown..tmx
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="26" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="77">
+ <tileset firstgid="1" source="../tileset/main.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <layer id="1" name="Background" width="40" height="26">
+  <data encoding="base64" compression="zlib">
+   eJzVltsJhTAMhgsq4oDnwUkEp3AyQXALl5CCgsTUJG3a5gj/g5KaL7e24+DcGKm1fYtjg9mG1qdI4pey1eaj/N6+MF5ubNo8kIuqN/bfFDYu53HJ2x/tN1/om5QvNpecumvVWKP2kE+zByV9QM2AJBZK/onhw/pDOu8lxOXLXV8uH+Qs3YeS/IXsStZac6/Lzfd8n5hzV4PXs1nly8X26+rH9k98W2Obz3r+oPzcaTLm2Ae/+GL9LX1ajJDP0hlP3elmZ4MP8137HJXcde81e6PLcAIa5vV6
+  </data>
+ </layer>
+ <layer id="2" name="Ground" width="40" height="26">
+  <data encoding="base64" compression="zlib">
+   eJztlkEKgCAQRWdRkd2x6HRBpwiCtl2kK0SmlDSFiYQxEznw0IWLxx8dXATAmNCgC+91dTmAVE5QAFRig8oN+2G0U688Z7VORNlZnYtjX4t7fwrKvY8mt2v/XQyWO8Apd+/+BOgHrtB+oTJ90/EPfmYGSsLZ7MyPeDb7wN3vC3B9H1/xi0Qikae0Gb2DiyY9Q+nh8uLg5wNnP3MW/0l1rewQO7c=
+  </data>
+ </layer>
+ <layer id="7" name="Mountain Walls" width="40" height="26">
+  <data encoding="base64" compression="zlib">
+   eJzFlrFOwzAQhu1Cmy7AUojahR1egJXX4BmYmEpbxMDKhsQL8AIVLTQvAUwsPEI3hGAmp+TU6+V8tpMifulXFcfxfT3fOUmtManHr9uyz1qF+fxe7ifm/YA4scY4wEIF1zAObHMSH+c/W1MRzmvCy/+3FMeleY35MZy9cv2xsuZLEh4/htPHCExo1OcGWFx1y+vlwMM2YWz8edQbYT5hcyaBfCNTZdT4+rkHNozvom3MsaPGJg5GjRel7fEid2bX9xeefdjyBFP47rrV+7R/Y/YY+XCPxyXfqZBDyF9TxdYg5UNLzzfh40wSo48Pc/dffK4aRL6+Xe2taw84381Oc15fDnn9aWcV52uVPXTbLexS1nEz0neOxjewVS7OuyldGXlNGovz4XjGrv+Cz7Umj5eWLAu7YlsQ5sPSeP1Rs95C+IYCHzJhz2YR3x+SWsqZTllc598m+Or2rE/zAL7YGtNY8R707hf5rjgiHNcBMZAPe0LTcLeoQVddxwjmP+YxL43OiWdLCB9osLeahzmq0+P0eyErOUdsDvQM9mYoH+QQmegvH9PWeu8UniaFz9vrnOiZ9fPxegU+17lIx5ABLY2BpqQ2pfdHZqtntJQTiVXzfXvdy6T4pfe5tPebljNfTvk8KfayzNN3Wr0Xy8dZYth8+nHwQS/MBL5fKrUfNg==
+  </data>
+ </layer>
+ <layer id="3" name="Clutter" width="40" height="26">
+  <properties>
+   <property name="spriteLayer" type="bool" value="true"/>
+  </properties>
+  <data encoding="base64" compression="zlib">
+   eJytlrtvE0EQh9fIzkOKjVGQ7TNFSp8sh0ABogT+DkCCGhokZHMOj46OQMmjo6JDwj4soKMGCiICVXpSQXrEjHZHNzee3btYjPTT7u3d7X43Ozs37Yox7QJ1QVOmqMQ7UyHtmTJWtA4qBT2CZ2PXThTOBMaHxo6nbu2zq7Y9WMuzXh8Yc2OwOJ/8drLdav7diWDsuGfryjorrH8P2O4P8nMfha/D3nuvvBP1Yc/7tt9i+9cR66HfQkZ+XYTv1FImss/Ltj0HbOcZH723Ddd3A0qU9TEGWh5GX7wh34XqvNBkv+WZQxPxS06NLzSP3KeQ8f3VYlc789uCcVG+dhPOIhPub9rURRy4Nmposj5dkyLFB5KR8k8RH80/qORb0m+I8T+gw7X8OGccKj7HNfB81NlYWb5Zxc6ZNufXJI3rtt2B9gnoad3mEH6PdDE25hLocmzXHJn5OOR8PH9rfOR/HxvXZsOY06Cthv+ZK8B1FXQtzli0OI8EE+9vePZZrrUOa5yMdY4Dt8cf4P5H8cztml0P94Xndc2HZfk0xi1Y94yHj7QH93+4Zw7hTP09luf7FOs+DJ1jHx+KYuXEkp4XUd8946R1luf3Fb63Jp9LNb7II19OPO7+8Qnbv5DNXIvnY2zy82JsyFzP+ZBD1lGP4UDurNi+xpcwcb4H4J+H7ixQbvlSzTSp6PUHMfvObNfFGtkA/o2bq9n1qJF9Kze85nwvgO1lnL+PMYjWV76TTNZQkeDDvMfzLRn5gPjIeB0Vis1QfO6xmo3XjmgTxtd1e8jzrTTJp9krj3/Iv+S/kftu/l2clUz+03i+lfbTMY8Fu+ZzHx8a5Rcy2h9tD4pqFvnv1HzIfd5kdfs74JjF83z7sQkaj++j1lQan8/n34BjN7Z+uFPL/E7n+DX462bNxpnPivgof3C+UI1MuZznExT6T459Bb1ZDnPxekCyYB9zEtWTCRsrqh/RL1xo2D7rGfO8Z/u3Ajldm3fD5ZiyHCE29AvXL9dOgS3tZeNluP6nkE+yhRQynO8fyez+Ug==
+  </data>
+ </layer>
+ <objectgroup id="4" name="Objects">
+  <object id="48" template="../obj/treasure.tx" x="168.611" y="342.398"/>
+  <object id="50" template="../obj/enemy.tx" x="181.5" y="221.5">
+   <properties>
+    <property name="enemy" value="Armored Knight"/>
+   </properties>
+  </object>
+  <object id="51" template="../obj/treasure.tx" x="176.166" y="54.6663"/>
+  <object id="57" template="../obj/enemy.tx" x="469.833" y="71.8337">
+   <properties>
+    <property name="enemy" value="Bear"/>
+   </properties>
+  </object>
+  <object id="58" template="../obj/enemy.tx" x="339.5" y="288.167">
+   <properties>
+    <property name="enemy" value="Kor Warrior"/>
+   </properties>
+  </object>
+  <object id="59" template="../obj/enemy.tx" x="417" y="198">
+   <properties>
+    <property name="enemy" value="Dwarf"/>
+   </properties>
+  </object>
+  <object id="61" template="../obj/entry_right.tx" x="602.5" y="313.5">
+   <properties>
+    <property name="direction" value="right"/>
+   </properties>
+  </object>
+  <object id="67" template="../obj/gold.tx" x="277.978" y="162.522"/>
+  <object id="68" template="../obj/enemy.tx" x="471" y="285">
+   <properties>
+    <property name="enemy" value="Kor Warrior"/>
+   </properties>
+  </object>
+  <object id="69" template="../obj/enemy.tx" x="290.5" y="222.5">
+   <properties>
+    <property name="enemy" value="Kor Warrior"/>
+   </properties>
+  </object>
+  <object id="70" template="../obj/enemy.tx" x="176" y="145">
+   <properties>
+    <property name="enemy" value="Armored Knight "/>
+   </properties>
+  </object>
+  <object id="71" template="../obj/enemy.tx" x="176" y="107.5">
+   <properties>
+    <property name="effect">{ &quot;startBattleWithCardInCommandZone&quot;: [ &quot;Nahiri Boss Effect&quot;]
+}</property>
+    <property name="enemy" value="Nahiri"/>
+   </properties>
+  </object>
+  <object id="72" template="../obj/treasure.tx" x="149.607" y="343"/>
+  <object id="73" template="../obj/enemy.tx" x="446.557" y="366.341">
+   <properties>
+    <property name="enemy" value="Armored Knight "/>
+   </properties>
+  </object>
+  <object id="75" template="../obj/entry_right.tx" x="120.5" y="288.5">
+   <properties>
+    <property name="direction" value="right"/>
+    <property name="teleport" value="maps/map/nahiricave.tmx"/>
+    <property name="teleportObjectId" value="57"/>
+   </properties>
+  </object>
+  <object id="76" template="../obj/entry_right.tx" x="472" y="61">
+   <properties>
+    <property name="direction" value="right"/>
+    <property name="teleport" value="maps/map/nahiricave.tmx"/>
+    <property name="teleportObjectId" value="58"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>