10 files changed, 50 insertions, 30 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 3da613a26..62172fbe3 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -134,6 +134,8 @@ map_list: (
     "020-4",
     "020-5",
     "020-6",
+    "020-7-1",
+    "020-7",
     "021-1",
     "021-2",
     "021-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index 6edf5c8a5..4386d38db 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -131,33 +131,35 @@
 020-4 131
 020-5 132
 020-6 133
-021-1 134
-021-2 135
-021-3 136
-021-4 137
-022-1 138
-023-1 139
-023-2 140
-024-1 141
-024-10 142
-024-11 143
-024-12 144
-024-13 145
-024-14 146
-024-15 147
-024-2 148
-024-3 149
-024-4 150
-024-5 151
-024-6 152
-024-7 153
-024-8 154
-024-9 155
-boss 156
-botcheck 157
-guilds 158
-sec_pri 159
-soren-2 160
-soren 161
-test 162
-testbg 163
+020-7-1 134
+020-7 135
+021-1 136
+021-2 137
+021-3 138
+021-4 139
+022-1 140
+023-1 141
+023-2 142
+024-1 143
+024-10 144
+024-11 145
+024-12 146
+024-13 147
+024-14 148
+024-15 149
+024-2 150
+024-3 151
+024-4 152
+024-5 153
+024-6 154
+024-7 155
+024-8 156
+024-9 157
+boss 158
+botcheck 159
+guilds 160
+sec_pri 161
+soren-2 162
+soren 163
+test 164
+testbg 165
diff --git a/maps/re/020-7-1.mcache b/maps/re/020-7-1.mcache
new file mode 100644
index 000000000..7a160bd37
--- /dev/null
+++ b/maps/re/020-7-1.mcache
diff --git a/maps/re/020-7.mcache b/maps/re/020-7.mcache
new file mode 100644
index 000000000..269745323
--- /dev/null
+++ b/maps/re/020-7.mcache
diff --git a/npc/020-1/_warps.txt b/npc/020-1/_warps.txt
index c3440cd6d..d8018a13e 100644
--- a/npc/020-1/_warps.txt
+++ b/npc/020-1/_warps.txt
@@ -1,6 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 020-1: Nivalis warps
 020-1,47,48,0	warp	#020-1_47_48	0,0,020-2,30,36
+020-1,66,52,0	warp	#020-1_66_52	0,0,020-7,40,49
 020-1,64,82,0	warp	#020-1_64_82	0,0,020-4,64,53
 020-1,86,46,0	warp	#020-1_86_46	0,0,020-5,33,30
 020-1,57,91,0	warp	#020-1_57_91	0,0,020-3,20,28
diff --git a/npc/020-7-1/_import.txt b/npc/020-7-1/_import.txt
new file mode 100644
index 000000000..e231ccd83
--- /dev/null
+++ b/npc/020-7-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-7-1: Blue Sages' Mansion
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-7-1/_warps.txt",
diff --git a/npc/020-7-1/_warps.txt b/npc/020-7-1/_warps.txt
new file mode 100644
index 000000000..fb35ff2f9
--- /dev/null
+++ b/npc/020-7-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-7-1: Blue Sages' Mansion warps
+020-7-1,23,30,0	warp	#020-7-1_23_30	0,1,020-7,55,22
diff --git a/npc/020-7/_import.txt b/npc/020-7/_import.txt
new file mode 100644
index 000000000..f049965c8
--- /dev/null
+++ b/npc/020-7/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-7: Blue Sages' Mansion
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-7/_warps.txt",
diff --git a/npc/020-7/_warps.txt b/npc/020-7/_warps.txt
new file mode 100644
index 000000000..e276b9bff
--- /dev/null
+++ b/npc/020-7/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-7: Blue Sages' Mansion warps
+020-7,56,21,0	warp	#020-7_56_21	1,0,020-7-1,25,30
+020-7,40,50,0	warp	#020-7_40_50	0,0,020-1,66,53
diff --git a/npc/_import.txt b/npc/_import.txt
index 0b043cfa5..6e071fd89 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -133,6 +133,8 @@
 @include "npc/020-4/_import.txt"
 @include "npc/020-5/_import.txt"
 @include "npc/020-6/_import.txt"
+@include "npc/020-7-1/_import.txt"
+@include "npc/020-7/_import.txt"
 @include "npc/021-1/_import.txt"
 @include "npc/021-2/_import.txt"
 @include "npc/021-3/_import.txt"