summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt17
-rw-r--r--maps/re/010-1-1.mcachebin0 -> 1423 bytes
-rw-r--r--npc/010-1-1/_import.txt4
-rw-r--r--npc/010-1-1/_mobs.txt5
-rw-r--r--npc/010-1-1/_warps.txt6
-rw-r--r--npc/_import.txt1
7 files changed, 26 insertions, 8 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 55916fded..dc2f35100 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -39,6 +39,7 @@ map_list: (
"009-1",
"009-2",
"009-5",
+ "010-1-1",
"010-1",
"boss",
"botcheck",
diff --git a/db/map_index.txt b/db/map_index.txt
index 25ac0fe74..b5e1071bf 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -36,11 +36,12 @@
009-1 36
009-2 37
009-5 38
-010-1 39
-boss 40
-botcheck 41
-sec_pri 42
-soren-2 43
-soren 44
-test 45
-testbg 46
+010-1-1 39
+010-1 40
+boss 41
+botcheck 42
+sec_pri 43
+soren-2 44
+soren 45
+test 46
+testbg 47
diff --git a/maps/re/010-1-1.mcache b/maps/re/010-1-1.mcache
new file mode 100644
index 000000000..040818277
--- /dev/null
+++ b/maps/re/010-1-1.mcache
Binary files differ
diff --git a/npc/010-1-1/_import.txt b/npc/010-1-1/_import.txt
new file mode 100644
index 000000000..7b76dd3de
--- /dev/null
+++ b/npc/010-1-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 010-1-1: magic school cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/010-1-1/_mobs.txt",
+"npc/010-1-1/_warps.txt",
diff --git a/npc/010-1-1/_mobs.txt b/npc/010-1-1/_mobs.txt
new file mode 100644
index 000000000..94925b3b7
--- /dev/null
+++ b/npc/010-1-1/_mobs.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-1: magic school cave mobs
+010-1-1,55,58,29,22 monster Cave Snake 1035,8,35000,150000
+010-1-1,70,40,3,1 monster Small Topaz Bif 1101,1,35000,150000
+010-1-1,54,54,54,54 monster Cave Maggot 1027,20,40000,200000
diff --git a/npc/010-1-1/_warps.txt b/npc/010-1-1/_warps.txt
new file mode 100644
index 000000000..02af93450
--- /dev/null
+++ b/npc/010-1-1/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1-1: magic school cave warps
+010-1-1,78,73,0 warp #010-1-1_78_73 0,0,004-2,131,111
+010-1-1,29,86,0 warp #010-1-1_29_86 0,0,010-1,59,192
+010-1-1,25,47,0 warp #010-1-1_25_47 0,0,004-2,84,78
+010-1-1,51,26,0 warp #010-1-1_51_26 0,0,004-2,112,64
diff --git a/npc/_import.txt b/npc/_import.txt
index 8556a07a8..ab2f69cf5 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -38,6 +38,7 @@
@include "npc/009-1/_import.txt"
@include "npc/009-2/_import.txt"
@include "npc/009-5/_import.txt"
+@include "npc/010-1-1/_import.txt"
@include "npc/010-1/_import.txt"
@include "npc/boss/_import.txt"
@include "npc/botcheck/_import.txt"