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

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

npc/Changelog.txt

@@ -1,6 +1,7 @@
 Date		Added
 ======
 2007/09/22
+	* Rev. 11278 2-2 job quest update. Although completable, further testing (and optimizing) required. [L0ne_W0lf]
 	* Rev. 11276 Added more warps between Juno Satellite and Castle Interiors. [L0ne_W0lf]
 	- castle 1, 4 and 5 entrances are questionable, and will be updated as I get more information.
 	* Fixed a small bug in Einbroch Pollution quest. [SinSloth]

npc/jobs/2-2/bard.txt

@@ -5,21 +5,11 @@
 //===== Current Version: ===================================== 
 //= 2.3
 //===== Compatible With: ===================================== 
-//= eAthena Final
+//= eAthena SVN
 //===== Description: ========================================= 
-//= Bard job quest based on ASB 4.0.
+//= [Aegis Conversion]
-//= Updated to Aegis 10.3 standard.
+//= Job quest for Bard class
 //===== Additional Comments: =================================
-//= 07/06/05 : Added 1st Version. [Muad_Dib]
-//= Converted to eAthena format by Dr.Evil
-//= Info about gifts and other info --> http://www.ragnainfo.net/forums/viewtopic.php?t=51467&start=0 
-//= 1.1 Optimized, changed some stuff, fixed some bugs [Lupus]
-//= 1.1a minor song test fix [Lupus]
-//= 1.2 Fixed wrong item ID, added missing commands [Lupus]
-//= 1.3 Updated flower sub-quest according to official [Lupus]
-//= 1.4 Changed priority for the gifts. Now you can win the 1st
-//= prize, too. Added Izidor flower [Lupus]
-//= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1b Updated to the Official One. [Samuray22]
 //= 2.2 Fixed BUG when baby classes weren't able to get a job,
 //=	- fixed bug with final prize [Lupus] HAVE TO CHANE ALL ITEMS to numeric IDs
@@ -946,3 +936,17 @@ S_ChangeJob:
 		cutin "job_bard_aiolo01",255;
 		end;
 }
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 07/06/05 : Added 1st Version. [Muad_Dib]
+//= Converted to eAthena format by Dr.Evil
+//= Info about gifts and other info --> http://www.ragnainfo.net/forums/viewtopic.php?t=51467&start=0 
+//= 1.1 Optimized, changed some stuff, fixed some bugs [Lupus]
+//= 1.1a minor song test fix [Lupus]
+//= 1.2 Fixed wrong item ID, added missing commands [Lupus]
+//= 1.3 Updated flower sub-quest according to official [Lupus]
+//= 1.4 Changed priority for the gifts. Now you can win the 1st
+//= prize, too. Added Izidor flower [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]

npc/jobs/2-2/crusader.txt

@@ -6,28 +6,11 @@
 //===== Current Version: ===================================== 
 //= 2.8
 //===== Compatible With: ===================================== 
-//= eAthena  0.5.2 +
+//= eAthena  SVN
 //===== Description: ========================================= 
-//= 
+//= [Aegis Conversion]
+//= Job quest for Crusader classes
 //===== Additional Comments: ================================= 
-//= Need optimalization and fixing
-//= thanks to Komurka, KiLLaLeN, Lupus (fixing error)
-//= just a temp Job Quest
-//= 1.2 minor fix of announcement by Freya people
-//= 1.3 Added Baby Class Support, fixed 40/50 lvl item reward
-//=     also fixed too common script names [Lupus]
-//= 1.3a fixed "dead lock" bugs [Lupus]
-//= 1.3b changed monsters ID in patience test [Komurka]
-//= 1.4 Fixed Job Level parameters mix-up. [massdriller] (Thanks to Komurka)
-//= 1.5 Fixed possible EXP abuse [Lupus]
-//= 1.6 Added a func which prevent advanced classes passing
-//=     2nd Job Quests again. It also guides adv classes where
-//=     to go. [Lupus]
-//= 1.7 Updated names and required items, Chivalry Emblem +
-//=     Hand of God allow to skip item gathering [DracoRPG]
-//= 2.0 Changed numbers to constants. [Vicious]
-//= 2.1 Fixed endless loop, wrong condition check [Lupus]
-//=	also changed all job numbers to constants, fixed logic
 //= 2.2 Updated All NPCs to the officials one [Samuray22]
 //=	-Based on the ASB 4.0 Package.
 //=	-Maybe need be checked the monsters in the test 2 and 4.
@@ -40,7 +23,7 @@
 //=	- Fixed some indentation.
 //= 2.5 Fixed some spelling and grammar in crusader quest. [L0ne_W0lf]
 //= 2.6 Fixed bug (about totally blocked baby class), optimized,
-//=		made some NPC more unique names: Monster Summon#cr1 [Lupus]
+//=	made some NPC more unique names: Monster Summon#cr1 [Lupus]
 //= 2.7 Fixed Some variables like ".@item", and changed to "@item". [Samuray22]
 //= 2.8 Fixed a little minor bug. [Samuray22]
 //============================================================
@@ -1491,9 +1474,9 @@ OnEnd:
 
 }
 
-//==============================================================================
+//============================================================ 
 // mapflag
-//==============================================================================
+//============================================================ 
 job_cru	mapflag	nomemo
 job_cru	mapflag	noteleport
 job_cru	mapflag	nosave	SavePoint
@@ -1501,3 +1484,25 @@ job_cru	mapflag	nopenalty
 job_cru	mapflag	nobranch
 job_cru	mapflag	noexp
 job_cru	mapflag	noloot
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= Need optimalization and fixing
+//= thanks to Komurka, KiLLaLeN, Lupus (fixing error)
+//= just a temp Job Quest
+//= 1.2 minor fix of announcement by Freya people
+//= 1.3 Added Baby Class Support, fixed 40/50 lvl item reward
+//=     also fixed too common script names [Lupus]
+//= 1.3a fixed "dead lock" bugs [Lupus]
+//= 1.3b changed monsters ID in patience test [Komurka]
+//= 1.4 Fixed Job Level parameters mix-up. [massdriller] (Thanks to Komurka)
+//= 1.5 Fixed possible EXP abuse [Lupus]
+//= 1.6 Added a func which prevent advanced classes passing
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
+//= 1.7 Updated names and required items, Chivalry Emblem +
+//=     Hand of God allow to skip item gathering [DracoRPG]
+//= 2.0 Changed numbers to constants. [Vicious]
+//= 2.1 Fixed endless loop, wrong condition check [Lupus]
+//=	also changed all job numbers to constants, fixed logic

npc/quests/quests_yuno.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.6
+//= 1.7
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -28,6 +28,7 @@
 //=	Merged metto_quest.txt into Juno quest file.
 //=	Added the Juno portion of the Doomed Swords quest.
 //= 1.6 Fixed various errors in the Bajin NPC. [L0ne_W0lf]
+//= 1.7 Changed ALCH_Q check and set to corrispond to new alchemist job quest. [L0ne_W0lf]
 //============================================================ 
 
 // Metto Quest
@@ -467,7 +468,7 @@ yuno_in01,103,157,3	script	Bain#juno	98,{
 	//	close;
 	//}
 	if (countitem(974) > 0 && countitem(612) > 4 && countitem(1003) > 4 && countitem(7068) > 4 && countitem(7043) > 4 && countitem(757) > 2 && countitem(756) > 2 && Zeny > 2000) {
-		if (ALCH_Q == 6) set ALCH_Q2,2;
+		if (ALCH_Q == 23) set ALCH_Q,24;
 		set .@kyulkwa,rand(1,10);
 		mes "[Bain]";
 		mes "Oh ho ho... These are the parts that I needed. Thank you so much.";
@@ -599,7 +600,7 @@ yuno_in01,100,153,7	script	Bajin	47,0,0,{
 	//	close;
 	//}
 	if (countitem(974) > 0 && countitem(612) > 4 && countitem(1003) > 4 && countitem(7068) > 4 && countitem(7043) > 4 && countitem(757) > 2 && countitem(756) > 2 && Zeny > 2000) {
-		if (ALCH_Q == 6) set ALCH_Q2,2;
+		if (ALCH_Q == 23) set ALCH_Q,24;
 		set .@kyulkwa,rand(1,10);
 		mes "[Bajin]";
 		mes "Oh ho ho... These are the parts";

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,65,53,0	warp	alche#1	1,1,alde_alche,20,175
-aldebaran,54,66,0	warp	alche01	1,1,alde_alche,41,174
+aldebaran,53,65,0	warp	alche#2	1,1,alde_alche,42,175
-alde_alche,41,171,0	warp	alche02	1,1,aldebaran,56,68
+alde_alche,19,171,0	warp	alche#1	1,1,aldebaran,68,56
-//Alchemist Hall 1st Floor Top Rooms
+alde_alche,42,171,0	warp	alche#1	1,1,aldebaran,56,68
-alde_alche,129,104,0	warp	alche03	1,1,alde_alche,163,163
+alde_alche,41,186,0	warp	alche#1F_2F	1,1,alde_alche,113,178
-alde_alche,159,163,0	warp	alche04	1,1,alde_alche,126,104
+alde_alche,114,183,0	warp	alche#2F_1F	1,1,alde_alche,42,182
-alde_alche,131,77,0	warp	alche05	1,1,alde_alche,162,107
+alde_alche,13,184,0	warp	alche#1F_B1	1,1,alde_alche,88,113
-alde_alche,159,107,0	warp	alche06	1,1,alde_alche,128,77
+alde_alche,88,117,0	warp	alche#B1_1F	1,1,alde_alche,13,181
-//Alchemist Hall 1st Floor Bottom Rooms
+alde_alche,46,104,0	warp	alche#B1_r1	1,1,alde_alche,157,17
-alde_alche,47,103,0	warp	alche07	1,1,alde_alche,88,18
+alde_alche,160,17,0	warp	alche#r1_b1	1,1,alde_alche,50,103
-alde_alche,92,18,0	warp	alche08	1,1,alde_alche,50,103
+alde_alche,46,77,0	warp	alche#B1_r2	1,1,alde_alche,88,17
-alde_alche,47,77,0	warp	alche09	1,1,alde_alche,155,18
+alde_alche,93,17,0	warp	alche#r2_b1	1,1,alde_alche,50,77
-alde_alche,159,18,0	warp	alche10	1,1,alde_alche,50,77
+alde_alche,89,62,0	warp	alche#B1_r3	1,1,alde_alche,17,23
-//Alchemist Hall 2nd Floor - 1st Floor Link
+alde_alche,17,29,0	warp	alche#r3_b1	1,1,alde_alche,89,67
-alde_alche,14,184,0	warp	alche11	1,1,alde_alche,88,113
+alde_alche,133,77,0	warp	alche#B1_r4	1,1,alde_alche,162,107
-alde_alche,88,117,0	warp	alche12	1,1,alde_alche,14,180
+alde_alche,158,107,0	warp	alche#r4_b1	1,1,alde_alche,129,77
-//Alchemist Hall 2nd Floor Rooms
+alde_alche,133,103,0	warp	alche#B1_r5	1,1,alde_alche,164,164
-alde_alche,19,171,0	warp	alche13	1,1,aldebaran,68,56
+alde_alche,158,163,0	warp	alche#r5_b1	1,1,alde_alche,129,103
-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
 
 //==============================================================================
 //Rogue
 //==============================================================================
-cmd_fild07,193,117,0	warp	fild07-rogue00	1,1,in_rogue,378,46
+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,195,116
+in_rogue,375,46,0	warp	rogue00-fild07	1,1,cmd_fild07,196,117
-in_rogue,376,34,0	warp	rogue01-02	1,1,in_rogue,378,125
+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,34
+in_rogue,375,125,0	warp	rogue02-01	1,1,in_rogue,379,33
-cmd_fild07,352,275,0	warp	fild07-rogue03	1,1,in_rogue,265,122
+cmd_fild07,355,286,0	warp	fild07-rogue03	1,1,in_rogue,247,126
-in_rogue,265,118,0	warp	rogue03-fild07	1,1,cmd_fild07,349,275
+in_rogue,247,122,0	warp	rogue03-fild07	1,1,cmd_fild07,349,285
-in_rogue,244,20,0	warp	rogue04-fild09	1,1,cmd_fild09,106,192
+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,339,143
+in_rogue,172,34,0	warp	rogue05-fild09	1,1,cmd_fild09,341,143
-in_rogue,160,103,0	warp	rogue06-fild04	1,1,cmd_fild04,301,177
+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,69,43,0	warp	duncer1	1,1,comodo,185,156
-job_duncer,70,45,0	warp	duncer1	2,2,comodo,193,149