From 35e5bd497cf23b7cc35809bd4d3b734f549bc224 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 6 Jun 2020 19:10:13 -0300
Subject: Indoors for some more Magic Academy Maps

---
 conf/map/maps.conf    |   2 ++
 db/map_index.txt      |  74 ++++++++++++++++++++++++++------------------------
 maps/re/027-3.mcache  | Bin 0 -> 106 bytes
 maps/re/027-4.mcache  | Bin 0 -> 86 bytes
 npc/027-1/_warps.txt  |   3 ++
 npc/027-3/_import.txt |   3 ++
 npc/027-3/_warps.txt  |   4 +++
 npc/027-4/_import.txt |   3 ++
 npc/027-4/_warps.txt  |   3 ++
 npc/_import.txt       |   2 ++
 10 files changed, 58 insertions(+), 36 deletions(-)
 create mode 100644 maps/re/027-3.mcache
 create mode 100644 maps/re/027-4.mcache
 create mode 100644 npc/027-3/_import.txt
 create mode 100644 npc/027-3/_warps.txt
 create mode 100644 npc/027-4/_import.txt
 create mode 100644 npc/027-4/_warps.txt

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 75283bd41..52425a659 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -191,6 +191,8 @@ map_list: (
     "025-2",
     "027-1",
     "027-2",
+    "027-3",
+    "027-4",
     "042-0",
     "042-1",
     "042-10",
diff --git a/db/map_index.txt b/db/map_index.txt
index 30a2034a3..920441d8a 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -188,39 +188,41 @@
 025-2 188
 027-1 189
 027-2 190
-042-0 191
-042-1 192
-042-10 193
-042-11 194
-042-2 195
-042-3 196
-042-4 197
-042-5 198
-042-6 199
-042-7 200
-042-8 201
-042-9 202
-boss 203
-botcheck 204
-guilds 205
-maze0 206
-maze1 207
-maze10 208
-maze11 209
-maze12 210
-maze13 211
-maze14 212
-maze15 213
-maze2 214
-maze3 215
-maze4 216
-maze5 217
-maze6 218
-maze7 219
-maze8 220
-maze9 221
-sec_pri 222
-soren-2 223
-soren 224
-test 225
-testbg 226
+027-3 191
+027-4 192
+042-0 193
+042-1 194
+042-10 195
+042-11 196
+042-2 197
+042-3 198
+042-4 199
+042-5 200
+042-6 201
+042-7 202
+042-8 203
+042-9 204
+boss 205
+botcheck 206
+guilds 207
+maze0 208
+maze1 209
+maze10 210
+maze11 211
+maze12 212
+maze13 213
+maze14 214
+maze15 215
+maze2 216
+maze3 217
+maze4 218
+maze5 219
+maze6 220
+maze7 221
+maze8 222
+maze9 223
+sec_pri 224
+soren-2 225
+soren 226
+test 227
+testbg 228
diff --git a/maps/re/027-3.mcache b/maps/re/027-3.mcache
new file mode 100644
index 000000000..601afbbe9
Binary files /dev/null and b/maps/re/027-3.mcache differ
diff --git a/maps/re/027-4.mcache b/maps/re/027-4.mcache
new file mode 100644
index 000000000..389cfcc2a
Binary files /dev/null and b/maps/re/027-4.mcache differ
diff --git a/npc/027-1/_warps.txt b/npc/027-1/_warps.txt
index 32a27e54d..52016a986 100644
--- a/npc/027-1/_warps.txt
+++ b/npc/027-1/_warps.txt
@@ -3,3 +3,6 @@
 027-1,90,156,0	warp	#027-1_90_156	5,0,003-1,59,59
 027-1,73,53,0	warp	#027-1_73_53	0,0,027-2,28,28
 027-1,77,65,0	warp	#027-1_77_65	0,0,027-2,32,42
+027-1,107,59,0	warp	#027-1_107_59	0,0,027-4,29,34
+027-1,46,100,0	warp	#027-1_46_100	0,0,027-3,27,25
+027-1,40,115,0	warp	#027-1_40_115	0,0,027-3,24,39
diff --git a/npc/027-3/_import.txt b/npc/027-3/_import.txt
new file mode 100644
index 000000000..464a8b34f
--- /dev/null
+++ b/npc/027-3/_import.txt
@@ -0,0 +1,3 @@
+// Map 027-3: Physical Sciences Classroom
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/027-3/_warps.txt",
diff --git a/npc/027-3/_warps.txt b/npc/027-3/_warps.txt
new file mode 100644
index 000000000..8f4f47420
--- /dev/null
+++ b/npc/027-3/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 027-3: Physical Sciences Classroom warps
+027-3,27,26,0	warp	#027-3_27_26	0,0,027-1,46,101
+027-3,24,40,0	warp	#027-3_24_40	0,0,027-1,40,116
diff --git a/npc/027-4/_import.txt b/npc/027-4/_import.txt
new file mode 100644
index 000000000..7500b25ca
--- /dev/null
+++ b/npc/027-4/_import.txt
@@ -0,0 +1,3 @@
+// Map 027-4: Scholarship Building
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/027-4/_warps.txt",
diff --git a/npc/027-4/_warps.txt b/npc/027-4/_warps.txt
new file mode 100644
index 000000000..856e5c53b
--- /dev/null
+++ b/npc/027-4/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 027-4: Scholarship Building warps
+027-4,29,35,0	warp	#027-4_29_35	1,0,027-1,107,60
diff --git a/npc/_import.txt b/npc/_import.txt
index 17e35fbd9..2ed9bb173 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -190,6 +190,8 @@
 @include "npc/025-2/_import.txt"
 @include "npc/027-1/_import.txt"
 @include "npc/027-2/_import.txt"
+@include "npc/027-3/_import.txt"
+@include "npc/027-4/_import.txt"
 @include "npc/042-0/_import.txt"
 @include "npc/042-1/_import.txt"
 @include "npc/042-10/_import.txt"
-- 
cgit v1.2.3-60-g2f50