From 6168199cc453596c73a50d09d4e16736146018f5 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sun, 5 Mar 2023 21:41:27 +0100
Subject: [PATCH] cleanup
---
.../Shandalar/maps/main.tiled-session | 155 +++++++++---------
.../adventure/Shandalar/maps/map/garruk.tmx | 8 +-
.../adventure/Shandalar/maps/map/nahiri.tmx | 33 ++--
.../Shandalar/maps/map/nahiricave.tmx | 74 +++++++++
.../Shandalar/maps/map/scarecrow_farm.tmx | 6 +-
.../Shandalar/maps/map/slime_hive.tmx | 6 +-
.../Shandalar/maps/map/wastetown..tmx | 100 +++++++++++
7 files changed, 280 insertions(+), 102 deletions(-)
create mode 100644 forge-gui/res/adventure/Shandalar/maps/map/nahiricave.tmx
create mode 100644 forge-gui/res/adventure/Shandalar/maps/map/wastetown..tmx
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 @@
- 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=
@@ -25,7 +25,7 @@
- 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==
@@ -40,7 +40,7 @@
-
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 @@
-