004-2 + other files i hope that block nothing

8 files changed, 37 insertions, 28 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 2744cba00..4a07cbbe2 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -22,6 +22,7 @@ map_list: (
     "003-7",
     "003-8",
     "004-1",
+    "004-2",
     "005-1",
     "005-2",
     "005-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index 00487ebbb..f12fccfba 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -19,28 +19,29 @@
 003-7 19
 003-8 20
 004-1 21
-005-1 22
-005-2 23
-005-3 24
-005-4 25
-005-5 26
-005-6 27
-008-1 28
-008-2-0 29
-008-2-1 30
-008-2-10 31
-008-2-11 32
-008-2-12 33
-008-2-13 34
-008-2-14 35
-008-2-2 36
-008-2-3 37
-008-2-4 38
-008-2-5 39
-008-2-6 40
-008-2-7 41
-008-2-8 42
-008-2-9 43
-aeros 44
-test 45
-testbg 46
+004-2 22
+005-1 23
+005-2 24
+005-3 25
+005-4 26
+005-5 27
+005-6 28
+008-1 29
+008-2-0 30
+008-2-1 31
+008-2-10 32
+008-2-11 33
+008-2-12 34
+008-2-13 35
+008-2-14 36
+008-2-2 37
+008-2-3 38
+008-2-4 39
+008-2-5 40
+008-2-6 41
+008-2-7 42
+008-2-8 43
+008-2-9 44
+aeros 45
+test 46
+testbg 47
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index ba364fa26..2c84929f5 100755
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
diff --git a/npc/000-1/_import.txt b/npc/000-1/_import.txt
index da1819af6..4a59eca0c 100644
--- a/npc/000-1/_import.txt
+++ b/npc/000-1/_import.txt
@@ -1,4 +1,3 @@
 // Map 000-1: Drasil Island
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/000-1/_mobs.txt",
-"npc/000-1/_warps.txt",
diff --git a/npc/000-1/_warps.txt b/npc/004-2/_import.txt
index 61f5ebcb3..741f8a548 100644
--- a/npc/000-1/_warps.txt
+++ b/npc/004-2/_import.txt
@@ -1,3 +1,4 @@
+// Map 004-2: Desert Mountains
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 000-1: Drasil Island warps
-
+"npc/004-2/_mobs.txt",
+"npc/004-2/_warps.txt",
diff --git a/npc/004-2/_mobs.txt b/npc/004-2/_mobs.txt
new file mode 100644
index 000000000..ed9825ccd
--- /dev/null
+++ b/npc/004-2/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2: Desert Mountains mobs
+004-2,36,20,3,3	monster	Fallen Guard	1082,2,35000,150000
diff --git a/npc/004-2/_warps.txt b/npc/004-2/_warps.txt
new file mode 100644
index 000000000..b52d7ca76
--- /dev/null
+++ b/npc/004-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 004-2: Desert Mountains warps
+004-2,19,47,0	warp	#004-2_19_47	0,0,004-1,119,94
diff --git a/npc/_import.txt b/npc/_import.txt
index 734c4ca12..d4958414a 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -21,6 +21,7 @@
 @include "npc/003-7/_import.txt"
 @include "npc/003-8/_import.txt"
 @include "npc/004-1/_import.txt"
+@include "npc/004-2/_import.txt"
 @include "npc/005-1/_import.txt"
 @include "npc/005-2/_import.txt"
 @include "npc/005-3/_import.txt"