2-2 job quest update. Although completable, further testing (and optimizing) required.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11278 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 31 insertions, 38 deletions

diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt
index 323fd23d6..82d307fb0 100644
--- a/npc/warps/other/jobquests.txt
+++ b/npc/warps/other/jobquests.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Version Ep4+
 //===== Description: =========================================
@@ -19,6 +19,7 @@
 //= 1.4 Imported damn noobie warps from jAthena (because it's broken since last year)
 //= 1.5 Replaced clone maps with the real ones [Lupus]
 //= 1.6 removed swordman quest map warps. They are now contained in the swordman quest. [L0ne_W0lf]
+//= 1.7 Updated some 2-2 job quest related warps. [L0ne_W0lf]
 //============================================================
 
 
@@ -49,8 +50,6 @@ moc_fild16,205,296,0	warp	16_to_guild	2,2,in_moc_16,18,11
 //==============================================================================
 in_hunter,100,15,0	warp	jhun01	0,0,pay_fild10,143,250
 
-
-
 //==============================================================================
 // Monk (St. Capitolina Abbey)
 //==============================================================================
@@ -64,46 +63,40 @@ monk_test,298,127,0	warp	monk20	1,1,monk_test,268,125
 //==============================================================================
 //Alchemist
 //==============================================================================
-//Town - Alchemist , Alchemist - Town
-aldebaran,54,66,0	warp	alche01	1,1,alde_alche,41,174
-alde_alche,41,171,0	warp	alche02	1,1,aldebaran,56,68
-//Alchemist Hall 1st Floor Top Rooms
-alde_alche,129,104,0	warp	alche03	1,1,alde_alche,163,163
-alde_alche,159,163,0	warp	alche04	1,1,alde_alche,126,104
-alde_alche,131,77,0	warp	alche05	1,1,alde_alche,162,107
-alde_alche,159,107,0	warp	alche06	1,1,alde_alche,128,77
-//Alchemist Hall 1st Floor Bottom Rooms
-alde_alche,47,103,0	warp	alche07	1,1,alde_alche,88,18
-alde_alche,92,18,0	warp	alche08	1,1,alde_alche,50,103
-alde_alche,47,77,0	warp	alche09	1,1,alde_alche,155,18
-alde_alche,159,18,0	warp	alche10	1,1,alde_alche,50,77
-//Alchemist Hall 2nd Floor - 1st Floor Link
-alde_alche,14,184,0	warp	alche11	1,1,alde_alche,88,113
-alde_alche,88,117,0	warp	alche12	1,1,alde_alche,14,180
-//Alchemist Hall 2nd Floor Rooms
-alde_alche,19,171,0	warp	alche13	1,1,aldebaran,68,56
-aldebaran,66,54,0	warp	alche14	1,1,alde_alche,19,175
-alde_alche,18,28,0	warp	alche15	1,1,alde_alche,89,66
-alde_alche,89,63,0	warp	alche16	1,1,alde_alche,18,24
-//Alchemist Hall 3rd Floor
-alde_alche,41,187,0	warp	alche17	1,1,alde_alche,114,178
-alde_alche,114,182,0	warp	alche18	1,1,alde_alche,41,183
+aldebaran,65,53,0	warp	alche#1	1,1,alde_alche,20,175
+aldebaran,53,65,0	warp	alche#2	1,1,alde_alche,42,175
+alde_alche,19,171,0	warp	alche#1	1,1,aldebaran,68,56
+alde_alche,42,171,0	warp	alche#1	1,1,aldebaran,56,68
+alde_alche,41,186,0	warp	alche#1F_2F	1,1,alde_alche,113,178
+alde_alche,114,183,0	warp	alche#2F_1F	1,1,alde_alche,42,182
+alde_alche,13,184,0	warp	alche#1F_B1	1,1,alde_alche,88,113
+alde_alche,88,117,0	warp	alche#B1_1F	1,1,alde_alche,13,181
+alde_alche,46,104,0	warp	alche#B1_r1	1,1,alde_alche,157,17
+alde_alche,160,17,0	warp	alche#r1_b1	1,1,alde_alche,50,103
+alde_alche,46,77,0	warp	alche#B1_r2	1,1,alde_alche,88,17
+alde_alche,93,17,0	warp	alche#r2_b1	1,1,alde_alche,50,77
+alde_alche,89,62,0	warp	alche#B1_r3	1,1,alde_alche,17,23
+alde_alche,17,29,0	warp	alche#r3_b1	1,1,alde_alche,89,67
+alde_alche,133,77,0	warp	alche#B1_r4	1,1,alde_alche,162,107
+alde_alche,158,107,0	warp	alche#r4_b1	1,1,alde_alche,129,77
+alde_alche,133,103,0	warp	alche#B1_r5	1,1,alde_alche,164,164
+alde_alche,158,163,0	warp	alche#r5_b1	1,1,alde_alche,129,103
 
 //==============================================================================
 //Rogue
 //==============================================================================
-cmd_fild07,193,117,0	warp	fild07-rogue00	1,1,in_rogue,378,46
-in_rogue,375,46,0	warp	rogue00-fild07	1,1,cmd_fild07,195,116
-in_rogue,376,34,0	warp	rogue01-02	1,1,in_rogue,378,125
-in_rogue,375,125,0	warp	rogue02-01	1,1,in_rogue,379,34
-cmd_fild07,352,275,0	warp	fild07-rogue03	1,1,in_rogue,265,122
-in_rogue,265,118,0	warp	rogue03-fild07	1,1,cmd_fild07,349,275
-in_rogue,244,20,0	warp	rogue04-fild09	1,1,cmd_fild09,106,192
-in_rogue,172,34,0	warp	rogue05-fild09	1,1,cmd_fild09,339,143
-in_rogue,160,103,0	warp	rogue06-fild04	1,1,cmd_fild04,301,177
+cmd_fild07,193,117,0	warp	fild07-rogue00	1,1,in_rogue,379,46
+in_rogue,375,46,0	warp	rogue00-fild07	1,1,cmd_fild07,196,117
+in_rogue,375,34,0	warp	rogue01-02	1,1,in_rogue,380,125
+in_rogue,375,125,0	warp	rogue02-01	1,1,in_rogue,379,33
+cmd_fild07,355,286,0	warp	fild07-rogue03	1,1,in_rogue,247,126
+in_rogue,247,122,0	warp	rogue03-fild07	1,1,cmd_fild07,349,285
+in_rogue,244,21,0	warp	rogue04-fild09	1,1,cmd_fild09,106,191
+in_rogue,172,34,0	warp	rogue05-fild09	1,1,cmd_fild09,341,143
+in_rogue,161,103,0	warp	rogue06-fild04	1,1,cmd_fild04,302,177
+in_rogue,8,9,0		warp	stair_to_ro	1,1,in_rogue,389,389
 
 //==============================================================================
 //Dancer
 //==============================================================================
-//job_duncer,69,43,0	warp 	duncer1	1,1,comodo,185,156
-job_duncer,70,45,0	warp	duncer1	2,2,comodo,193,149
+job_duncer,69,43,0	warp	duncer1	1,1,comodo,185,156