summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-01-27 18:03:54 -0200
committerJesusaves <cpntb1@ymail.com>2019-01-27 18:03:54 -0200
commita015528342aaba02d013395e67b15a9a8abfee64 (patch)
treec44c417da1fc11058f3e55bb2b4f57836e4aa5e0
parent42265ce48d5f48d830bfe7924e2d5a250d445788 (diff)
downloadserverdata-a015528342aaba02d013395e67b15a9a8abfee64.tar.gz
serverdata-a015528342aaba02d013395e67b15a9a8abfee64.tar.bz2
serverdata-a015528342aaba02d013395e67b15a9a8abfee64.tar.xz
serverdata-a015528342aaba02d013395e67b15a9a8abfee64.zip
Acknowledge Nivalis Inn.
The innkeeper to say it is not open yet and Baktar are still missing.
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt33
-rw-r--r--npc/020-1/_warps.txt1
-rw-r--r--npc/020-4/_import.txt3
-rw-r--r--npc/020-4/_warps.txt3
-rw-r--r--npc/_import.txt1
6 files changed, 26 insertions, 16 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 87e4eee6c..a74e9aef8 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -115,6 +115,7 @@ map_list: (
"020-1",
"020-2",
"020-3",
+ "020-4",
"020-5",
"021-1",
"021-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index 05459e71a..2fee10149 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -112,19 +112,20 @@
020-1 112
020-2 113
020-3 114
-020-5 115
-021-1 116
-021-2 117
-021-3 118
-021-4 119
-022-1 120
-023-1 121
-023-2 122
-024-1 123
-boss 124
-botcheck 125
-sec_pri 126
-soren-2 127
-soren 128
-test 129
-testbg 130
+020-4 115
+020-5 116
+021-1 117
+021-2 118
+021-3 119
+021-4 120
+022-1 121
+023-1 122
+023-2 123
+024-1 124
+boss 125
+botcheck 126
+sec_pri 127
+soren-2 128
+soren 129
+test 130
+testbg 131
diff --git a/npc/020-1/_warps.txt b/npc/020-1/_warps.txt
index 2e3ca3065..46d5d8114 100644
--- a/npc/020-1/_warps.txt
+++ b/npc/020-1/_warps.txt
@@ -1,6 +1,7 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 020-1: Nivalis warps
020-1,47,48,0 warp #020-1_47_48 0,0,020-2,30,36
+020-1,64,82,0 warp #020-1_64_82 0,0,020-4,64,53
020-1,86,46,0 warp #020-1_86_46 0,0,020-5,33,30
020-1,57,91,0 warp #020-1_57_91 0,0,020-3,20,28
020-1,70,128,0 warp #020-1_70_128 3,0,019-1,70,22
diff --git a/npc/020-4/_import.txt b/npc/020-4/_import.txt
new file mode 100644
index 000000000..ba4afe111
--- /dev/null
+++ b/npc/020-4/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-4: Nivalis Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-4/_warps.txt",
diff --git a/npc/020-4/_warps.txt b/npc/020-4/_warps.txt
new file mode 100644
index 000000000..b0326b069
--- /dev/null
+++ b/npc/020-4/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-4: Nivalis Indoors warps
+020-4,64,54,0 warp #020-4_64_54 2,0,020-1,64,83
diff --git a/npc/_import.txt b/npc/_import.txt
index 830823605..bcccd035e 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -114,6 +114,7 @@
@include "npc/020-1/_import.txt"
@include "npc/020-2/_import.txt"
@include "npc/020-3/_import.txt"
+@include "npc/020-4/_import.txt"
@include "npc/020-5/_import.txt"
@include "npc/021-1/_import.txt"
@include "npc/021-2/_import.txt"