From d2bbad2683d75b7799f983dc8ed77e8930996625 Mon Sep 17 00:00:00 2001 From: Simisays <67333662+Simisays@users.noreply.github.com> Date: Mon, 6 Mar 2023 20:08:10 +0100 Subject: [PATCH] update --- .../Shandalar/maps/main.tiled-session | 67 +++++++++---------- .../Shandalar/maps/map/kiora_island.tmx | 6 +- .../adventure/Shandalar/maps/map/nahiri.tmx | 15 ++--- .../Shandalar/maps/map/nahiricave.tmx | 20 +++--- 4 files changed, 53 insertions(+), 55 deletions(-) diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session index 06dce0a0277..c421a160ada 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/scarecrow_farm.tmx", + "activeFile": "map/main_story/white_castle.tmx", "automapping.whileDrawing": false, "expandedProjectPaths": [ - "map", - "obj", "tileset", - "map/main_story" + "map", + "map/main_story", + "obj" ], "file.lastUsedOpenFilter": "All Files (*)", "fileStates": { @@ -40,7 +40,7 @@ "scale": 3, "selectedLayer": 4, "viewCenter": { - "x": 245.83333333333334, + "x": 245.66666666666666, "y": 136.16666666666663 } }, @@ -62,8 +62,8 @@ "scale": 2, "selectedLayer": 4, "viewCenter": { - "x": 459.25, - "y": 319.25 + "x": 399.75, + "y": 319.75 } }, "map/barbariancamp_1.tmx": { @@ -2032,10 +2032,10 @@ 4 ], "scale": 2.177083333333333, - "selectedLayer": 2, + "selectedLayer": 0, "viewCenter": { - "x": 239.54066985645937, - "y": 136.19138755980865 + "x": 155.02392344497608, + "y": 136.65071770334927 } }, "map/kobold_mine.tmx": { @@ -2436,10 +2436,10 @@ 4 ], "scale": 1.5, - "selectedLayer": 3, + "selectedLayer": 5, "viewCenter": { - "x": 383.66666666666663, - "y": 383.66666666666663 + "x": 301.99999999999994, + "y": 383 } }, "map/main_story/white_castle_f1.tmx": { @@ -2449,8 +2449,8 @@ "scale": 3, "selectedLayer": 4, "viewCenter": { - "x": 286.5, - "y": 176 + "x": 245.33333333333331, + "y": 447.83333333333326 } }, "map/maze_1.tmx": { @@ -2610,11 +2610,11 @@ "expandedObjectLayers": [ 4 ], - "scale": 2, + "scale": 3, "selectedLayer": 4, "viewCenter": { - "x": 319.75, - "y": 208.25 + "x": 106, + "y": 253.83333333333331 } }, "map/nahiricave.tmx": { @@ -2624,7 +2624,7 @@ "scale": 1, "selectedLayer": 4, "viewCenter": { - "x": 368.5, + "x": 643, "y": 200.5 } }, @@ -2894,8 +2894,8 @@ "scale": 3, "selectedLayer": 4, "viewCenter": { - "x": 259.5, - "y": 288.5 + "x": 263.83333333333337, + "y": 191.83333333333331 } }, "map/skullcave_1.tmx": { @@ -2929,7 +2929,7 @@ "scale": 3, "selectedLayer": 4, "viewCenter": { - "x": 504.8333333333333, + "x": 295.83333333333337, "y": 183.83333333333331 } }, @@ -3125,30 +3125,29 @@ "map.tileWidth": 16, "map.width": 90, "openFiles": [ - "map/aerie_1.tmx", "map/nahiri.tmx", "map/nahiricave.tmx", + "map/aerie_1.tmx", "map/aerie_1B.tmx", - "map/graveyard_2.tmx", - "map/garruk.tmx", - "map/scarecrow_farm.tmx", - "map/slime_hive.tmx" + "map/aerie_1C.tmx", + "map/main_story/white_castle_f1.tmx", + "map/main_story/white_castle.tmx" ], "project": "main.tiled-project", "property.type": "string", "recentFiles": [ - "map/aerie_1.tmx", "map/nahiri.tmx", "map/nahiricave.tmx", + "map/aerie_1.tmx", "map/aerie_1B.tmx", - "map/graveyard_2.tmx", - "map/garruk.tmx", + "map/aerie_1C.tmx", + "map/main_story/white_castle_f1.tmx", + "map/main_story/white_castle.tmx", + "map/kiora_island.tmx", "map/slime_hive.tmx", "map/scarecrow_farm.tmx", - "map/swamp_town.tmx", - "map/grove_4.tmx", - "map/lavaforge_2.tmx", - "map/lavaforge_1.tmx" + "map/garruk.tmx", + "map/graveyard_2.tmx" ], "resizeMap.removeObjects": true, "textEdit.monospace": true diff --git a/forge-gui/res/adventure/Shandalar/maps/map/kiora_island.tmx b/forge-gui/res/adventure/Shandalar/maps/map/kiora_island.tmx index 84b0bfc65a1..e41245ea372 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/kiora_island.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/kiora_island.tmx @@ -7,12 +7,12 @@ - eJy9lTtOxDAQhgeJtRdBKJA4BgViC64Ap1nB0lBtCVRU227NQyI3yAGogXLPwAUQM4p/2ZnYjqNFjPQriu2Zz/NQsm+JDlgV65BV/5OeWM+sF9Zroc+NIbrfI3pg3bGuzXjuakL0GVHOJ2Z/zQ3fS2xbbk5D3PDs0rYqqRnykx4OcY5VjBRXz22OK09hp/bH5KvnNuULfx0npZMd7/dm+9yLKdHltMuN1SrFS+2Bq9fD/l6Zfr4yX6LG1XFhuv4bXv9xPouq21/cGzGXkXxjcyV3XZPX16SN9aG4sb7mcgyV486t1zn7n1aeJVyw5fyRjdf93fh8V+4Oa8pzv3e7eUO185VYM9Oen6lv48bFmVvPQtxY/iV2puYB/dTfU/AQ+9H2Z7Khcq424d5Wvr+wWnFRc/2/24YbGthhPmCKwv/dmDoPcUMDF31uqN8L0S8+a/oe + eJy9lb9OwzAQhw+J2kUQBiQegwHRgVeAp6mgLEwdgYmpa2f+SOQN8gDMwNhn4AUQd4p/snOxHUdFnPSpapK7z+ezkn1LdMBUzCFT/xNPzDPzwrwW5twYovs9ogfmjrk2472rCdFnhFxOLP7aG/4viW29OYa84bNL21KyZ+hPZjjkOVY1Ul59bnNe+RV36v6YfvW5TeUiX9dJcbLj895s33sxJbqcdr2xvUr5Uvfg1dfD+V6Zfr9yvoTG7ePCdPM3fP3H5Syq7nyxbtRcRvqNnStZ65o8X5O21ofyxuaa6zEk551bzznnn1beJV64hSMb3/d34/tduTWsKe/93u32DWqXK7Vmpn1+pt6NG1dnbr0LdWP9l8SZOg+Yp36fwofaj2oG8kxD5V4d4r2t/HwRtfJiz/X3bhtvGHCH/cAphN+7Mfs85A0DXsy5of4shF8B8frL - eJytlD1OxDAQhWd/ksmmYkHUUACiAglRcIQtgL0AcAq4AEKBasuVgDMA4gYIaCNRgGipwx0Q8+REcRxn17F2pKc4ztjfxDPjaUBedtcnWu8SrXXbrdvLeVNP7mRQqo19eHDPQ6KLsMostBMT7cbue+ncw4joxTg3sI5l/l7ONRmUsrGhL8f/2A8VC0K+Em3tZ6Def6MqcxHcVa7uN+Ty2xLXeSZ7RIvhmutsbMS2wvb/da3veVzYQVDVH6u8Y3zSIzoVZTJ31SG6FD1xfY9Z3O3Y7ZxQ0/A/ilTNQeA+shsThvMCGzGf9dRcIjFfi246df/vQPkXQn5HefxDRyYMfZQZ/huSo03RliVXJhfxLrNSG7NxX4X3JnpvqJGM/VizuLh3TemGfjfj9LFxVNbxc0O/PrDi485Cr6R5D9325+/fZEU9ozbHlnvJdkelWu+CjZ6CfLi6fqh8FmNdOnei+bn2UBNXZ5pcvKeWNeC34f4DqEaAgw== + eJytlL9OwzAQxq8tidNMFMRaGACxABJi4BE6ULpXwFPACyAUmBgrAc8AiDdAwBqJAcTKDO+AuE+OZcdxwDE96VMT1+ffxfdnElGQXc0QLbWJFtvN/LYK3iSQe9HVamIvAdyjmOg4LjOVNlKizdT/LJO7mxA9WPcG1h6vX/O9Zl0tFxt68/yO7ViyIOQrM3xfI/n+lZSZ0+AuiPJ5PaH/mxVVns0e0HS4tp+Ljdjmhft7fev7Ly5sJyrrW8i843m/Q3TA6rNOW0QnrDtRPeM37lrqd0+oaewfJrLmoDHX3a3wY8JwX2Aj5sOOXMs45jPWeau6/z2S+5WQ30ERf8+TCUMfrVvnL3OOVlirjlzZXMQ7J6SaGLifls8j855YzzU10g9k2VzkRhnmri3T0O9jay3ERomu4/uafr0Rko+ZhV7Jix66/Adf1TNqc+SYS64ZlRu9CzZ6Cgrhmvog/aueTeXWzFD7fHuojmsybS7ec4cP+E24P6PWfGc= @@ -20,7 +20,7 @@ - eJxjYGBgKOdloBuooJNdn1hoZ3YVHj9MYCXOjIXM5NtDSXzZI4VLCdScSizmVdMxTcAANn89YyDNLcSqhakrGQB/0goghx8rEekLHWBLB6SCxXjspWVYOxKR3+lV9gxXwMYNoelZXxCbn/GVyeiAknSIy+8w8WcUmIlsNilhTE66BgApvhNH + eJxjYGBgKOdloBuooJNdn1hoZ3YVHj9MYCXOjIXM5NtDSXzZI4VLCdScSizmVdMxTcAANn89YyDNLcSqhakrGQB/4gOv2MnXixx+rESkL3R7saUDUsFiPPZSK6yxhZEjEfmdXmUPDFASl5SYQy170QEbN4SmZ31BbH7GVyajA0rSIS6/w8SfUWAmstmkhDE56RoAwkMY7Q== diff --git a/forge-gui/res/adventure/Shandalar/maps/map/nahiri.tmx b/forge-gui/res/adventure/Shandalar/maps/map/nahiri.tmx index 3c15c1a65a9..8fa9293dde1 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 @@ - + @@ -25,7 +25,7 @@ - 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= + eJylVj1vE0EQ3SA7HxIxRkHnOPwAr6wLgSKIEvI7AAlqaJCQnTNfHR2BkkBHlQ4J54ggHTVQEBGo0kMF6VFmdDvaufHsnm2e9LT3sbf77u3M7LZmjGlVcAW4y9iesH/oG0LoufZOYw58Cn2ta4eBOXumeJ67OS4tFO3v0/4b5K3UmNupUVGlXft/wkGtPNZQaFx2fReVeefZ9UPQ9igtjx2Cpm+ZffdB+abdhX/oFtdJ4DsE+hYD+TqNvvOznoTPc0W7DtouK/oewP1mhJkyP8ZAosRcSBvpu1IbJUJeJ4ExNJJ+qZPrG2ccuU4xJEquamwLnZkYYxp9rSbkIiOub97UibnbY3Pya7ontl0Oyv/kuRtbY66PkM6UW8IfiPG/wGMlF3qiJQxdDcL8oFzX4iTmJ2rMmyaIgRt4C9rnwBeLvoYMRIG5ao25BtywxX3fjMZhouip0jcOVhvGXACuNcJ9roOuG8Cb1muhOssh631MH1KrB0swxzmr66B69xHe74s+9+pFi2vN67r0cBJ9msY1mPdiQB/hEN7/cH2OIaf+nSrr+2R1D6fRx2vW2Vm9LiK/B54Tl1idP1L0vTOjOTyOvlg8nkm9J+RPDHuuxfwYmLI+jI0q/+S54Bkk5NZ8+UzCwWsa1/cY/HlifR/El5onP8vwcUlziCuifwp74+qCv+83/L9y4D3X9wq0vbbl9xiDiG6kLkiPZD7jGmr1ljzoixrCy1wsNmPxecjObNLPoeIdr7cSUp+GNwF/yF/yr+/+m/8X10qQ8R+rtz+dZrk/xPY4qQ9B9YVA66OtQdV+IfdOzUPueZOd29+Djj07qu9I1M+WmJvH96T7maYv5Pk30HFgCx/u173vlMc74NedevwMXaUP44TvIaiP9vfYOZnXEyT6J599Bb6di+vi+jKpxfiaRO8y5VtZo3As9IUTge3LjjHbneL6bqCmj7PnZqa6Xob2GZwbfeH85dpd0JZ3/PNJtf0vUZ/UFmPIP2pPAOHq4Qo= @@ -36,7 +36,7 @@ - + @@ -85,17 +85,16 @@ - + - + - + - - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/nahiricave.tmx b/forge-gui/res/adventure/Shandalar/maps/map/nahiricave.tmx index 06c68c85210..c4663010246 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/nahiricave.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/nahiricave.tmx @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - eJzt1EsOgCAMBFAWbrwYx/cW3sO4MCEEaqcdPlGadAf1QalxDyGuXPnjrMVol9U98xm0cWx9Dd71t/dJqV5p/5tDCsYZU3dpXalGrbY2NG5NL1N37jgBT7ofNUu91b4r5P4Y92x1eyySDTFY5rs0n0w3akcjn1GNCf0+26wJ9C6ZbnRtbZ/W4nV7++OZfa/BMxfW/wDjPbeoPauZ1UPvO57V3dLPrN3T3bJ/oz1fdl+Y8gOQ + eJzt1EsOgCAMBFAWbrwYx/dMxoUJMQVnyvCJ0qQ7rK+WGvcQ4sqVP85cjHZ53TP3gMax9TXUnr+8d5bqWc+/OUqh6DF1W+esGrnaaCBuZJap2+OwXKy5NFv0XtW6vWbWbdVX2BiDZ7+t/VS6WTsbzx1FTOz71WYk2G+pdHt7RPYY3Z2W55l+Vf8I5t2q+XoTiRa1ZzWrZlh7j2d1t/Qra/d0t5zfaM+X3Sf+6QIE @@ -30,12 +30,6 @@ - - - - - - @@ -64,10 +58,16 @@ - + - + + + + + + +