* Corrected and optimized 12 guide NPCs (/guides/)

* Fixed a small typo in Warlock quest, bugreport:6164 (jobs\3-1\warlock.txt)
* Fixed a couple of job constant typos in "Nameless Island Quests" (quests\quests_nameless.txt)
* Removed non-RE changelogs from RE scripts

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

1 files changed, 39 insertions, 77 deletions

diff --git a/npc/guides/guides_hugel.txt b/npc/guides/guides_hugel.txt
index 7b3fd27ac..aa343f9ef 100644
--- a/npc/guides/guides_hugel.txt
+++ b/npc/guides/guides_hugel.txt
@@ -3,14 +3,15 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
-//= rAthena  SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
-//= Guides for the city of Hugel
+//= Guides for the city of Hugel.
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
+//= 1.1 Optimized. [Euphy]
 //============================================================ 
 
 hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
@@ -19,6 +20,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 	mes "Welcome to ^8B4513Hugel^000000. I am honored to guide you in this beautiful village.";
 	mes "If this is the first time for you to use the guide services, you should ask a lot of questions.";
 	next;
+	set .@str$,"Would you like to know more locations?";
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
@@ -28,7 +30,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 				case 1:
 					mes "[Hugel Guide Granny]";
 					mes "Well, to me, this Church is rather like a place for old folks like me, you know...";
-					mes "Would you like to know more locations?";
+					mes .@str$;
 					viewpoint 1,159,113,0,0xFF0000;
 					next;
 					break;
@@ -36,7 +38,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					mes "[Hugel Guide Granny]";
 					mes "Pudding rather than praise.";
 					mes "You'd better unpack your stuff first before you start looking around this village.";
-					mes "Would you like to know more locations?";
+					mes .@str$;
 					viewpoint 1,101,77,1,0x8B4513;
 					next;
 					break;
@@ -44,7 +46,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					mes "[Hugel Guide Granny]";
 					mes "Yes, when you travel, you want to drop by a Pub and make new friends.";
 					mes "Go east from here, then you will arrive at the pub.";
-					mes "Would you like to know more locations?";
+					mes .@str$;
 					viewpoint 1,126,65,2,0xDAA520;
 					next;
 					break;
@@ -52,7 +54,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					mes "[Hugel Guide Granny]";
 					mes "A while ago, strangers came to the village and built that strange Airport kind of thing...";
 					mes "What do they call it? Airship?";
-					mes "Would you like to know more locations?";
+					mes .@str$;
 					viewpoint 1,178,146,3,0xD7567F;
 					next;
 					break;
@@ -60,7 +62,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					mes "[Hugel Guide Granny]";
 					mes "Well, we have a Weapon Shop in the center of the village.";
 					mes "But I don't know if there is any weapon that you find useful.";
-					mes "Would you like to know more locations?";
+					mes .@str$;
 					viewpoint 1,88,167,4,0xCD5C5C;
 					next;
 					break;
@@ -68,7 +70,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					mes "[Hugel Guide Granny]";
 					mes "Yes, I love Hugel brand Red Potions. I haven't tasted Red Potions from any other brands yet...hohoho. ";
 					mes "The tool shop is located in the center of village.";
-					mes "Would you like to know more locations?";
+					mes .@str$;
 					viewpoint 1,92,163,5,0x000080;
 					next;
 					break;
@@ -77,7 +79,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					mes "I will mark the location";
 					mes "of the ^800080Bingo Game Room^000000";
 					mes "on your mini-map.";
-					mes "Would you like to know more locations?";
+					mes .@str$;
 					viewpoint 1,58,206,6,0x800080;
 					next;
 					break;
@@ -85,7 +87,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					mes "[Hugel Guide Granny]";
 					mes "Oh, are you an aspiring Hunter?";
 					mes "Then head northeast following the beach, then you will find the Hunter Guild.";
-					mes "Would you like to know more locations?";
+					mes .@str$;
 					viewpoint 1,209,224,7,0xFF1493;
 					next;
 					break;
@@ -94,7 +96,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					mes "I will mark the location";
 					mes "of the ^483D8BParty Supplies Shop^000000";
 					mes "on your mini-map.";
-					mes "Would you like to know more locations?";
+					mes .@str$;
 					viewpoint 1,95,103,8,0x483D8B;
 					next;
 					break;
@@ -102,8 +104,8 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					mes "[Hugel Guide Granny]";
 					mes "I heard that the Shrine Expedition is staying in a house at the west.";
 					mes "They have put some kind of sign in the middle of village, so I guess that they are hiring people for something...";
-					mes "I wonder what they are doing in here...hmmm.";
-					mes "Would you like to know more locations?";
+					mes "I wonder what they are doing in here... hmmm.";
+					mes .@str$;
 					viewpoint 1,52,95,9,0x834683;
 					next;
 					break;
@@ -121,7 +123,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					mes "[Hugel Guide Granny]";
 					mes "I also like playing Monster Race games. It is pretty fun, you know?";
 					mes "Oh, you haven't tried it yet? No~ you'd better try. Trust me, you will like it.";
-					mes "Would you like to know more locations?";
+					mes .@str$;
 					viewpoint 1,60,71,10,0xFF1493;
 					next;
 					break;
@@ -130,7 +132,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					mes "I will mark the location";
 					mes "of the ^DA70D6Cool Event Corp. Staff^000000";
 					mes "on your mini-map.";
-					mes "Would you like to know more locations?";
+					mes .@str$;
 					viewpoint 1,88,168,11,0xDA70D6;
 					next;
 					break;
@@ -167,7 +169,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 	}
 }
 
-hugel,187,172,6	script	Guide Rich King#	414,{
+hugel,187,172,6	script	Guide Rich King#hugel	414,{
 	mes "[Guide Rich King]";
 	mes "What business do you have";
 	mes "in this countryside village?";
@@ -184,92 +186,52 @@ hugel,187,172,6	script	Guide Rich King#	414,{
 			while (.@loop) {
 				switch(select("[ Church ]:[ Inn ]:[ Pub ]:[ Airport ]:[ Weapon Shop ]:[ Tool Shop ]:[ Bingo Game Room ]:[ Hunter Guild ]:[ Party Supplies Shop ]:[ Shrine Expedition ]:Previous Menu")) {
 				case 1:
-					mes "[Rich King]";
-					mes "I will mark the location";
-					mes "of the ^FF0000Church^000000.";
-					mes "Do you want to know more locations?";
-					mes "Are you going to keep bugging me and make me get upset?";
+					callsub L_Mark,"^FF0000Church";
 					viewpoint 1,159,113,0,0xFF0000;
 					next;
 					break;
 				case 2:
-					mes "[Rich King]";
-					mes "I will mark the location";
-					mes "of the ^8B4513Inn^000000.";
-					mes "Do you want to know more locations?";
-					mes "Are you going to keep bugging me and make me get upset?";
+					callsub L_Mark,"^8B4513Inn";
 					viewpoint 1,101,77,1,0x8B4513;
 					next;
 					break;
 				case 3:
-					mes "[Rich King]";
-					mes "I will mark the location";
-					mes "of the ^DAA520Pub^000000.";
-					mes "Do you want to know more locations?";
-					mes "Are you going to keep bugging me and make me get upset?";
+					callsub L_Mark,"^DAA520Pub";
 					viewpoint 1,126,65,2,0xDAA520;
 					next;
 					break;
 				case 4:
-					mes "[Rich King]";
-					mes "I will mark the location";
-					mes "of the ^D7567FAirport^000000.";
-					mes "Do you want to know more locations?";
-					mes "Are you going to keep bugging me and make me get upset?";
+					callsub L_Mark,"^D7567FAirport";
 					viewpoint 1,178,146,3,0xD7567F;
 					next;
 					break;
 				case 5:
-					mes "[Rich King]";
-					mes "I will mark the location";
-					mes "of the ^CD5C5CWeapon Shop^000000.";
-					mes "Do you want to know more locations?";
-					mes "Are you going to keep bugging me and make me get upset?";
+					callsub L_Mark,"^CD5C5CWeapon Shop";
 					viewpoint 1,88,167,4,0xCD5C5C;
 					next;
 					break;
 				case 6:
-					mes "[Rich King]";
-					mes "I will mark the location";
-					mes "of the ^000080Tool Shop^000000.";
-					mes "Do you want to know more locations?";
-					mes "Are you going to keep bugging me and make me get upset?";
+					callsub L_Mark,"^000080Tool Shop";
 					viewpoint 1,92,163,5,0x000080;
 					next;
 					break;
 				case 7:
-					mes "[Rich King]";
-					mes "I will mark the location";
-					mes "of the ^800080Bingo Game Room^000000.";
-					mes "Do you want to know more locations?";
-					mes "Are you going to keep bugging me and make me get upset?";
+					callsub L_Mark,"^800080Bingo Game Room";
 					viewpoint 1,58,206,6,0x800080;
 					next;
 					break;
 				case 8:
-					mes "[Rich King]";
-					mes "I will mark the location";
-					mes "of the ^FF1493Hunter Guild^000000.";
-					mes "Do you want to know more locations?";
-					mes "Are you going to keep bugging me and make me get upset?";
+					callsub L_Mark,"^FF1493Hunter Guild";
 					viewpoint 1,209,224,7,0xFF1493;
 					next;
 					break;
 				case 9:
-					mes "[Rich King]";
-					mes "I will mark the location";
-					mes "of the ^483D8BParty Supplies Shop^000000.";
-					mes "Do you want to know more locations?";
-					mes "Are you going to keep bugging me and make me get upset?";
+					callsub L_Mark,"^483D8BParty Supplies Shop";
 					viewpoint 1,95,103,8,0x483D8B;
 					next;
 					break;
 				case 10:
-					mes "[Rich King]";
-					mes "I will mark the location";
-					mes "of the ^834683Shrine Expedition^000000.";
-					mes "Do you want to know more locations?";
-					mes "Are you going to keep bugging me and make me get upset?";
+					callsub L_Mark,"^834683Shrine Expedition";
 					viewpoint 1,52,95,9,0x834683;
 					next;
 					break;
@@ -284,20 +246,12 @@ hugel,187,172,6	script	Guide Rich King#	414,{
 			while (.@loop) {
 				switch(select("[ Monster Race Arena ]:[ Cool Event Corp. Staff ]:Previous Menu")) {
 				case 1:
-					mes "[Rich King]";
-					mes "I will mark the location";
-					mes "of the ^FF1493Monster Race Arena^000000.";
-					mes "Do you want to know more locations?";
-					mes "Are you going to keep bugging me and make me get upset?";
+					callsub L_Mark,"^FF1493Monster Race Arena";
 					viewpoint 1,60,71,10,0xFF1493;
 					next;
 					break;
 				case 2:
-					mes "[Rich King]";
-					mes "I will mark the location";
-					mes "of the ^DA70D6Cool Event Corp. Staff^000000.";
-					mes "Do you want to know more locations?";
-					mes "Are you going to keep bugging me and make me get upset?";
+					callsub L_Mark,"^DA70D6Cool Event Corp. Staff";
 					viewpoint 1,88,168,11,0xDA70D6;
 					next;
 					break;
@@ -332,4 +286,12 @@ hugel,187,172,6	script	Guide Rich King#	414,{
 			close;
 		}
 	}
+	end;
+L_Mark:
+	mes "[Rich King]";
+	mes "I will mark the location";
+	mes "of the "+getarg(0)+"^000000.";
+	mes "Do you want to know more locations?";
+	mes "Are you going to keep bugging me and make me get upset?";
+	return;
 }