summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2015-05-04 03:13:28 +0200
committerReid <reidyaro@gmail.com>2015-05-04 03:13:28 +0200
commit055d4eb7c9db8e3a9975f4c495879c887e3bad76 (patch)
tree035357bbc2eef11affc75b9f82a2596dceef062b /npc
parent79d5e74ef88ea754492293ee788c4c035707ee65 (diff)
downloadserverdata-055d4eb7c9db8e3a9975f4c495879c887e3bad76.tar.gz
serverdata-055d4eb7c9db8e3a9975f4c495879c887e3bad76.tar.bz2
serverdata-055d4eb7c9db8e3a9975f4c495879c887e3bad76.tar.xz
serverdata-055d4eb7c9db8e3a9975f4c495879c887e3bad76.zip
Add complete warp from artis to #18 and inverse.
Diffstat (limited to 'npc')
-rw-r--r--npc/001-1/doors.txt27
-rw-r--r--npc/001-2-18/_warps.txt2
2 files changed, 28 insertions, 1 deletions
diff --git a/npc/001-1/doors.txt b/npc/001-1/doors.txt
index 6f3985716..16765d0a8 100644
--- a/npc/001-1/doors.txt
+++ b/npc/001-1/doors.txt
@@ -436,3 +436,30 @@ OnInit:
setnpcdistance 5;
end;
}
+
+001-1,182,74,0 script #Warp17 32767,0,0,{
+OnTouch:
+ warp "001-2-18", 39, 35;
+ close;
+
+OnUnTouch:
+ doevent "#Door14::OnUnTouch";
+}
+
+001-1,182,74,0 script #Door17 906,2,3,{
+ close;
+
+OnTouch:
+ doorTouch;
+
+OnUnTouch:
+ doorUnTouch;
+
+OnTimer340:
+ doorTimer;
+
+OnInit:
+ setnpcsex G_MALE;
+ setnpcdistance 5;
+ end;
+}
diff --git a/npc/001-2-18/_warps.txt b/npc/001-2-18/_warps.txt
index 7d6223c99..86e8543c5 100644
--- a/npc/001-2-18/_warps.txt
+++ b/npc/001-2-18/_warps.txt
@@ -1,2 +1,2 @@
// 001-2-18
-001-2-18,39,36,0 warp ToArtis#001-2-18 0,0,001-1,182,76
+001-2-18,39,36,0 warp ToArtis#001-2-18 0,0,001-1,182,75