From a0e884cbae9732ab0cad97b10a04384e262f11d9 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Fri, 17 Mar 2023 11:35:54 +0100
Subject: [PATCH] update

---
 .../Shandalar/maps/main.tiled-session         | 55 +++++++++++--------
 .../Shandalar/maps/map/cursed_swamp.tmx       | 52 ------------------
 2 files changed, 32 insertions(+), 75 deletions(-)
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cursed_swamp.tmx

diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
index a1874ba0d4f..2071e3aaced 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/grolnok.tmx",
+    "activeFile": "map/cursed_swamp.tmx",
     "automapping.whileDrawing": false,
     "expandedProjectPaths": [
-        "map",
         "tileset",
-        "obj",
-        "map/main_story"
+        "map",
+        "map/main_story",
+        "obj"
     ],
     "file.lastUsedOpenFilter": "All Files (*)",
     "fileStates": {
@@ -1467,6 +1467,14 @@
                 "y": 319
             }
         },
+        "map/cursed_swamp.tmx": {
+            "scale": 1.7317708333333333,
+            "selectedLayer": 4,
+            "viewCenter": {
+                "x": 240.21654135338346,
+                "y": 136.5654135338346
+            }
+        },
         "map/debug_map.tmx": {
             "scale": 3,
             "selectedLayer": 4,
@@ -1818,8 +1826,8 @@
             "scale": 2,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 140.5,
-                "y": 213.25
+                "x": 288,
+                "y": 192.25
             }
         },
         "map/grove_1.tmx": {
@@ -2446,13 +2454,13 @@
         },
         "map/main_story/templeofchandra.tmx": {
             "expandedObjectLayers": [
-                7,
-                2
+                2,
+                7
             ],
             "scale": 1.5,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 465.66666666666663,
+                "x": 465.3333333333333,
                 "y": 405.66666666666663
             }
         },
@@ -2662,8 +2670,8 @@
             "scale": 3,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 410.3333333333333,
-                "y": 324.8333333333333
+                "x": 320,
+                "y": 207.83333333333331
             }
         },
         "map/nahiricave.tmx": {
@@ -2673,8 +2681,8 @@
             "scale": 1.5,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 102,
-                "y": 201
+                "x": 368,
+                "y": 200.33333333333334
             }
         },
         "map/nest_blue_1.tmx": {
@@ -3073,7 +3081,7 @@
             "scale": 2,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 330.75,
+                "x": 248,
                 "y": 176.25
             }
         },
@@ -3084,8 +3092,8 @@
             "scale": 3,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 321.8333333333333,
-                "y": 254.5
+                "x": 368,
+                "y": 223.83333333333331
             }
         },
         "map/tibalt_f2.tmx": {
@@ -3095,8 +3103,8 @@
             "scale": 3,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 186.83333333333331,
-                "y": 120.16666666666664
+                "x": 176,
+                "y": 167.83333333333334
             }
         },
         "map/tileset/buildings.tsx": {
@@ -3249,7 +3257,8 @@
         "map/tibalt_f2.tmx",
         "map/grolnok.tmx",
         "map/nahiri.tmx",
-        "map/nahiricave.tmx"
+        "map/nahiricave.tmx",
+        "map/cursed_swamp.tmx"
     ],
     "project": "main.tiled-project",
     "property.type": "string",
@@ -3258,14 +3267,14 @@
         "map/tibalt_f1.tmx",
         "map/tibalt.tmx",
         "map/tibalt_f2.tmx",
-        "map/nahiricave.tmx",
-        "map/nahiri.tmx",
         "map/grolnok.tmx",
+        "map/nahiri.tmx",
+        "map/nahiricave.tmx",
+        "map/cursed_swamp.tmx",
         "map/slobad_factory.tmx",
         "map/xira.tmx",
         "map/main_story/blue_castle_f1.tmx",
-        "map/kiora_island.tmx",
-        "map/teferi.tmx"
+        "map/kiora_island.tmx"
     ],
     "resizeMap.removeObjects": true,
     "textEdit.monospace": true
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cursed_swamp.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cursed_swamp.tmx
deleted file mode 100644
index 9a31a576657..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cursed_swamp.tmx
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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="7" nextobjectid="56">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <properties>
-  <property name="dungeonEffect">{
-  &quot;startBattleWithCard&quot;: [ &quot;Thallid Shell-Dweller&quot;,&quot;Slimefoot, Thallid Transplant&quot;, &quot;Thallid Shell-Dweller&quot; ]
-}</property>
- </properties>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyL5mVg2MWDH0cRoQaEo4lUBzJPFkjTG0jzjNo7au+ovaP2jto7au/gsJeY+hIZIwNS9SJjAAIUL00=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxbwM7AsGAUj+JRPIpH8SgexSMCAwB2ckzC
-  </data>
- </layer>
- <layer id="2" name="Ground" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9lWsOgjAMx6dO0Ev52Vc4jjcwEj2CCuFGnsJnPIKPldFQmnUTP9CkCVmhv38fYcNYqWEHvho33RdD75lY37hi730ie94ncVfeXzXRfMuBUjfjW61Ko5xDrBq2Z3xfzS4m5NvoOh+wT8ryJZuSWPktq13qM9bIa0BLTN6zwH06dKWE7ePmcVNzW8OePEiOwlMz5eIsqdF+h4z3Y89mLXFRN7DnJMeU7FVbKwLcI5krzPJace9V/xbkTLJZpW+na+20Zmmfc7ZTa215SYB3r+KXQT1nqrMQuPjMuS57mb2fjKy/I8tcMF1cZ4gLvYZcPl7G3oezkM4s0GeJDTsNdUn/Udc3qW7WKu0VZ2MvwX3MUK+y2F1f6N7w3SPcOZsz/+X+crdgr1xMH7erO/gL5SiFxQ==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJy1VctOw0AM9AGk9tATX1ISaIWEyt/wFSgIvo7jJm164WPICI8ycbYpfTDSar1rr8frON7ZnY3wsejl1I1adA9jcyvdpnAZmAW/93OzlcjAthuN2NbCl8Q3se7GS4Y7nlm5b9yj9b3K77ScD/lKG3PF2KfA3CTZw3nc6zH4a8WWMWtuT+Ump959HWyefC6sv+85iHFFX9Qj98g112Xm7KXczF+O3yb2L0UdZtTSs8usr//iBviNd7KHOvs+cu5acdAP+8O1v2tcM5f8n8nd2t/ruMj4OwVNJraUtfyF/hfsicf4G5EP5RT75C2CrpZ97WHlBGcO2iMB9C/2E/hOwp1knuor1eKAwmPc+Rz7Fr83a538lLVvbnxu7byaxBn2bK6JKtT6p9zn62boh+9aBN89vgf7oGe+NVcaD/Xvrn+97deIh3ZbGwI+Yv7ffP0D2AVMNQ==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="208" y="281">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="49" template="../obj/gold.tx" x="209.038" y="33.8697"/>
-  <object id="53" template="../obj/enemy.tx" x="223.924" y="101.602" width="16" height="17.6724">
-   <properties>
-    <property name="effect">{ &quot;startBattleWithCardInCommandZone&quot;: [ &quot;Slimefoot's Boss Effect&quot;]
-}</property>
-    <property name="enemy" value="Slimefoot"/>
-   </properties>
-  </object>
-  <object id="55" template="../obj/manashards.tx" x="194.986" y="34.0645"/>
- </objectgroup>
-</map>