fixed some typos, optimized, added missing NEXT;

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

npc/Changelog.txt

@@ -32,6 +32,9 @@ Playtester
 
 Date		Added
 ======
+09/14
+	* Fixed typos in Gunslinger & Thief Job Quest & various NPCs [Lupus]
+		thanks to cbmaster & $ephiroth
 09/11
 	* Moved custom Umbalian quests to custom folder [Lupus]
 	* Added back Guild Storage. Confirmed kRO feature. [Lupus]

npc/cities/prontera.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.8a
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -130,7 +130,7 @@ prontera.gat,102,287,5	script	Shuger	98,{
 
 //------------------------------------------------------------------------------------- Prontera Church -------------------------------------------------------------------------------\\
 // Henson ---------------------------------------------------------------
-prt_church.gat,103,71,2	script	Benson	120,{
+prt_church.gat,103,71,2	script	Henson	120,{
 	mes "[Henson]";
 	mes "Our duty is not only to help others, but to also purify poor souls that have been turned into the Undead.";
 	mes "In order to successfully accomplish our duty, we have to learn special skills and practice them very diligently.";
@@ -157,14 +157,12 @@ L_MENU:
 		next;
 		mes "[Henson]";
 		mes "Also, you have to acquire 3 levels of 'Demon Bane' to use a skill called, 'Signum Crisis', which lowers the Defence of Undead and Dark property monsters.";
-		next;
 		goto L_MENU;
 
 	L2:
 		mes "[Henson]";
 		mes "When you use this skill, the movement speed, attack rate, and evasion rate of a targeted monster will be reduced.";
 		mes "You will need to get 1 level of 'Increase AGI' first, before you can learn 'Decrease AGI.";
-		next;
 		goto L_MENU;
 
 	L3:
@@ -174,7 +172,6 @@ L_MENU:
 		next;
 		mes "[Henson]";
 		mes "Do not be disappointed even if you don't successfully use this skill all the time.  You need level 3 'Demon Bane' to acquire this skill.";
-		next;
 		goto L_MENU;
 
 	L4:
@@ -183,20 +180,17 @@ L_MENU:
 		next;
 		mes "[Henson]";
 		mes "It generates a barrier that defends you perfectly from long-range attacks, such as archer attacks.";
-		next;
 		goto L_MENU;
 
 	L5:
 		mes "[Henson]";
 		mes "Ruwach allows you to see hidden monsters or players.  You also need this skill to learn 'Teleport.";
-		next;
 		goto L_MENU;
 
 	L6:
 		mes "[Henson]";
 		mes "At level 1, it allows you teleport to a random spot on the map you are in.  At level2 it allows you to teleport to your last save point.";
 		mes "You must learn Ruwach first in order to learn teleport.";
-		next;
 		goto L_MENU;
 
 	L_END:
@@ -216,8 +210,8 @@ prt_church.gat,103,76,2	script	Garnet	67,{
 	next;
 	mes "[Garnet]";
 	mes "Feel free to ask me anything.  Although the priest scolds me for my lack of skill, I can assure you I have a VERY STRONG grasp of the theories.";
-	next;
 L_MENU:
+	next;
 	menu "About Heal",-,"About Cure",L1,"About Increase AGI",L2,"About Angelus",L3,"Abour Blessing",L4,"About Warp Portal",L5,"End conversation",L_END;
 	
 		mes "[Garnet]";
@@ -229,19 +223,16 @@ L_MENU:
 		mes "[Garnet]";
 		mes "Here is a little secret... if you use 'Heal' on Undead monsters, it will actually inflict damage, not help them.";
 		mes "Ah~ Don't forget to hold the 'Shift' key when you use it though... Ahem~ shhhhh~~!";
-		next;
 		goto L_MENU;
 
 	L1:
 		mes "[Garnet]";
 		mes "'Cure' can alleviate any abnormal status effects you may have.  You have to have level 2 'Heal' in order to learn Cure though.";
-		next;
 		goto L_MENU;
 
 	L2:
 		mes "[Garnet]";
 		mes "'Increase AGI' increases your movement speed, attack rate, and evade rate.  You can learn it after you've learned 3 levels of 'Heal'.";
-		next;
 		goto L_MENU;
 
 	L3:
@@ -254,7 +245,6 @@ L_MENU:
 		next;
 		mes "[Garnet]";
 		mes "If you practice 'Angelus' you'll be able to use 'Kyrie Eleison' as a Priest, which allows you to evade attacks for a short period of time.";
-		next;
 		goto L_MENU;
 
 	L4:
@@ -263,7 +253,6 @@ L_MENU:
 		next;
 		mes "[Garnet]";
 		mes "'Blessing', like 'Angelus', also requires you know 'Divine Protection'.  But you'll need to have 5 levels of 'Divine Protection' to learn it.";
-		next;
 		goto L_MENU;
 
 	L5:
@@ -283,7 +272,6 @@ L_MENU:
 		next;
 		mes "[Garnet]";
 		mes "One more thing, you cannot Warp to the inside of dungeons so don't even waste your time trying to.";
-		next;
 		goto L_MENU;
 
 	L_END:

npc/cities/valkyrie.txt

@@ -147,6 +147,7 @@ L_PAY:
 	mes "Two. You have to venture deep inside of Yuno castle, into the Heart of Ymir.";
 	mes "Remember that you cannot view the book unless you have done this.";
 	mes "Now go, brave one.";
+	next;
 	menu "Pay now",-,"Close",M_EXIT;
 
 	mes "[Librarian]";

npc/custom/jobs/reset.txt

@@ -5,8 +5,8 @@ prontera.gat,150,193,4	script	Reset Girl	124,{
 	mes "Reset Stats: 5,000z";
 	mes "Reset Skills: 5,000z";
 	mes "Reset Both: 9,000z";
-	next;
 	mes "Please select the service you want:";
+	next;
 	menu "^FF3355Reset Skills",L0,"Reset Stats",L1,"Reset Both^000000",L2,"Quit",LEnd;
 	
 	L0:

npc/jobs/1-1/thief.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= eAthena dev team
 //===== Current Version: =====================================
-//= 1.6
+//= 1.6a
 //===== Compatible With: =====================================
 //= eAthena 1.0 +
 //===== Description: =========================================
@@ -15,7 +15,7 @@
 //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
 //= Fixed possible EXP abuse [Lupus]
 //= 1.5 Now saves/restores all quest skills [Lupus]
-//= 1.6 Merged back JFunc [Lupus]
+//= 1.6 Merged back JFunc [Lupus] 1.6a typos
 //============================================================
 
 
@@ -71,7 +71,6 @@ moc_prydb1.gat,39,129,5	script	Thief Guide	69,{
 	if(job_thief_q==2) goto L_1;
 	if(job_thief_q==1) goto L_Back;
 
-	mes "[Thief Guide]";
 	if(Sex) {
 		mes "Heh... You look like a well to do boy... what brought you down to this rat hole?";
 	}else{

npc/jobs/1-1e/gunslinger.txt

@@ -7,7 +7,7 @@
 //= DON'T REMOVE THIS! (by request of him, he provided all
 //= the info regarding the quests and shops.)
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.7a
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -20,122 +20,119 @@
 //= 1.6 job number->const, commonized variable name,
 //= 	optimized [Lupus]
 //= 1.7 Now uses only ONE variable GUNS_Q [Lupus]
+//= 1.7a Grammar fixes, few spelling fixes, etc [CBMaster]
 //============================================================ 
 
 que_ng.gat,152,167,3	script	Gunslinger Jobchanger	901,{
 
-set @npcname$,"[Armsmith]";
+	set @npcname$,"[Armsmith]";
-
+	if (Class == Job_Novice) {
-if (Class == Job_Novice) {
+		if (GUNS_Q >= 1) {
-
+			mes @npcname$;
-	if (GUNS_Q >= 1) {
+			mes "So, you've come back?";
-		mes @npcname$;
+			next;
-		mes "So, you've comeback?";
+			if (GUNS_Q == 10005) {
-		next;
+				if (SkillPoint > 0) {
-		if (GUNS_Q == 10005) {
+					mes @npcname$;
-			if (SkillPoint > 0) {
+					mes "Err, excuse me, but you still have Skill Points left. You have to use them all before I can turn you into a Gunslinger.";
+					close2;
+					set @npcname$,"";
+					end;
+				} else if (JobLevel < 10) {
+					mes @npcname$;
+					mes "Err, excuse me, but your job level is not sufficient. You need to have a job level of 10 in order to change to a Gunslinger";
+					close2;
+					set @npcname$,"";
+					end;
+				}
 				mes @npcname$;
-				mes "Err, excuse me, but you still have Skill Points left. You have to use them all first before I can turn you into a Gunslinger";
+				mes "Glad to know you did what Mr. Tanieh asked you to do, makes me know you're worthy of being..";
-				close2;
+				next;
-				set @npcname$,"";
-				end;
-			} else if (JobLevel < 10) {
 				mes @npcname$;
-				mes "Err, excuse me, but you don't have Level 10 Job. You need to have 10 level job in order to change to Gunslinger";
+				mes "A Gunslinger!!";
+				callfunc "Job_Change",Job_Gunslinger;
+				callfunc "F_ClearJobVar";		//clears all job variables for the current player
+				next;
+				mes @npcname$;
+				mes "Oh, I forgot, here's a token of my appreciation";
+				getitem 13150,1;
 				close2;
 				set @npcname$,"";
 				end;
 			}
 			mes @npcname$;
-			mes "Glad to know you did what Mr. Tanieh asked you to do, makes me know you're worthy of being..";
+			mes "But you still haven't done what I told you, need me to repeat it?";
-			next;
+			switch (select ("Yes, Please:No, Thanks")) {
-			mes @npcname$;
+				case 1:
-			mes "A Gunslinger!!!";
+					next;
-			callfunc "Job_Change",Job_Gunslinger;
+					mes @npcname$;
-			callfunc "F_ClearJobVar";		//clears all job variables for the current player
+					mes "You need to go to Payon. At the small wooden wall and in the south exit, Mr. Tanieh will be there waiting to ask you a few things. Go now...";
-			next;
+					close2;
-			mes @npcname$;
+					set @npcname$,"";
-			mes "Oh, I forgot, here's a token of my appreciation";
+					end;
-			getitem 13150,1;
+				case 2:
-			close2;
+					next;
-			set @npcname$,"";
+					mes @npcname$;
-			end;
+					mes "Then GET GOING! You do want to become a Gunslinger, right?";
-		} else
+					close2;
+					set @npcname$,"";
+					end;
+			}
+		}
 		mes @npcname$;
-		mes "But you still haven't done what I told you, need me to repeat it?";
+		mes "Hi ^0000CC"+strcharinfo(0)+"^000000,I need you to do something for me first, will you?";
-		switch (select ("Yes, Please:No, Thanks")) {
+		switch (select ("Yes:No")) {
 			case 1:
 				next;
 				mes @npcname$;
-				mes "You need to go to Payon. At the small wooden wall and in the south exit, Mr. Tanieh will be there waiting to ask you a few things. Go now then";
+				mes "Good, I need you to go to Payon and do a few things from Mr. Tanieh.";
+				next;
+				mes @npcname$;
+				mes "He'll be waiting for you next to the small wooden wall of the south exit. See you later then.";
 				close2;
+				set GUNS_Q,1;
 				set @npcname$,"";
 				end;
 			case 2:
 				next;
 				mes @npcname$;
-				mes "Then GET GOING! Don't you want to become a gunslinger, do you?";
+				mes "Too bad for you son. Come back when you are willing to do so.";
 				close2;
 				set @npcname$,"";
 				end;
-			}
-	} else
-
-	mes @npcname$;
-	mes "Hi ^0000CC"+strcharinfo(0)+"^000000,I need you to do something for me first, will you?";
-	switch (select ("Yes:No")) {
-			case 1:
-			next;
-			mes @npcname$;
-			mes "Good, I need you to go to Payon and do a few things from Mr. Tanieh";
-			next;
-			mes @npcname$;
-			mes "He'll be waiting for you next to the small wooden wall of the south exit. See you later then";
-			close2;
-			set GUNS_Q,1;
-			set @npcname$,"";
-			end;
-		case 2:
-			next;
-			mes @npcname$;
-			mes "Too bad for you son";
-			close2;
-			set @npcname$,"";
-			end;
 		} 
 
-	} else 
+	}
-		mes @npcname$;
+	mes @npcname$;
-		mes "Hi son, how's life treating you?";
+	mes "Hi son, how's life treating you?";
-		set @npcname$,"";
+	set @npcname$,"";
-		close;
+	close;
 }
 
 payon.gat,184,65,3	script	Mr. Tanieh	866,{
 
-set @npcname$,"[Mr. Tanieh]";
+	set @npcname$,"[Mr. Tanieh]";
+	if (GUNS_Q == 1) {
+		mes @npcname$;
+		mes "Oh, you're ^0000CC"+strcharinfo(0)+"^000000, right? Einbroch's Armsmith told me you were going to help me with a few things.";
+		next;
+		mes @npcname$;
+		mes "I need to make a special soup for my wife, but, as you can see, I am not in conditions to look for the items, she's sick you know?";
+		next;
+		mes @npcname$;
+		mes "So, will you do it, please?";
+		switch (select ("Yes, I will:Sorry I can't now")) {
+			case 1:
+				set GUNS_Q,callfunc("F_RandMes",4,1019,1066,1067,1068);
+				goto L_LIST;
 
-if (GUNS_Q == 1) {
+			case 2:
-	mes @npcname$;
+				next;
-	mes "Oh, you're ^0000CC"+strcharinfo(0)+"^000000, right? Einbroch's Armsmith told me you were going to help me in a few things";
+				mes @npcname$;
-	next;
+				mes "Oh, what am I going to do now...";
-	mes @npcname$;
+				close2;
-	mes "I need to make a special soup for my wife, but, as you can see, I am not in conditions to look for the items, she's sick you know?";
+				set @npcname$,"";
-	next;
+				end;
-	mes @npcname$;
-	mes "So, will you do it, please?";
-	switch (select ("Yes, I will:Sorry I can't now")) {
-		case 1:
-			set GUNS_Q,callfunc("F_RandMes",4,1019,1066,1067,1068);
-			goto L_LIST;
-
-		case 2:
-			next;
-			mes @npcname$;
-			mes "Oh, what am I going to do now...";
-			close2;
-			set @npcname$,"";
-			end;
 		}
 
 	} else if (GUNS_Q > 1 && GUNS_Q < 10000) {
@@ -170,33 +167,33 @@ if (GUNS_Q == 1) {
 					set @npcname$,"";
 					end;
 				} else if (countitem(511) < 3) {
-						mes @npcname$;
+					mes @npcname$;
-						mes "Sorry, you're missing a few Green Herbs";
+					mes "Sorry, you're missing a few Green Herbs";
-						close2;
+					close2;
-						set @npcname$,"";
+					set @npcname$,"";
-						end;
+					end;
 				} else if (countitem(935) < 10) {
 					mes @npcname$;
 					mes "Sorry, you're missing a few Shells";
 					close2;
 					set @npcname$,"";
 					end;
-				} else
+				}
-					mes @npcname$;
+				mes @npcname$;
-					mes "GREAT! You brought them all! Thanks very much!";
+				mes "GREAT! You brought them all! Thanks very much!";
-					delitem 949,3;
+				delitem 949,3;
-					delitem 912,3;
+				delitem 912,3;
-					delitem 1013,3;
+				delitem 1013,3;
-					delitem GUNS_Q,1; //here we keep Trunk ID
+				delitem GUNS_Q,1; //here we keep Trunk ID
-					delitem 935,10;
+				delitem 935,10;
-					delitem 511,3;
+				delitem 511,3;
-					next;
+				next;
-					mes @npcname$;
+				mes @npcname$;
-					mes "Oh my~~ You've been of great help. I'll recommend you to the Einbroch Armory for your job change.";
+				mes "Oh my, you've been of great help. I'll recommend you to the Einbroch Armory for your job change.";
-					close2;
+				close2;
-					set GUNS_Q,10003;
+				set GUNS_Q,10003;
-					set @npcname$,"";
+				set @npcname$,"";
-					end;
+				end;
 			case 2:
 			L_LIST:
 				next;
@@ -210,16 +207,16 @@ if (GUNS_Q == 1) {
 				mes "^FF6600 10 Shells^000000";
 				next;
 				mes @npcname$;
-				mes "Hurry please, I am not sure if my wife will last any longer... oh dear";
+				mes "Hurry please, I am not sure if my wife will last any longer... oh dear..";
 				close2;
 				set @npcname$,"";
 				end;
-			}
+		}
 	} else if (GUNS_Q == 10003) || (GUNS_Q == 10004) {
 		if (countitem(519) >= 1) && (GUNS_Q == 10004) {
 			mes @npcname$;
 			mes "THAT'S IT!! I was missing the Milk! Oh yes, thanks so much, will you give it to me?";
-			switch(select("Yes, take it please:Sorry but I need it")) {
+			switch(select("Sure, take it:Sorry but I need it")) {
 				case 1:
 					next;
 					mes @npcname$;
@@ -232,28 +229,28 @@ if (GUNS_Q == 1) {
 				case 2:
 					next;
 					mes @npcname$;
-					mes "OH please, I need it so much, thing about it please";
+					mes "Oh please, I need it so much, think about it please...";
 					close2;
 					set @npcname$,"";
 					end;
 			}
-		} else					
+		}
 		mes @npcname$;
-		mes "*sigh* All I need now is wait. Thanks for your help... but I believe there's something missing..";
+		mes "*sigh* Now I have to wait again... Thanks for your help... but I believe there's something missing..";
 		close2;
 		set @npcname$,"";
 		set GUNS_Q,10004;
 		end;
 	} else if (Class == Job_Gunslinger) || (GUNS_Q == 10005) {
 		mes @npcname$;
-		mes "Hi ^0000CC"+strcharinfo(0)+"^000000!, how have you been doing? My wife sends you regards and thanks for the ingredients";
+		mes "Hi ^0000CC"+strcharinfo(0)+"^000000!, how have you been doing? My wife sends you regards and thanks for the ingredients...";
 		close2;
 		set @npcname$,"";
 		end;
 	} 
-mes @npcname$;
+	mes @npcname$;
-mes "Hi son, how you doing? Nice day eh?";
+	mes "Hi son, how's life treating you? Nice day, isn't it?";
-close2;
+	close2;
-set @npcname$,"";
+	set @npcname$,"";
-end;
+	end;
 }

npc/quests/skills/acolyte_skills.txt

@@ -102,6 +102,7 @@ L_Check:
 	mes "use ^5555FFHoly Light^000000!";
 	skill 156,1,0;
 	set HOLYLIGHT, 0;
+	next;
 	mes "[Priest]";
 	mes "You have done well.  May God bless you!";
 	emotion e_no1;

npc/quests/skills/merchant_skills.txt

@@ -160,6 +160,7 @@ L_GetSkill:
 // Note: It is not supposed to take these items, just check you have collected them
 	skill 154,1,0;
 	set CHANGECART, 0;
+	next;
 	mes "[Charlron]";
 	mes "Good luck, see you around";
 	close;