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/003-3.mcachebin65 -> 61 bytes
-rw-r--r--maps/re/005-3.mcachebin113 -> 113 bytes
-rw-r--r--maps/re/005-6.mcachebin99 -> 96 bytes
-rw-r--r--npc/003-1/_import.txt1
-rw-r--r--npc/005-1/_import.txt1
-rw-r--r--npc/005-3/_import.txt1
-rw-r--r--npc/_import.txt1
9 files changed, 13 insertions, 7 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index d0d6d54ae..b2340d2c0 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -42,6 +42,7 @@ map_list: (
"010-1",
"010-2",
"011-1",
+ "011-2",
"boss",
"botcheck",
"sec_pri",
diff --git a/db/map_index.txt b/db/map_index.txt
index 7148a785f..9f6e2e787 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -39,10 +39,11 @@
010-1 39
010-2 40
011-1 41
-boss 42
-botcheck 43
-sec_pri 44
-soren-2 45
-soren 46
-test 47
-testbg 48
+011-2 42
+boss 43
+botcheck 44
+sec_pri 45
+soren-2 46
+soren 47
+test 48
+testbg 49
diff --git a/maps/re/003-3.mcache b/maps/re/003-3.mcache
index 0a85a8792..73aae46a7 100644
--- a/maps/re/003-3.mcache
+++ b/maps/re/003-3.mcache
Binary files differ
diff --git a/maps/re/005-3.mcache b/maps/re/005-3.mcache
index 42133e3d5..84ff45698 100644
--- a/maps/re/005-3.mcache
+++ b/maps/re/005-3.mcache
Binary files differ
diff --git a/maps/re/005-6.mcache b/maps/re/005-6.mcache
index f4092f006..3e6ea9368 100644
--- a/maps/re/005-6.mcache
+++ b/maps/re/005-6.mcache
Binary files differ
diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt
index def86cd94..7e75a428a 100644
--- a/npc/003-1/_import.txt
+++ b/npc/003-1/_import.txt
@@ -20,6 +20,7 @@
"npc/003-1/lieutenantdausen.txt",
"npc/003-1/mahoud.txt",
"npc/003-1/malivox.txt",
+"npc/003-1/mapflags.txt",
"npc/003-1/mariusthebard.txt",
"npc/003-1/michel.txt",
"npc/003-1/neko.txt",
diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt
index 2540b11af..bbd950b67 100644
--- a/npc/005-1/_import.txt
+++ b/npc/005-1/_import.txt
@@ -4,6 +4,7 @@
"npc/005-1/_warps.txt",
"npc/005-1/ayasha.txt",
"npc/005-1/liana.txt",
+"npc/005-1/mapflags.txt",
"npc/005-1/maya.txt",
"npc/005-1/sailors.txt",
"npc/005-1/ship.txt",
diff --git a/npc/005-3/_import.txt b/npc/005-3/_import.txt
index e47ad86f9..68fd1fb5e 100644
--- a/npc/005-3/_import.txt
+++ b/npc/005-3/_import.txt
@@ -3,3 +3,4 @@
"npc/005-3/_mobs.txt",
"npc/005-3/_warps.txt",
"npc/005-3/barrel.txt",
+"npc/005-3/mapflags.txt",
diff --git a/npc/_import.txt b/npc/_import.txt
index 29fd2447a..3f915ba30 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -41,6 +41,7 @@
@include "npc/010-1/_import.txt"
@include "npc/010-2/_import.txt"
@include "npc/011-1/_import.txt"
+@include "npc/011-2/_import.txt"
@include "npc/boss/_import.txt"
@include "npc/botcheck/_import.txt"
@include "npc/sec_pri/_import.txt"