summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2015-02-28 05:23:25 +0100
committerReid <reidyaro@gmail.com>2015-02-28 05:23:25 +0100
commit846ab394cc1e4ee745a8f0468ecd73d567392cbe (patch)
tree92c3dc48cc6c6820629be59a7dda96768dd9152b
parent32a3e2fb6eba2d52bd8eecffeee9d2ec3715018a (diff)
downloadserverdata-846ab394cc1e4ee745a8f0468ecd73d567392cbe.tar.gz
serverdata-846ab394cc1e4ee745a8f0468ecd73d567392cbe.tar.bz2
serverdata-846ab394cc1e4ee745a8f0468ecd73d567392cbe.tar.xz
serverdata-846ab394cc1e4ee745a8f0468ecd73d567392cbe.zip
Add #11 in serverdata and rebuild map cache.
-rw-r--r--conf/maps.conf1
-rw-r--r--db/map_index.txt1
-rw-r--r--db/re/map_cache.datbin5581 -> 5688 bytes
-rw-r--r--npc/001-1/doors.txt27
-rw-r--r--npc/001-2-11/_import.txt1
-rw-r--r--npc/001-2-11/_warps.txt3
-rw-r--r--npc/_import.txt1
7 files changed, 34 insertions, 0 deletions
diff --git a/conf/maps.conf b/conf/maps.conf
index eb370ae7..9a8a5096 100644
--- a/conf/maps.conf
+++ b/conf/maps.conf
@@ -16,6 +16,7 @@ map: 001-2-7
map: 001-2-8
map: 001-2-9
map: 001-2-10
+map: 001-2-11
map: 001-2-12
map: 001-2-13
map: 001-2-14
diff --git a/db/map_index.txt b/db/map_index.txt
index 26e4361e..28aef90e 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -31,3 +31,4 @@ test 25
001-2-22 31
001-2-23 32
001-2-24 33
+001-2-11 34
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index cfca6b12..9a678e52 100644
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
Binary files differ
diff --git a/npc/001-1/doors.txt b/npc/001-1/doors.txt
index 3bdea02a..323785bd 100644
--- a/npc/001-1/doors.txt
+++ b/npc/001-1/doors.txt
@@ -301,3 +301,30 @@ OnInit:
setnpcdistance 5;
end;
}
+
+001-1,149,54,0 script #Warp12 32767,0,0,{
+OnTouch:
+ warp "001-2-11", 46, 48;
+ close;
+
+OnUnTouch:
+ doevent "#Door9::OnUnTouch";
+}
+
+001-1,149,54,0 script #Door12 906,2,3,{
+ close;
+
+OnTouch:
+ doorTouch;
+
+OnUnTouch:
+ doorUnTouch;
+
+OnTimer340:
+ doorTimer;
+
+OnInit:
+ setnpcsex G_MALE;
+ setnpcdistance 5;
+ end;
+}
diff --git a/npc/001-2-11/_import.txt b/npc/001-2-11/_import.txt
new file mode 100644
index 00000000..42a4541a
--- /dev/null
+++ b/npc/001-2-11/_import.txt
@@ -0,0 +1 @@
+npc: npc/001-2-11/_warps.txt
diff --git a/npc/001-2-11/_warps.txt b/npc/001-2-11/_warps.txt
new file mode 100644
index 00000000..9a910c58
--- /dev/null
+++ b/npc/001-2-11/_warps.txt
@@ -0,0 +1,3 @@
+// 001-2-11
+
+001-2-11,46,49,0 warp To Artis#001-2-11 0,0,001-1,149,55
diff --git a/npc/_import.txt b/npc/_import.txt
index 75f3a1a8..14b66bd4 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -19,6 +19,7 @@ import: npc/001-2-7/_import.txt
import: npc/001-2-8/_import.txt
import: npc/001-2-9/_import.txt
import: npc/001-2-10/_import.txt
+import: npc/001-2-11/_import.txt
import: npc/001-2-12/_import.txt
import: npc/001-2-13/_import.txt
import: npc/001-2-14/_import.txt