3 files changed, 66 insertions, 101 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 5d9d9c8c..4ce593a8 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -1,58 +1,18 @@
-//================= Hercules Configuration ================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2014-2016  Hercules Dev Team
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Hercules map configuration file.
-//=========================================================================
-// Used to know which maps are currently being supported by Hercules
-//=========================================================================
-
-// Maps that are in map_list but are not supported by your server
 map_removed: (
-    //"mapname",
 )
-
-// Added maps
 map_list: (
+    "000-0-0",
+    "000-0-1",
     "000-0",
     "000-1",
-    "001-1",
-    "000-0-0",
     "000-2-0",
     "000-2-1",
     "000-2-2",
     "000-2-3",
+    "000-2-4",
+    "001-1",
     "001-2-0",
-    "001-2-2",
-    "001-2-3",
-    "001-2-4",
-    "001-2-5",
-    "001-2-6",
-    "001-2-7",
-    "001-2-8",
-    "001-2-9",
+    "001-2-1",
     "001-2-10",
     "001-2-11",
     "001-2-12",
@@ -61,10 +21,9 @@ map_list: (
     "001-2-15",
     "001-2-16",
     "001-2-17",
-    "test",
-    "001-2-1",
     "001-2-18",
     "001-2-19",
+    "001-2-2",
     "001-2-20",
     "001-2-21",
     "001-2-22",
@@ -73,9 +32,9 @@ map_list: (
     "001-2-25",
     "001-2-26",
     "001-2-27",
-    "testbg",
     "001-2-28",
     "001-2-29",
+    "001-2-3",
     "001-2-30",
     "001-2-31",
     "001-2-32",
@@ -85,9 +44,15 @@ map_list: (
     "001-2-36",
     "001-2-37",
     "001-2-38",
-    "000-2-4",
     "001-2-39",
+    "001-2-4",
     "001-2-40",
     "001-2-41",
-    "000-0-1",
-) //map_list
+    "001-2-5",
+    "001-2-6",
+    "001-2-7",
+    "001-2-8",
+    "001-2-9",
+    "test",
+    "testbg",
+)
diff --git a/db/map_index.txt b/db/map_index.txt
index 7ecd699e..e853bd75 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -1,54 +1,54 @@
-000-0 1
-000-1 2
-001-1 3
-000-0-0 4
+000-0-0 1
+000-0-1 2
+000-0 3
+000-1 4
 000-2-0 5
 000-2-1 6
 000-2-2 7
 000-2-3 8
-001-2-0 9
-001-2-2 10
-001-2-3 11
-001-2-4 12
-001-2-5 13
-001-2-6 14
-001-2-7 15
-001-2-8 16
-001-2-9 17
-001-2-10 18
-001-2-12 19
-001-2-13 20
-001-2-14 21
-001-2-15 22
-001-2-16 23
-001-2-17 24
-test 25
-001-2-1 26
-001-2-18 27
-001-2-19 28
-001-2-20 29
-001-2-21 30
-001-2-22 31
-001-2-23 32
-001-2-24 33
-001-2-11 34
-001-2-25 35
-001-2-26 36
-001-2-27 37
-testbg 38
-001-2-28 39
-001-2-29 40
-001-2-30 41
-001-2-31 42
-001-2-32 43
-001-2-33 44
-001-2-34 45
-001-2-35 46
-001-2-36 47
-001-2-37 48
-001-2-38 49
-000-2-4 50
-001-2-39 51
-001-2-40 52
-000-0-1 53
-001-2-41 54
+000-2-4 9
+001-1 10
+001-2-0 11
+001-2-1 12
+001-2-10 13
+001-2-11 14
+001-2-12 15
+001-2-13 16
+001-2-14 17
+001-2-15 18
+001-2-16 19
+001-2-17 20
+001-2-18 21
+001-2-19 22
+001-2-2 23
+001-2-20 24
+001-2-21 25
+001-2-22 26
+001-2-23 27
+001-2-24 28
+001-2-25 29
+001-2-26 30
+001-2-27 31
+001-2-28 32
+001-2-29 33
+001-2-3 34
+001-2-30 35
+001-2-31 36
+001-2-32 37
+001-2-33 38
+001-2-34 39
+001-2-35 40
+001-2-36 41
+001-2-37 42
+001-2-38 43
+001-2-39 44
+001-2-4 45
+001-2-40 46
+001-2-41 47
+001-2-5 48
+001-2-6 49
+001-2-7 50
+001-2-8 51
+001-2-9 52
+test 53
+testbg 54
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index 639955b9..a87de671 100644
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat