summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt15
-rw-r--r--maps/re/016-6.mcachebin0 -> 102 bytes
-rw-r--r--npc/016-6/_import.txt3
-rw-r--r--npc/016-6/_mobs.txt3
-rw-r--r--npc/_import.txt1
6 files changed, 16 insertions, 7 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 9f65fb3f3..30d7a2528 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -62,6 +62,7 @@ map_list: (
"014-1",
"014-2",
"015-1",
+ "016-6",
"boss",
"botcheck",
"sec_pri",
diff --git a/db/map_index.txt b/db/map_index.txt
index 0d1e4931c..3719a2c8e 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -59,10 +59,11 @@
014-1 59
014-2 60
015-1 61
-boss 62
-botcheck 63
-sec_pri 64
-soren-2 65
-soren 66
-test 67
-testbg 68
+016-6 62
+boss 63
+botcheck 64
+sec_pri 65
+soren-2 66
+soren 67
+test 68
+testbg 69
diff --git a/maps/re/016-6.mcache b/maps/re/016-6.mcache
new file mode 100644
index 000000000..b4eafa44b
--- /dev/null
+++ b/maps/re/016-6.mcache
Binary files differ
diff --git a/npc/016-6/_import.txt b/npc/016-6/_import.txt
new file mode 100644
index 000000000..82eaf47ca
--- /dev/null
+++ b/npc/016-6/_import.txt
@@ -0,0 +1,3 @@
+// Map 016-6: Ocean
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/016-6/_mobs.txt",
diff --git a/npc/016-6/_mobs.txt b/npc/016-6/_mobs.txt
new file mode 100644
index 000000000..28a26990c
--- /dev/null
+++ b/npc/016-6/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 016-6: Ocean mobs
+016-6,38,32,14,2 monster Ocean Croc 1133,4,36000,30000
diff --git a/npc/_import.txt b/npc/_import.txt
index 3e46949ac..225d75b82 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -61,6 +61,7 @@
@include "npc/014-1/_import.txt"
@include "npc/014-2/_import.txt"
@include "npc/015-1/_import.txt"
+@include "npc/016-6/_import.txt"
@include "npc/boss/_import.txt"
@include "npc/botcheck/_import.txt"
@include "npc/sec_pri/_import.txt"