- Fixed a Assassin Quest question having all correct answers. (bugreport:3260)

- Fixed lots of random typos, thanks to BloodWist for pointing them out.

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

6 files changed, 23 insertions, 47 deletions

diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index c0a793105..ff9e9bf14 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 3.1b
+//= 3.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -44,6 +44,7 @@
 //= 3.1 Fixed problem with waiting room. (bugreport:1099) [L0ne_W0lf]
 //= 3.1a Follow up fix. Forgot to replace a label. [L0ne_W0lf]
 //= 3.1b Fixed waiting room not enabled in some situations [Zephyrus]
+//= 3.2 Fixed a question having all correct answers. [brianluau]
 //============================================================ 
 
 in_moc_16,19,33,1	script	Guildsman#asn	55,{
@@ -931,8 +932,8 @@ L_AskQuestions:
 			mes "[The Anonymous One]";
 			mes "6. Choose the correct specialty of the Assassin class.";
 			next;
-			select("Excellent singing talent:Excellent reading talent:Excellent dancing talent:Excellent dodge ability");
-			set .@assassin_t,.@assassin_t+10;
+			if (select("Excellent singing talent:Excellent reading talent:Excellent dancing talent:Excellent dodge ability") == 4)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "7. Choose the maximum AGI bonus an Assassin can get at job level 50.";
 			next;
@@ -948,8 +949,6 @@ L_AskQuestions:
 			next;
 			switch(select("Orange Gooey Mushroom:Red Gooey Mushroom:Orange Net Mushroom:Orange Hair Mushroom")) {
 			case 1:
-				set .@assassin_t,.@assassin_t+10;
-				break;
 			case 3:
 				set .@assassin_t,.@assassin_t+10;
 				break;
@@ -2147,7 +2146,7 @@ OnTouch:
 		end;
 	}
 }
-				
+
 in_moc_16,186,81,1	script	Master Assist	55,1,1,{
 	mes "[Assistent Gayle Maroubitz]";
 	mes "Sorry, but I'm not in charge of job changes. Go to the Guildmaster, as he has told you.";
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index 42b245443..13fa73fd6 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -2730,7 +2730,7 @@ kh_vila,115,186,0	script	Drawer#khp1	111,{
 			mes "^3355FFYou obtain a Yellow";
 			mes "Keycard from inside the";
 			mes "drawer. Opening that drawer";
-			mes "Fturned out to be worthwhile.^000000";
+			mes "turned out to be worthwhile.^000000";
 			getitem 7492,1; //Yellow_Key_Card
 			close;
 		case 2:
@@ -3174,7 +3174,7 @@ kh_vila,136,68,0	script	Sword Hilt#kh	111,{
 					}
 					next;
 					mes "^3355FFLastly, please select";
-					mes "Fthe snake in which you";
+					mes "the snake in which you";
 					mes "will insert the fourth sword.^000000";
 					next;
 					switch(select("First Snake:Second Snake:Third Snake:Fourth Snake")) {
@@ -4054,6 +4054,7 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 				mes "everything much more succinctly";
 				mes "than I can. I tend to ramble...";
 				set .@KHQRead,.@KHQRead+1;
+				next;
 				break;
 			case 2:
 				mes "[Kiel Hyre]";
@@ -4080,6 +4081,7 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 				mes "to do this. I still have";
 				mes "absolutely no clue...";
 				set .@KHQRead,.@KHQRead+1;
+				next;
 				break;
 			case 3:
 				mes "[Kiel Hyre]";
@@ -4098,10 +4100,10 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 				mes "his face! Kiehl just hired";
 				mes "him without letting me know...";
 				set .@KHQRead,.@KHQRead+1;
+				next;
 				break;
 			}
 			if (.@KHQRead == 3) {
-				next;
 				mes "[Kiel Hyre]";
 				mes "If you don't have";
 				mes "anymore questions for me,";
@@ -4406,7 +4408,7 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 		mes "I'm assuming the place you";
 		mes "two first met was near the";
 		mes "river. No more of your lies:";
-		mes "well me what really happened!";
+		mes "Tell me what really happened!";
 		next;
 		cutin "kh_kyel02",2;
 		mes "[Kiel Hyre]";
@@ -5626,7 +5628,7 @@ kh_rossi,92,40,0	script	Shelf#khr	111,{
 					next;
 					cutin "kh_ellisia_port",2;
 					mes "^3355FFThe message, ''To my love,";
-					mes "FAllysia. From James.'' is";
+					mes "Allysia. From James.'' is";
 					mes "written on the back.^000000";
 					getitem 7500,1; //Elysia_Portrait
 					close2;
@@ -5835,7 +5837,7 @@ yuno_fild12,232,222,0	script	Old Fisherman	709,{
 			mes "for me? Heh, how very";
 			mes "generous of you. If you're";
 			mes "going to be so kind, then";
-			mes "i suppose I have to repay";
+			mes "I suppose I have to repay";
 			mes "the favor. Ask me anything~";
 			next;
 			select("30 years ago, a woman killed herself...");
diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt
index 2e393efc2..84baba379 100644
--- a/npc/quests/eye_of_hellion.txt
+++ b/npc/quests/eye_of_hellion.txt
@@ -279,36 +279,11 @@ morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
 		mes "way or another.";
 		close;
 	}
-	else if (HELLIONQ == 45) {
-		mes "[Sir Chilias'Tyus]";
-		mes "Ah, yes! This is one piece";
-		mes "of the tablet that you will";
-		mes "lead you to the Hellion's gem!";
-		mes "This engraving was definitely";
-		mes "made by my grandfather, and Christopher was one of his friends.";
-		next;
-		mes "[Sir Chilias'Tyus]";
-		mes "I suppose he hid these pieces";
-		mes "in the places that reminded him";
-		mes "of his friends. Now according";
-		mes "to the tablet's message, you";
-		mes "should find the next piece in ''the city of thickest forest.''";
-		next;
-		mes "[Sir Chilias'Tyus]";
-		mes "I'm sure that the";
-		mes "next tablet piece is";
-		mes "in Payon, so go there";
-		mes "and see if you can find";
-		mes "it. Good luck to you,";
-		mes "kind adventurer.";
-		set HELLIONQ,47;
-		close;
-	}
-	else if (HELLIONQ == 46) {
+	else if (HELLIONQ == 45 || HELLIONQ == 46) {
 		mes "[Sir Chilias'Tyus]";
 		mes "Ah, yes! This is one piece";
-		mes "of the tablet that you will";
-		mes "lead you to the Hellion's gem!";
+		mes "of the tablet that will lead";
+		mes "you to the Hellion's gem!";
 		mes "This engraving was definitely";
 		mes "made by my grandfather, and Christopher was one of his friends.";
 		next;
@@ -1128,7 +1103,7 @@ OnTouch:
 			mes "[Veggie Lady]";
 			mes "Finally, you say it.";
 			mes "Yeesh, I thought I was";
-			mes "going to what forever for";
+			mes "going to wait forever for";
 			mes "somebody to say that";
 			mes "password. Okay, here's";
 			mes "the code number you want...";
@@ -1229,7 +1204,7 @@ prt_in,128,79,0	script	Unknown Machine#prt_key	111,{
 					next;
 					mes "^3355FFThe message engraved on";
 					mes "this tablet reads: ''This is for";
-					mes "for Christopher, my dear friend";
+					mes "Christopher, my dear friend";
 					mes "who I met in Prontera. To the";
 					mes "one who finds this, please seek";
 					mes "out the next piece of this tablet";
@@ -1280,7 +1255,7 @@ prt_in,128,79,0	script	Unknown Machine#prt_key	111,{
 			next;
 			mes "^3355FFThe message engraved on";
 			mes "this tablet reads: ''This is for";
-			mes "for Christopher, my dear friend";
+			mes "Christopher, my dear friend";
 			mes "who I met in Prontera. To the";
 			mes "one who finds this, please seek";
 			mes "out the next piece of this tablet";
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index bbc5269cc..826e729c4 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -5833,7 +5833,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "go to war for their beliefs.";
 					next;
 					mes "[High Priest Zhed]";
-					mes "The fact that they've evena";
+					mes "The fact that they've even";
 					mes "built a military camp in Thor";
 					mes "Volcano disturbs me greatly.";
 					mes "It's almost certain that they";
diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index 2309bfc2a..9d53a4b5e 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -84,7 +84,7 @@ um_in,39,122,5	script	Utan Chief	784,{
 		next;
 		mes "[Karkatan]";
 		mes "Sometimes, I teach the Utan";
-		mes "langauge, but I do not give";
+		mes "language, but I do not give";
 		mes "everyone that privilege.";
 		mes "If unscrupulous outsiders";
 		mes "learn the Utan language, they";
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index b779d05b7..55f83f21d 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -240,7 +240,7 @@ ve_fild05,257,130,4	script	Wincing Old Man#ve	945,{
 		mes "to know that now. That's";
 		mes "really very nice of him.";
 		next;
-		mes "Zabaroo]";
+		mes "[Zabaroo]";
 		mes "I hate to ask you...";
 		mes "But would you mind";
 		mes "helping me out one";
@@ -559,7 +559,7 @@ ve_in02,54,49,2	script	Factory Worker#ve1	943,{
 		mes "[Bahed]";
 		mes "Let me confirm Zabaroo's";
 		mes "quota for today. Ah, and";
-		mes "don't worry, We pay him";
+		mes "don't worry, we pay him";
 		mes "for his quotas regularly.";
 		next;
 		select("I have a question...");