Connect #19 #20 and #25 with city warps.

2 files changed, 57 insertions, 1 deletions

diff --git a/npc/001-1/_warps.txt b/npc/001-1/_warps.txt
index d6a878d5..3c471881 100644
--- a/npc/001-1/_warps.txt
+++ b/npc/001-1/_warps.txt
@@ -1,2 +1,4 @@
 // 001-1 Artis City
 001-1,194,109,0	warp	ToShip#001-1	0,0,001-2-21,20,28
+001-1,100,37,0	warp	ToMerchantHall#001-1	0,0,001-2-19,32,39
+001-1,104,43,0	warp	ToMerchantHallBottom#001-1	0,0,001-2-19,41,49
diff --git a/npc/001-1/doors.txt b/npc/001-1/doors.txt
index 6545f6ca..6f398571 100644
--- a/npc/001-1/doors.txt
+++ b/npc/001-1/doors.txt
@@ -142,7 +142,7 @@ OnInit:
 
 001-1,142,30,0	script	#Warp6	32767,0,0,{
 OnTouch:
-    warp "001-2-12", 33, 35;
+    warp "001-2-12", 34, 35;
     close;
 
 OnUnTouch:
@@ -382,3 +382,57 @@ OnInit:
     setnpcdistance 5;
     end;
 }
+
+001-1,107,49,0	script	#Warp15	32767,0,0,{
+OnTouch:
+    warp "001-2-20", 33, 34;
+    close;
+
+OnUnTouch:
+    doevent "#Door14::OnUnTouch";
+}
+
+001-1,107,49,0	script	#Door15	906,2,3,{
+    close;
+
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    setnpcsex G_MALE;
+    setnpcdistance 5;
+    end;
+}
+
+001-1,104,32,0	script	#Warp16	32767,0,0,{
+OnTouch:
+    warp "001-2-19", 41, 30;
+    close;
+
+OnUnTouch:
+    doevent "#Door14::OnUnTouch";
+}
+
+001-1,104,32,0	script	#Door16	906,2,3,{
+    close;
+
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    setnpcsex G_MALE;
+    setnpcdistance 5;
+    end;
+}