add the townhall basement map, fix red plush inn warp

11 files changed, 2 insertions, 132 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index eed6eea0..5a6ed61c 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -49,69 +49,3 @@ map_list: (
     "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",
-    "001-3-2",
-    "008-1-1",
-    "008-1-2",
-    "008-1",
-    "008-2-0",
-    "008-2-1",
-    "008-2-10",
-    "008-2-11",
-    "008-2-12",
-    "008-2-13",
-    "008-2-14",
-    "008-2-15",
-    "008-2-16",
-    "008-2-17",
-    "008-2-18",
-    "008-2-19",
-    "008-2-2",
-    "008-2-20",
-    "008-2-21",
-    "008-2-22",
-    "008-2-23",
-    "008-2-24",
-    "008-2-25",
-    "008-2-26",
-    "008-2-27",
-    "008-2-28",
-    "008-2-29",
-    "008-2-3",
-    "008-2-30",
-    "008-2-31",
-    "008-2-32",
-    "008-2-4",
-    "008-2-5",
-    "008-2-6",
-    "008-2-7",
-    "008-2-8",
-    "008-2-9",
-    "008-3-0",
-    "008-3-1",
-    "008-3-2",
-    "008-3-3",
-    "008-3-4",
-    "008-3-5",
-    "008-3-6",
-    "012-1",
-    "012-2-1",
-    "012-2-2",
-    "012-2-3",
-    "012-2-4",
-    "012-2-5",
-    "012-2-6",
-    "012-2-7",
-    "012-3-1",
-    "012-3-2",
-    "012-3-3",
-    "sec_pri",
-    "test",
-    "testbg",
-)
diff --git a/db/map_index.txt b/db/map_index.txt
index 59a69dbf..643f791b 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -46,68 +46,3 @@
 001-2-40 46
 001-2-41 47
 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
-001-3-2 56
-008-1-1 57
-008-1-2 58
-008-1 59
-008-2-0 60
-008-2-1 61
-008-2-10 62
-008-2-11 63
-008-2-12 64
-008-2-13 65
-008-2-14 66
-008-2-15 67
-008-2-16 68
-008-2-17 69
-008-2-18 70
-008-2-19 71
-008-2-2 72
-008-2-20 73
-008-2-21 74
-008-2-22 75
-008-2-23 76
-008-2-24 77
-008-2-25 78
-008-2-26 79
-008-2-27 80
-008-2-28 81
-008-2-29 82
-008-2-3 83
-008-2-30 84
-008-2-31 85
-008-2-32 86
-008-2-4 87
-008-2-5 88
-008-2-6 89
-008-2-7 90
-008-2-8 91
-008-2-9 92
-008-3-0 93
-008-3-1 94
-008-3-2 95
-008-3-3 96
-008-3-4 97
-008-3-5 98
-008-3-6 99
-012-1 100
-012-2-1 101
-012-2-2 102
-012-2-3 103
-012-2-4 104
-012-2-5 105
-012-2-6 106
-012-2-7 107
-012-3-1 108
-012-3-2 109
-012-3-3 110
-sec_pri 111
-test 112
-testbg 113
diff --git a/maps/re/001-2-40.mcache b/maps/re/001-2-40.mcache
index aa7a507f..d8ec82c0 100644
--- a/maps/re/001-2-40.mcache
+++ b/maps/re/001-2-40.mcache
diff --git a/maps/re/001-2-43.mcache b/maps/re/001-2-43.mcache
new file mode 100644
index 00000000..6a4b463f
--- /dev/null
+++ b/maps/re/001-2-43.mcache
diff --git a/maps/re/001-3-0.mcache b/maps/re/001-3-0.mcache
index fbbd9c66..23321d5b 100644
--- a/maps/re/001-3-0.mcache
+++ b/maps/re/001-3-0.mcache
diff --git a/npc/001-1/_warps.txt b/npc/001-1/_warps.txt
index 90a7dc1f..c084792b 100644
--- a/npc/001-1/_warps.txt
+++ b/npc/001-1/_warps.txt
@@ -121,7 +121,7 @@ OnInit:
 001-1,134,83,0	warp	#001-1_134_83	0,0,001-2-28,60,31
 001-1,118,88,0	script	#001-1_118_88_h	NPC_HIDDEN,0,0,{
 OnTouch:
-    warp "001-2-28", 29, 42;
+    warp "001-2-28", 29, 41;
 close;
 
 OnUnTouch:
diff --git a/npc/001-2-40/_warps.txt b/npc/001-2-40/_warps.txt
index 89c5c721..ab895c3a 100644
--- a/npc/001-2-40/_warps.txt
+++ b/npc/001-2-40/_warps.txt
@@ -2,3 +2,4 @@
 // Map 001-2-40: unnamed warps
 001-2-40,45,44,0	warp	#001-2-40_45_44	2,0,001-2-33,43,39
 001-2-40,27,44,0	warp	#001-2-40_27_44	2,0,001-2-33,25,39
+001-2-40,56,41,0	warp	#001-2-40_56_41	0,0,001-3-0,56,44
diff --git a/npc/001-2-43/_import.txt b/npc/001-2-43/_import.txt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/npc/001-2-43/_import.txt
diff --git a/npc/001-2-43/_mobs.txt b/npc/001-2-43/_mobs.txt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/npc/001-2-43/_mobs.txt
diff --git a/npc/001-2-43/_savepoints.txt b/npc/001-2-43/_savepoints.txt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/npc/001-2-43/_savepoints.txt
diff --git a/npc/001-2-43/_warps.txt b/npc/001-2-43/_warps.txt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/npc/001-2-43/_warps.txt