From 754ee7fb44a72e15ac2abbb13f47e9122cf13c9c Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Tue, 7 Mar 2023 15:33:16 +0100
Subject: [PATCH] fix

---
 .../Shandalar/maps/main.tiled-session         | 29 +++++++-------
 .../Shandalar/maps/map/nest_blue_1.tmx        | 38 +++++++++----------
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
index 33b1e1bb9c8..b48752f88ad 100644
--- a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
+++ b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
@@ -3,12 +3,12 @@
         "height": 4300,
         "width": 2
     },
-    "activeFile": "map/scarecrow_farm.tmx",
+    "activeFile": "map/nest_blue_1.tmx",
     "automapping.whileDrawing": false,
     "expandedProjectPaths": [
-        "map",
-        "map/main_story",
         "tileset",
+        "map/main_story",
+        "map",
         "obj"
     ],
     "file.lastUsedOpenFilter": "All Files (*)",
@@ -2629,11 +2629,11 @@
             }
         },
         "map/nest_blue_1.tmx": {
-            "scale": 0.75,
-            "selectedLayer": 4,
+            "scale": 1,
+            "selectedLayer": 1,
             "viewCenter": {
-                "x": 401.3333333333333,
-                "y": 400.6666666666667
+                "x": 509,
+                "y": 282.5
             }
         },
         "map/nest_white_1.tmx": {
@@ -2991,8 +2991,8 @@
             "scale": 3,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 239.83333333333331,
-                "y": 136.16666666666663
+                "x": 377.66666666666663,
+                "y": 117.83333333333334
             }
         },
         "map/tileset/buildings.tsx": {
@@ -3111,7 +3111,7 @@
         },
         "tileset/main.tsx": {
             "dynamicWrapping": false,
-            "scaleInDock": 1,
+            "scaleInDock": 2,
             "scaleInEditor": 1
         }
     },
@@ -3132,7 +3132,8 @@
         "map/aerie_1C.tmx",
         "map/main_story/white_castle_f1.tmx",
         "map/main_story/white_castle.tmx",
-        "map/scarecrow_farm.tmx"
+        "map/scarecrow_farm.tmx",
+        "map/nest_blue_1.tmx"
     ],
     "project": "main.tiled-project",
     "property.type": "string",
@@ -3145,10 +3146,10 @@
         "map/main_story/white_castle_f1.tmx",
         "map/main_story/white_castle.tmx",
         "map/scarecrow_farm.tmx",
+        "map/nest_blue_1.tmx",
+        "map/teferi.tmx",
         "map/kiora_island.tmx",
-        "map/slime_hive.tmx",
-        "map/garruk.tmx",
-        "map/graveyard_2.tmx"
+        "map/slime_hive.tmx"
     ],
     "resizeMap.removeObjects": true,
     "textEdit.monospace": true
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/nest_blue_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/nest_blue_1.tmx
index 4fd0b84029c..7ed776794ed 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/nest_blue_1.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/nest_blue_1.tmx
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="50" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="60">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="50" height="27" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="65">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="50" height="50">
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <layer id="8" name="Tilelaag 4" width="50" height="27">
   <data encoding="base64" compression="zlib">
-   eJzt2sENQEAQQNG9CjpQjyLohb5EcSK4EQ6GT/5P5rrjZcVJVaRU/WS+ng5WOljpYKWD1VOOvT19GXt+dHc+/1aEY1zPq7OUuvx89x37I++jKRfLUUOxDNXRXnxv5ruah+p4Y7ffXVY6WOlgpYOVDlY6WOlgpYOVDlY6WOlgpYOVDlY6WOlgpYPV3xzR/3RF7tlmAhh4JgU=
+   eJztzjEBAAAIA6A9BrJ/OVvoISQgAQAAPuu6HgAA7Bv7+gA3
   </data>
  </layer>
- <layer id="1" name="Background" width="50" height="50" locked="1">
+ <layer id="7" name="Background" width="50" height="27">
   <data encoding="base64" compression="zlib">
-   eJzt2TEKhTAQRdE0Im7c0jW4GtfhUkQkiEHEmIE3I7c4xe/eZQrhZ+5TmgEAvzYNJ/WWr7vvqPe17o/QUtPgreXLdm8d0Rta93voGI0a1B1/ucddS3mvmmZ1h+X91PusWtTbLHrUeyxa1DsAAAAAxLV0B/WOlv3qDTQAQHxruv7O38cI38mn/2/LDm8tb9449tvk+3jsqH2zyT2eWizeoSw6NnJlVqQ=
+   eJzV1jsOwjAMBmAvCMFZWDghG2PPwmm6lqOgDFEt41cSp0kjWUKomP+r08d6AViN+lx9NXJZBsmxjY39t0odKf9ZHSlzzn/meWQHnoXX4bmucP+SanFIfWoNUY7NYdH60H6e3O/bXrUGarEcpf1K78dRlhZH/j3OK513zVFrAejjkAweR8tcAH3GuUv2lJY959cs0Y7aKj3/kqPlGo9wcDOwHAtz/EiHZMAObZ/N4tAsX9hLm9UsDmrB3z/u/HGco8YS7ZDqydzzIi0jHXR+1DKj42U8g6hj1n2VHB7LLNe5Zen1P0c7evU+0hHxXj7KoT3nZ3do2XtZoh3WuxNXS7An0pDX0bNJ6weoMmc/
   </data>
  </layer>
- <layer id="2" name="Ground" width="50" height="50">
+ <layer id="2" name="Ground" width="50" height="27">
   <data encoding="base64" compression="zlib">
-   eJztmVkKwjAQhgP1oe01xOo5vIULnkc9ghcUl/dapWAGOzQN08UFMsL/wUAT0OTLZPIyxgAAAGAWkTHLqP4+jOrgee3Qvu82imr/d2/fRaTbZdGybwmtLpwDiXNszKWKa1zPa3Fx731XDrLUmJPd/9x+j9OmyyOwR9v5n4VzJ1yXfVLPh/LoqgFymKTyuRPkMrUxS1/jlf2PWwCPrhogtsnL4Rg399tGqFyUPev6591HKI/crrv+cG2pbkK+V5IL3fNNNU+1446ZrKVuQrtsnOBazYWx7zKtfDS9vUOQ8kc+Gt7ed8m9e5YpeHu/wc/NPzowuVBXAAAAAAAAAAAAAEA/3B/R0C97F6m/VkT/0Wce2hsktPQzffr6UhKcHy24DtyboZ7GJe7+HVMoyUvpOOySZowH9tN+5fIEj0FnMg==
+   eJztl81OwkAQxxcxoa0fT+CNCF58CS9+xMRz1fAoHA34CL6BHwffiKMRvGMxJM6knex00i3tMqQk+k/+AdrtMr/OzmxrjL/eO9vjddR07P8cf5dDjtdSExxx25jbtv3+tGtNx7eRgwvjXoCTLP6FiDtp+7FocxTNi4pZ3A+h21osWhz8N+WAS8Y/C4z5Cux5H5ZNcPB1LxlQFH8vMuYT4j+DY90oz/LTEAep6P6jpoG97zwXnOUxtOOrcvDYNThiR+0Sw3GUv++SpQ8+idLxdzDHd418aNW5KwekUZgyfAQ2Xl7bUuusqXU4liv+V95vkhYHSoNjDv9777mH8bohNdmvilhwnQ+yY9fZ/AMxrhcV96u6LJr9ap7FTcZaHbbSc9NOfpxk6Wc8vr1Xu+9KHe2kn1Mxf1H+kMen96I0OPbg2n3wAfjQMY/kQFH+iKen1Ht99QzXvoBfwW+OecawXm4c52Ru6jKgNDjOIcYL8CX4KnCPw5yctqy55qKu6mrT9UHCvRI5ynrQhLmuNskhnxdHgX33kO9NE+PPofn+4Yq9TK49okrf4NLmWPWcVSTKD1eVviGlxcEZ6FkD9+hZSd1zJYy/at/g0uJYMoZxmHc3Kr+WlHj0KZRcV7/dmzZ4
   </data>
  </layer>
- <layer id="3" name="Clutter" width="50" height="50">
+ <layer id="3" name="Clutter" width="50" height="27">
   <properties>
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJzt2U0KgzAQhuFABakgeCwvUne60nTdnqdX6a7HcVEFA+JPGqWaCbwPuAkRvmGSbEYpAADC0KS+ExyjSnwncHMfvulayELIr4dzX3bn5JYpVWTre5d6JIk564+uhqelDkNqLbXjW2T65bpfKtd+AVv175oO/H4AAAAAAAAA8KO9+E7wH9LqKFfmlrackmqwzWTyH/9KqWNpdvyJ5mtmdv66Hptnj/FcfzwHeMfnZfgCQU0WYQ==
+   eJxjYBgFo2AUjIJRMFJAOe9Au4A4UI7MRnJzKZBdPYT8AMPo4uggj4v27iEXgNwbqMXAEKSF6qdyJPmhAnKBfsjTQhVDj6PB6J8yaJrPJZBOhkLc4Evr2PL2YPQDCJQQWQ7B8g5I/RpO2rqJEtDCiEqjA1jeWQv0wzogVhGkn9toAbyB6fAg0A8bgX5ZP4jjhRCA+cMfSCcIDbRryAOgci0O6PZ4IH49iOvC4Qbuo+HhDv4wD7QLiAMLCbhzsPkDV7vEngW3nsHkB3x1uQcBvYPFH9jaVVewhH8p1K+DsS1SihQPZUjss+z0cwMAagwq4A==
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="368.667" y="800.333">
+  <object id="38" template="../obj/entry_up.tx" x="368.667" y="432.333">
    <properties>
     <property name="teleport" value=""/>
    </properties>
   </object>
-  <object id="48" template="../obj/treasure.tx" x="496.063" y="234.378"/>
-  <object id="54" template="../obj/enemy.tx" x="262.332" y="574.667">
+  <object id="54" template="../obj/enemy.tx" x="262.332" y="206.667">
    <properties>
-    <property name="enemy" value="Merfolk Lord"/>
+    <property name="enemy" value="Crab"/>
    </properties>
   </object>
-  <object id="56" template="../obj/gold.tx" x="335.917" y="220.333"/>
-  <object id="57" template="../obj/enemy.tx" x="466.5" y="593.5">
+  <object id="57" template="../obj/enemy.tx" x="388.5" y="381">
    <properties>
-    <property name="enemy" value="Sea Monster"/>
+    <property name="enemy" value="Water Elemental"/>
    </properties>
   </object>
-  <object id="58" template="../obj/enemy.tx" x="339.5" y="232">
+  <object id="60" template="../obj/treasure.tx" x="485.073" y="231.023"/>
+  <object id="61" template="../obj/gold.tx" x="327.927" y="214.977"/>
+  <object id="62" template="../obj/enemy.tx" x="375.677" y="184.811">
    <properties>
     <property name="enemy" value="Bird"/>
    </properties>
   </object>
-  <object id="59" template="../obj/enemy.tx" x="475.25" y="229.5">
+  <object id="63" template="../obj/enemy.tx" x="485.76" y="250.144">
    <properties>
     <property name="enemy" value="Bird"/>
    </properties>