* Fixed some bugs in Crusader Job change quest.

* Minor fix on NPC name in Swordman tutorial quest.

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

3 files changed, 7 insertions, 4 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index bded6e502..54ea5a02f 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,8 @@
 Date		Added
 ======
 2007/05/15
+	* Fixed some bugs in Crusader Job change quest. [SinSloth]
+	* Minor fix on NPC name in Swordman tutorial quest. [SinSloth]
 	* Minor Kiel Hyre Quest optimization with extra goto, else or empty switch [Lupus]
 2007/05/13
 	* Updated Monk Skill QUest to the Official One. [Samuray22]
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index cf444838f..b4c8ff193 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -5,7 +5,7 @@
 //= Converted by: Shin
 //=
 //===== Current Version: ===================================== 
-//= 2.2
+//= 2.3
 //===== Compatible With: ===================================== 
 //= eAthena  0.5.2 +
 //===== Description: ========================================= 
@@ -32,6 +32,7 @@
 //= 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.
+//= 2.3 Fixed some bugs that prevented from going further. [SinSloth]
 //============================================================
 
 
@@ -360,7 +361,7 @@ prt_castle,164,32,7	script	Suffering Man	733,5,5{
 			mes "Your name is..." + strcharinfo(0) + "...right?";
 			mes "Come over; let me see your face.";
 			next;
-			if(getequipname(7) != "Rosary" || getequipname(8) != "Rosary") {
+			if((getequipid(7) != 2608 ) && (getequipid(8) != 2608 )) {
 				mes "[Murnak Myjol]";
 				mes "Oh, you don't even have a Rosary, how to become a Crusader?";
 				mes "I don't want to see the guy like you, go out and buy a Carrot.";
@@ -389,7 +390,7 @@ prt_castle,164,32,7	script	Suffering Man	733,5,5{
 			mes "[Murnak Myjol]";
 			mes "Let's start then.";
 			close2;
-			warp job_cru,23,42;
+			warp "job_cru",23,42;
 			break;
 		case 2:
 			mes "[Murnak Myjol]";
diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt
index 0ddb3eddc..9c185d8ea 100644
--- a/npc/quests/first_class/tu_sword.txt
+++ b/npc/quests/first_class/tu_sword.txt
@@ -12,6 +12,7 @@
 //= 1.0 Fully working
 //= 1.1 optimized [Lupus]
 //=	TODO: Test, Add correct misceffects numbers
+//= 1.2 Fixed a typo on NPC name. [SinSloth]
 //============================================================ 
 
 
@@ -660,7 +661,6 @@ izlude_in,82,163,3	script	Shurank	733,{
 		close;
 		break;
 	case 3:
-		mes "[Shurank]";
 		mes "If you want to be";
 		mes "able to use the full";
 		mes "power of the Bash skill,";