Candor Domain, C006-4

Also contains:
* Self-Made-Problems :tm: , moves all evol tilesets to evol/
* Voice effects for Candor Gates

1 files changed, 112 insertions, 50 deletions

diff --git a/maps.xml b/maps.xml
index bf207c82..d44bcb59 100644
--- a/maps.xml
+++ b/maps.xml
@@ -206,6 +206,15 @@ Copyright (C) 2018 TMW2 -->
 	<map name="006-1.tmx">
 		<atlas name="cave2"/>
 	</map>
+	<map name="006-3.tmx">
+		<atlas name="cave2"/>
+	</map>
+	<map name="006-4.tmx">
+		<atlas name="hospital-main"/>
+	</map>
+	<map name="006-4-1.tmx">
+		<atlas name="jail2"/>
+	</map>
 	<map name="007-1.tmx">
 		<atlas name="mine"/>
 	</map>
@@ -660,10 +669,10 @@ Copyright (C) 2018 TMW2 -->
 
 	<!-- namespace Evol -->
 	<atlas name="ocean">
-		<file name="graphics/tilesets/box.png"/>
-		<file name="graphics/tilesets/box-x1x2.png"/>
+		<file name="graphics/tilesets/evol/box.png"/>
+		<file name="graphics/tilesets/evol/box-x1x2.png"/>
 		<file name="graphics/tilesets/desert_city.png"/>
-		<file name="graphics/tilesets/ground.png"/>
+		<file name="graphics/tilesets/evol/ground.png"/>
 		<file name="graphics/tilesets/sail.png"/>
 		<file name="graphics/tilesets/ship-base.png"/>
 		<file name="graphics/tilesets/ship-flags-x3x2.png"/>
@@ -672,20 +681,20 @@ Copyright (C) 2018 TMW2 -->
 		<file name="graphics/tilesets/ship-indoor.png"/>
 	</atlas>
 	<atlas name="ship">
-		<file name="graphics/tilesets/box.png"/>
-		<file name="graphics/tilesets/box-x1x2.png"/>
-		<file name="graphics/tilesets/candle-x1x2.png"/>
+		<file name="graphics/tilesets/evol/box.png"/>
+		<file name="graphics/tilesets/evol/box-x1x2.png"/>
+		<file name="graphics/tilesets/evol/candle-x1x2.png"/>
 		<file name="graphics/tilesets/carpet.png"/>
 		<file name="graphics/tilesets/indoor-accessories.png"/>
-		<file name="graphics/tilesets/shadow.png"/>
+		<file name="graphics/tilesets/evol/shadow.png"/>
 		<file name="graphics/tilesets/ship-indoor.png"/>
 		<file name="graphics/tilesets/ship-indoor-x2x4.png"/>
 		<file name="graphics/tilesets/ship-indoor-fringe.png"/>
-		<file name="graphics/tilesets/sunlight-x1x5.png"/>
+		<file name="graphics/tilesets/evol/sunlight-x1x5.png"/>
 	</atlas>
 	<atlas name="testarea">
-		<file name="graphics/tilesets/artis-indoor.png"/>
-		<file name="graphics/tilesets/ground.png"/>
+		<file name="graphics/tilesets/evol/artis-indoor.png"/>
+		<file name="graphics/tilesets/evol/ground.png"/>
 	</atlas>
 	<!-- / Evol -->
 
@@ -716,7 +725,7 @@ Copyright (C) 2018 TMW2 -->
 
 	<atlas name="academy-outside">
 		<file name="graphics/tilesets/magecity.png"/>
-		<file name="graphics/tilesets/shadow.png"/>
+		<file name="graphics/tilesets/evol/shadow.png"/>
 		<file name="graphics/tilesets/br/trans_woodland_desert.png"/>
 		<file name="graphics/tilesets/sot/house.png"/>
 		<file name="graphics/tilesets/sot/castle_outside.png"/>
@@ -736,16 +745,16 @@ Copyright (C) 2018 TMW2 -->
 	<atlas name="candor">
 		<file name="graphics/tilesets/night.png"/>
 		<file name="graphics/tilesets/christmas.png"/>
-		<file name="graphics/tilesets/artis-archway-x1x5.png"/>
-		<file name="graphics/tilesets/artis-accessory.png"/>
-		<file name="graphics/tilesets/artis-blockwall.png"/>
-		<file name="graphics/tilesets/artis-fountain.png"/>
-		<file name="graphics/tilesets/artis-fountain-x1x4.png"/>
-		<file name="graphics/tilesets/artis-house.png"/>
-		<file name="graphics/tilesets/artis-lamps-x1x3.png"/>
-		<file name="graphics/tilesets/artis-pavement.png"/>
-		<file name="graphics/tilesets/box.png"/>
-		<file name="graphics/tilesets/box-x1x2.png"/>
+		<file name="graphics/tilesets/evol/artis-archway-x1x5.png"/>
+		<file name="graphics/tilesets/evol/artis-accessory.png"/>
+		<file name="graphics/tilesets/evol/artis-blockwall.png"/>
+		<file name="graphics/tilesets/evol/artis-fountain.png"/>
+		<file name="graphics/tilesets/evol/artis-fountain-x1x4.png"/>
+		<file name="graphics/tilesets/evol/artis-house.png"/>
+		<file name="graphics/tilesets/evol/artis-lamps-x1x3.png"/>
+		<file name="graphics/tilesets/evol/artis-pavement.png"/>
+		<file name="graphics/tilesets/evol/box.png"/>
+		<file name="graphics/tilesets/evol/box-x1x2.png"/>
 		<file name="graphics/tilesets/desert_x5.png"/>
 		<file name="graphics/tilesets/docks.png"/>
 		<file name="graphics/tilesets/docks_x2.png"/>
@@ -790,7 +799,7 @@ Copyright (C) 2018 TMW2 -->
 
 	<atlas name="cave2">
 		<file name="graphics/tilesets/arena.png"/>
-		<file name="graphics/tilesets/candle-x1x2.png"/>
+		<file name="graphics/tilesets/evol/candle-x1x2.png"/>
 		<file name="graphics/tilesets/cave.png"/>
 		<file name="graphics/tilesets/cave2.png"/>
 		<file name="graphics/tilesets/cave2_base.png"/>
@@ -889,7 +898,7 @@ Copyright (C) 2018 TMW2 -->
 		<file name="graphics/tilesets/collision.png"/>
 		<file name="graphics/tilesets/tree-x3x3.png"/>
 		<file name="graphics/tilesets/tree-x3x4.png"/>
-		<file name="graphics/tilesets/box.png"/>
+		<file name="graphics/tilesets/evol/box.png"/>
 		<file name="graphics/tilesets/waterflow.png"/>
 		<file name="graphics/tilesets/woodland_ground.png"/>
 		<file name="graphics/tilesets/trans_woodland_desert.png"/>
@@ -954,8 +963,8 @@ Copyright (C) 2018 TMW2 -->
 	<atlas name="frostia-castle">
 		<file name="graphics/tilesets/blockWalls.png"/>
 		<file name="graphics/tilesets/castle_lightsources.png"/>
-		<file name="graphics/tilesets/candle-x1x2.png"/>
-		<file name="graphics/tilesets/shadow.png"/>
+		<file name="graphics/tilesets/evol/candle-x1x2.png"/>
+		<file name="graphics/tilesets/evol/shadow.png"/>
 		<file name="graphics/tilesets/inn.png"/>
 		<file name="graphics/tilesets/inn2.png"/>
 		<file name="graphics/tilesets/inn_x2.png"/>
@@ -1076,7 +1085,7 @@ Copyright (C) 2018 TMW2 -->
 	</atlas>
 
 	<atlas name="icecave2">
-		<file name="graphics/tilesets/artis-indoor-x1x2.png"/>
+		<file name="graphics/tilesets/evol/artis-indoor-x1x2.png"/>
 		<file name="graphics/tilesets/icecave.png"/>
 		<file name="graphics/tilesets/snow_docks.png"/>
 		<file name="graphics/tilesets/Throne_x2.png"/>
@@ -1111,7 +1120,7 @@ Copyright (C) 2018 TMW2 -->
 
 	<atlas name="lof">
 		<file name="graphics/tilesets/christmas.png"/>
-		<file name="graphics/tilesets/box.png"/>
+		<file name="graphics/tilesets/evol/box.png"/>
 		<file name="graphics/tilesets/casas-cogumelo.png"/>
 		<file name="graphics/tilesets/signs_x2.png"/>
 		<file name="graphics/tilesets/trans_woodland_desert.png"/>
@@ -1244,10 +1253,10 @@ Copyright (C) 2018 TMW2 -->
 		<file name="graphics/tilesets/night.png"/>
 		<file name="graphics/tilesets/christmas.png"/>
 		<file name="graphics/tilesets/accessory.png"/>
-		<file name="graphics/tilesets/artis-dock.png"/>
-		<file name="graphics/tilesets/artis-lamps-x1x3.png"/>
-		<file name="graphics/tilesets/box.png"/>
-		<file name="graphics/tilesets/box-x1x2.png"/>
+		<file name="graphics/tilesets/evol/artis-dock.png"/>
+		<file name="graphics/tilesets/evol/artis-lamps-x1x3.png"/>
+		<file name="graphics/tilesets/evol/box.png"/>
+		<file name="graphics/tilesets/evol/box-x1x2.png"/>
 		<file name="graphics/tilesets/docks.png"/>
 		<file name="graphics/tilesets/docks_x2.png"/>
 		<file name="graphics/tilesets/desert_x2.png"/>
@@ -1352,7 +1361,7 @@ Copyright (C) 2018 TMW2 -->
 		<file name="graphics/tilesets/inn_x2.png"/>
 		<file name="graphics/tilesets/inn_x3.png"/>
 		<file name="graphics/tilesets/inn_x4.png"/>
-		<file name="graphics/tilesets/shadow.png"/>
+		<file name="graphics/tilesets/evol/shadow.png"/>
 		<file name="graphics/tilesets/snow_village.png"/>
 		<file name="graphics/tilesets/woodland_indoor.png"/>
 		<file name="graphics/tilesets/woodland_indoor_x2.png"/>
@@ -1376,8 +1385,8 @@ Copyright (C) 2018 TMW2 -->
 		<file name="graphics/tilesets/lof/woodland_village_winter.png"/>
 
         <!-- Nivalis Port -->
-		<file name="graphics/tilesets/box.png"/>
-		<file name="graphics/tilesets/box-x1x2.png"/>
+		<file name="graphics/tilesets/evol/box.png"/>
+		<file name="graphics/tilesets/evol/box-x1x2.png"/>
 		<file name="graphics/tilesets/docks.png"/>
 		<file name="graphics/tilesets/ship-base.png"/>
 		<file name="graphics/tilesets/ship-mast.png"/>
@@ -1387,8 +1396,8 @@ Copyright (C) 2018 TMW2 -->
 	<atlas name="woodland">
 		<file name="graphics/tilesets/night.png"/>
 		<file name="graphics/tilesets/christmas.png"/>
-		<file name="graphics/tilesets/box.png"/>
-		<file name="graphics/tilesets/box-x1x2.png"/>
+		<file name="graphics/tilesets/evol/box.png"/>
+		<file name="graphics/tilesets/evol/box-x1x2.png"/>
 		<file name="graphics/tilesets/docks.png"/>
 		<file name="graphics/tilesets/lof/woodland_village.png"/>
 		<file name="graphics/tilesets/magecity.png"/>
@@ -1407,9 +1416,6 @@ Copyright (C) 2018 TMW2 -->
 		<file name="graphics/tilesets/woodland_x3.png"/>
 		<file name="graphics/tilesets/woodland_x3_fall.png"/>
 		<file name="graphics/tilesets/woodland_water.png"/>
-		<file name="graphics/tilesets/ship-base.png"/>
-		<file name="graphics/tilesets/ship-flags-x3x2.png"/>
-		<file name="graphics/tilesets/ship-mast.png"/>
 	</atlas>
 
 	<atlas name="woodland-indoor">
@@ -1492,17 +1498,17 @@ Copyright (C) 2018 TMW2 -->
 	</atlas>
 
 	<atlas name="evol-indoor">
-		<file name="graphics/tilesets/artis-accessory.png"/>
-		<file name="graphics/tilesets/artis-accessory-x1x2.png"/>
-		<file name="graphics/tilesets/ground.png"/>
-		<file name="graphics/tilesets/artis-indoor.png"/>
-		<file name="graphics/tilesets/artis-indoor-fringe.png"/>
-		<file name="graphics/tilesets/artis-indoor-x1x2.png"/>
-		<file name="graphics/tilesets/artis-indoor-x1x3.png"/>
-		<file name="graphics/tilesets/artis-indoor-x1x4.png"/>
-		<file name="graphics/tilesets/artis-indoor-x2x4.png"/>
-		<file name="graphics/tilesets/candle-x1x2.png"/>
-		<file name="graphics/tilesets/sunlight-x1x5.png"/>
+		<file name="graphics/tilesets/evol/artis-accessory.png"/>
+		<file name="graphics/tilesets/evol/artis-accessory-x1x2.png"/>
+		<file name="graphics/tilesets/evol/ground.png"/>
+		<file name="graphics/tilesets/evol/artis-indoor.png"/>
+		<file name="graphics/tilesets/evol/artis-indoor-fringe.png"/>
+		<file name="graphics/tilesets/evol/artis-indoor-x1x2.png"/>
+		<file name="graphics/tilesets/evol/artis-indoor-x1x3.png"/>
+		<file name="graphics/tilesets/evol/artis-indoor-x1x4.png"/>
+		<file name="graphics/tilesets/evol/artis-indoor-x2x4.png"/>
+		<file name="graphics/tilesets/evol/candle-x1x2.png"/>
+		<file name="graphics/tilesets/evol/sunlight-x1x5.png"/>
 		<file name="graphics/tilesets/evol/fire.png"/>
 		<file name="graphics/tilesets/evol/fire-cauldron.png"/>
 		<file name="graphics/tilesets/evol/hurns_wood_lab.png"/>
@@ -1530,6 +1536,62 @@ Copyright (C) 2018 TMW2 -->
 		<file name="graphics/tilesets/br/trans_woodland_desert.png"/>
 	</atlas>
 
+	<!-- namespace Hospital-Main -->
+	<atlas name="hospital-main">
+		<file name="graphics/tilesets/abandonned-stuff2.0.png"/>
+		<file name="graphics/tilesets/evol/artis-archway-x1x5.png"/>
+		<file name="graphics/tilesets/evol/artis-blockwall.png"/>
+		<file name="graphics/tilesets/evol/artis-bridge.png"/>
+		<file name="graphics/tilesets/evol/artis-fountain.png"/>
+		<file name="graphics/tilesets/evol/artis-fountain-x1x4.png"/>
+		<file name="graphics/tilesets/evol/artis-indoor.png"/>
+		<file name="graphics/tilesets/evol/artis-indoor-cellar.png"/>
+		<file name="graphics/tilesets/evol/artis-lamps.png"/>
+		<file name="graphics/tilesets/evol/artis-lamps-x1x3.png"/>
+		<file name="graphics/tilesets/evol/artis-pavement.png"/>
+		<file name="graphics/tilesets/evol/artis-sewer.png"/>
+		<file name="graphics/tilesets/evol/dark-tileset-accessory.png"/>
+		<file name="graphics/tilesets/evol/dark-tileset-accessory-x1x2.png"/>
+		<file name="graphics/tilesets/evol/ground.png"/>
+		<file name="graphics/tilesets/evol/hurns-accessory.png"/>
+		<file name="graphics/tilesets/evol/hurns-accessory-x1x2.png"/>
+		<file name="graphics/tilesets/evol/hurns-ground.png"/>
+		<file name="graphics/tilesets/evol/hurns-indoor.png"/>
+		<file name="graphics/tilesets/evol/light-flickering-x1x4.png"/>
+		<file name="graphics/tilesets/evol/shadow.png"/>
+		<file name="graphics/tilesets/evol/swamp-house.png"/>
+		<file name="graphics/tilesets/evol/tree-x1x4.png"/>
+		<file name="graphics/tilesets/evol/tree-x1x5.png"/>
+		<file name="graphics/tilesets/evol/waterfall.png"/>
+		<file name="graphics/tilesets/tree-x3x4.png"/>
+		<file name="graphics/tilesets/tree-x4x5.png"/>
+		<file name="graphics/tilesets/wheel_stand.png"/>
+		<file name="graphics/tilesets/wheel_tileset.png"/>
+	</atlas>
 
+	<atlas name="jail2">
+		<file name="graphics/tilesets/abandonned-stuff2.0.png"/>
+		<file name="graphics/tilesets/evol/artis-blockwall.png"/>
+		<file name="graphics/tilesets/evol/artis-dock.png"/>
+		<file name="graphics/tilesets/evol/artis-indoor.png"/>
+		<file name="graphics/tilesets/evol/artis-indoor-cellar.png"/>
+		<file name="graphics/tilesets/evol/artis-lamps.png"/>
+		<file name="graphics/tilesets/evol/artis-pillar-x1x2.png"/>
+		<file name="graphics/tilesets/evol/artis-sewer.png"/>
+		<file name="graphics/tilesets/evol/artis-sewer-x3x3.png"/>
+		<file name="graphics/tilesets/evol/candle-x1x2.png"/>
+		<file name="graphics/tilesets/evol/dark-tileset-accessory.png"/>
+		<file name="graphics/tilesets/evol/dark-tileset-accessory-x1x2.png"/>
+		<file name="graphics/tilesets/evol/dark-tileset-accessory-x1x3.png"/>
+		<file name="graphics/tilesets/evol/fire.png"/>
+		<file name="graphics/tilesets/evol/ground.png"/>
+		<file name="graphics/tilesets/evol/hurns-accessory-x1x2.png"/>
+		<file name="graphics/tilesets/evol/hurns-cave-accessory-x1x4.png"/>
+		<file name="graphics/tilesets/evol/hurns-ground.png"/>
+		<file name="graphics/tilesets/evol/hurns-indoor.png"/>
+		<file name="graphics/tilesets/evol/hurns-indoor-accessory.png"/>
+		<file name="graphics/tilesets/evol/light-flickering-x1x4.png"/>
+		<file name="graphics/tilesets/evol/swamp-accessory-x1x2.png"/>
+	</atlas>
 
 </maps>