Make Maps

9 files changed, 28 insertions, 14 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 813bfebc0..70504e28b 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -65,6 +65,7 @@ map_list: (
     "014-3",
     "015-1",
     "015-2",
+    "015-3",
     "016-1",
     "016-6",
     "016-7",
diff --git a/db/map_index.txt b/db/map_index.txt
index 37b392040..565977d0b 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -62,13 +62,14 @@
 014-3 62
 015-1 63
 015-2 64
-016-1 65
-016-6 66
-016-7 67
-boss 68
-botcheck 69
-sec_pri 70
-soren-2 71
-soren 72
-test 73
-testbg 74
+015-3 65
+016-1 66
+016-6 67
+016-7 68
+boss 69
+botcheck 70
+sec_pri 71
+soren-2 72
+soren 73
+test 74
+testbg 75
diff --git a/maps/re/015-3.mcache b/maps/re/015-3.mcache
new file mode 100644
index 000000000..d89821d09
--- /dev/null
+++ b/maps/re/015-3.mcache
diff --git a/npc/014-3/_warps.txt b/npc/014-3/_warps.txt
index 35818b14c..54fdaa106 100644
--- a/npc/014-3/_warps.txt
+++ b/npc/014-3/_warps.txt
@@ -1,4 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 014-3: Woodlands Central Area warps
+014-3,158,142,0	warp	#014-3_158_142	0,0,015-3,172,195
 014-3,224,111,0	warp	#014-3_224_111	0,4,012-1,23,61
 014-3,138,86,0	warp	#014-3_138_86	0,0,015-2,49,100
diff --git a/npc/015-3/_import.txt b/npc/015-3/_import.txt
new file mode 100644
index 000000000..15e3dd8fb
--- /dev/null
+++ b/npc/015-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 015-3: Butterfly Caves
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/015-3/_mobs.txt",
+"npc/015-3/_warps.txt",
diff --git a/npc/015-3/_mobs.txt b/npc/015-3/_mobs.txt
new file mode 100644
index 000000000..2a122b33b
--- /dev/null
+++ b/npc/015-3/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-3: Butterfly Caves mobs
+015-3,160,179,19,18	monster	Bat	1039,35,30000,40000
diff --git a/npc/015-3/_warps.txt b/npc/015-3/_warps.txt
new file mode 100644
index 000000000..9b6819db5
--- /dev/null
+++ b/npc/015-3/_warps.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-3: Butterfly Caves warps
+015-3,152,162,0	warp	#015-3_152_162	0,0,015-3,123,38
+015-3,171,161,0	warp	#015-3_171_161	0,0,015-3,147,39
+015-3,172,198,0	warp	#015-3_172_196	0,0,014-3,158,143
+015-3,123,39,0	warp	#015-3_123_39	0,0,015-3,152,163
+015-3,147,40,0	warp	#015-3_147_40	0,0,015-3,171,162
diff --git a/npc/_import.txt b/npc/_import.txt
index e65c61b2f..fdf7a7d77 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -64,6 +64,7 @@
 @include "npc/014-3/_import.txt"
 @include "npc/015-1/_import.txt"
 @include "npc/015-2/_import.txt"
+@include "npc/015-3/_import.txt"
 @include "npc/016-1/_import.txt"
 @include "npc/016-6/_import.txt"
 @include "npc/016-7/_import.txt"
diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt
index cc7285721..cb426516d 100644
--- a/npc/functions/weather.txt
+++ b/npc/functions/weather.txt
@@ -16,10 +16,6 @@
 
 	mf_jexp:               39
 	mf_bexp:               40
-
-    setmapflag(.@key$, mf_nightenabled);
-    removemapflag(.@key$, mf_nightenabled);
-
 */
 
 OnInit: