make maps following the clientdata merges

13 files changed, 76 insertions, 23 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index c2b1fa3c..2aea18cd 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -48,11 +48,14 @@ map_list: (
     "001-2-4",
     "001-2-40",
     "001-2-41",
+    "001-2-42",
     "001-2-5",
     "001-2-6",
     "001-2-7",
     "001-2-8",
     "001-2-9",
+    "001-3-0",
+    "001-3-1",
     "008-1",
     "008-2-0",
     "008-2-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index 8317b00d..31ea7eef 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -45,26 +45,29 @@
 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
-008-1 53
-008-2-0 54
-008-2-1 55
-008-2-10 56
-008-2-11 57
-008-2-12 58
-008-2-13 59
-008-2-14 60
-008-2-2 61
-008-2-3 62
-008-2-4 63
-008-2-5 64
-008-2-6 65
-008-2-7 66
-008-2-8 67
-008-2-9 68
-test 69
-testbg 70
+001-2-42 48
+001-2-5 49
+001-2-6 50
+001-2-7 51
+001-2-8 52
+001-2-9 53
+001-3-0 54
+001-3-1 55
+008-1 56
+008-2-0 57
+008-2-1 58
+008-2-10 59
+008-2-11 60
+008-2-12 61
+008-2-13 62
+008-2-14 63
+008-2-2 64
+008-2-3 65
+008-2-4 66
+008-2-5 67
+008-2-6 68
+008-2-7 69
+008-2-8 70
+008-2-9 71
+test 72
+testbg 73
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index cbe84d9d..280915b9 100644
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
diff --git a/npc/001-1/_warps.txt b/npc/001-1/_warps.txt
index 4218e0f6..90a7dc1f 100644
--- a/npc/001-1/_warps.txt
+++ b/npc/001-1/_warps.txt
@@ -442,3 +442,4 @@ OnInit:
     doorInit;
 }
 
+001-1,198,61,0	warp	#001-1_198_61	0,0,001-3-0,198,59
diff --git a/npc/001-2-18/_warps.txt b/npc/001-2-18/_warps.txt
index 0852b8f7..e0342239 100644
--- a/npc/001-2-18/_warps.txt
+++ b/npc/001-2-18/_warps.txt
@@ -1,3 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 001-2-18: Docks Warehouse warps
 001-2-18,39,36,0	warp	#001-2-18_39_36	0,0,001-1,182,75
+001-2-18,39,26,0	warp	#001-2-18_39_26	2,0,001-2-42,39,36
diff --git a/npc/001-2-42/_import.txt b/npc/001-2-42/_import.txt
new file mode 100644
index 00000000..1afffd48
--- /dev/null
+++ b/npc/001-2-42/_import.txt
@@ -0,0 +1,3 @@
+// Map 001-2-42: Docks Warehouse Second Level
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/001-2-42/_warps.txt",
diff --git a/npc/001-2-42/_warps.txt b/npc/001-2-42/_warps.txt
new file mode 100644
index 00000000..d8b06045
--- /dev/null
+++ b/npc/001-2-42/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-2-42: Docks Warehouse Second Level warps
+001-2-42,39,37,0	warp	#001-2-42_39_37	2,0,001-2-18,39,28
diff --git a/npc/001-3-0/_import.txt b/npc/001-3-0/_import.txt
new file mode 100644
index 00000000..320f28ce
--- /dev/null
+++ b/npc/001-3-0/_import.txt
@@ -0,0 +1,4 @@
+// Map 001-3-0: Sewer
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/001-3-0/_mobs.txt",
+"npc/001-3-0/_warps.txt",
diff --git a/npc/001-3-0/_mobs.txt b/npc/001-3-0/_mobs.txt
new file mode 100644
index 00000000..31c8266f
--- /dev/null
+++ b/npc/001-3-0/_mobs.txt
@@ -0,0 +1,17 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-3-0: Sewer mobs
+001-3-0,175,32,2,2	monster	Ratto	1005,2,60000,30000
+001-3-0,201,54,2,2	monster	Ratto	1005,3,25000,10000
+001-3-0,151,97,18,1	monster	Ratto	1005,3,40000,15000
+001-3-0,146,121,3,2	monster	Ratto	1005,2,50000,25000
+001-3-0,101,111,8,3	monster	Ratto	1005,4,30000,15000
+001-3-0,145,68,2,2	monster	Ratto	1005,2,60000,30000
+001-3-0,146,28,2,1	monster	Ratto	1005,2,60000,30000
+001-3-0,90,65,3,3	monster	Ratto	1005,3,35000,15000
+001-3-0,56,50,8,4	monster	Ratto	1005,4,35000,15000
+001-3-0,42,102,3,3	monster	Ratto	1005,3,40000,20000
+001-3-0,145,64,1,5	monster	Blub	1008,2,35000,80000
+001-3-0,162,45,1,3	monster	Little Blub	1007,4,10000,20000
+001-3-0,129,88,2,2	monster	Blub	1008,2,35000,80000
+001-3-0,100,38,2,2	monster	Little Blub	1007,4,10000,20000
+001-3-0,171,45,0,2	monster	Little Blub	1007,4,10000,20000
diff --git a/npc/001-3-0/_warps.txt b/npc/001-3-0/_warps.txt
new file mode 100644
index 00000000..bc37d90a
--- /dev/null
+++ b/npc/001-3-0/_warps.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-3-0: Sewer warps
+001-3-0,196,35,0	warp	#001-3-0_196_35	0,0,001-1,197,35
+001-3-0,172,41,0	warp	#001-3-0_172_41	0,0,001-3-1,34,58
+001-3-0,162,40,0	warp	#001-3-0_162_40	0,0,001-3-1,23,57
+001-3-0,198,60,0	warp	#001-3-0_198_59	0,0,001-1,199,61
+001-3-0,152,55,0	warp	#001-3-0_152_55	0,0,001-1,152,51
+001-3-0,85,130,0	warp	#001-3-0_85_130	0,0,001-1,86,130
diff --git a/npc/001-3-1/_import.txt b/npc/001-3-1/_import.txt
new file mode 100644
index 00000000..6511aab3
--- /dev/null
+++ b/npc/001-3-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 001-3-1: Rivercave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/001-3-1/_warps.txt",
diff --git a/npc/001-3-1/_warps.txt b/npc/001-3-1/_warps.txt
new file mode 100644
index 00000000..f0c3d747
--- /dev/null
+++ b/npc/001-3-1/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-3-1: Rivercave warps
+001-3-1,24,58,0	warp	#001-3-1_24_58	1,0,001-3-0,162,41
+001-3-1,35,59,0	warp	#001-3-1_35_59	1,0,001-3-0,172,42
diff --git a/npc/_import.txt b/npc/_import.txt
index 1f8a3f29..1718dc71 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -47,11 +47,14 @@
 @include "npc/001-2-4/_import.txt"
 @include "npc/001-2-40/_import.txt"
 @include "npc/001-2-41/_import.txt"
+@include "npc/001-2-42/_import.txt"
 @include "npc/001-2-5/_import.txt"
 @include "npc/001-2-6/_import.txt"
 @include "npc/001-2-7/_import.txt"
 @include "npc/001-2-8/_import.txt"
 @include "npc/001-2-9/_import.txt"
+@include "npc/001-3-0/_import.txt"
+@include "npc/001-3-1/_import.txt"
 @include "npc/008-1/_import.txt"
 @include "npc/008-2-0/_import.txt"
 @include "npc/008-2-1/_import.txt"