summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/001-2-4/doors.txt33
-rw-r--r--npc/001-2-5/_warps.txt2
2 files changed, 18 insertions, 17 deletions
diff --git a/npc/001-2-4/doors.txt b/npc/001-2-4/doors.txt
index 1b6ddde1..5bd84f03 100644
--- a/npc/001-2-4/doors.txt
+++ b/npc/001-2-4/doors.txt
@@ -5,28 +5,29 @@
// Doors warp and animations in map 001-2-4
//
-001-2-4,52,27,0 script #LibraryDoor 907,1,1,{
+001-2-4,52,28,0 script #LibraryWarp 32767,0,0,{
+OnTouch:
+ warp "001-2-5", 28, 37;
close;
-OnTouchFirst:
- setnpcdir 2;
- stopnpctimer;
- initnpctimer;
- close;
+OnUnTouch:
+ doevent "npc1::OnUnTouch";
+}
-OnUnTouchAll:
- setnpcdir 4;
- initnpctimer;
- startnpctimer;
+001-2-4,52,27,0 script #LibraryDoor 907,3,3,{
close;
-OnTouchCenter:
- warp "001-2-5", 28, 37;
- close;
+OnTouch:
+ doorTouch;
+
+OnUnTouch:
+ doorUnTouch;
OnTimer340:
- stopnpctimer;
- if (getnpcdir ("") == 2) setnpcdir 6;
- if (getnpcdir ("") == 4) setnpcdir 8;
+ doorTimer;
+
+OnInit:
+ setnpcsex G_MALE;
+ setnpcdistance 5;
end;
}
diff --git a/npc/001-2-5/_warps.txt b/npc/001-2-5/_warps.txt
index 3678e192..18fdb12e 100644
--- a/npc/001-2-5/_warps.txt
+++ b/npc/001-2-5/_warps.txt
@@ -1,3 +1,3 @@
// 001-2-5 warps
-001-2-5,28,38,0 warp To Library First#001-2-5 0,0,001-2-4,52,28
+001-2-5,28,38,0 warp To Library First#001-2-5 0,0,001-2-4,52,29