* 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, 27 insertions, 78 deletions

diff --git a/npc/guides/guides_lighthalzen.txt b/npc/guides/guides_lighthalzen.txt
index 045e7b1a2..52ee73902 100644
--- a/npc/guides/guides_lighthalzen.txt
+++ b/npc/guides/guides_lighthalzen.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 Lighthalzen
+//= Guides for the city of Lighthalzen.
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
+//= 1.1 Optimized. [Euphy]
 //============================================================ 
 
 lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
@@ -38,92 +39,52 @@ lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 			while (.@loop) {
 				switch(select("[ Hotel ]:[ Bank ]:[ Airport ]:[ Weapon Shop ]:[ Department Store ]:[ Police Station ]:[ Jewelry Store ]:[ Cool Event Corp. ]:[ Somatology Laboratory ]:[ Alchemist Association ]:Previous Menu")) {
 				case 1:
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the location";
-					mes "of the ^FF0000Hotel^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^FF0000Hotel";
 					viewpoint 1,160,217,0,0xFF0000;
 					next;
 					break;
 				case 2:
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the location";
-					mes "of the ^FF4500Bank^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^FF4500Bank";
 					viewpoint 1,203,257,1,0xFF4500;
 					next;
 					break;
 				case 3:
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the location";
-					mes "of the ^DAA520Airport^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^DAA520Airport";
 					viewpoint 1,262,75,2,0xDAA520;
 					next;
 					break;
 				case 4:
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the location";
-					mes "of the ^7B68EEWeapon Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^7B68EEWeapon Shop";
 					viewpoint 1,194,35,3,0x7B68EE;
 					next;
 					break;
 				case 5:
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the location";
-					mes "of the ^B91A4DDepartment Store^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^B91A4DDepartment Store";
 					viewpoint 1,202,106,4,0xB91A4D;
 					next;
 					break;
 				case 6:
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the location";
-					mes "of the ^008000Police Station^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^008000Police Station";
 					viewpoint 1,234,276,5,0x008000;
 					next;
 					break;
 				case 7:
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the location";
-					mes "of the ^0000FFJewelry Store^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^0000FFJewelry Store";
 					viewpoint 1,96,110,6,0x0000FF;
 					next;
 					break;
 				case 8:
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the location";
-					mes "of the ^000080Cool Event Corp.^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^000080Cool Event Corp.";
 					viewpoint 1,238,217,7,0x000080;
 					next;
 					break;
 				case 9:
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the location";
-					mes "of the ^800080Somatology Laboratory^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^800080Somatology Laboratory";
 					viewpoint 1,101,243,8,0x800080;
 					next;
 					break;
 				case 10:
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the location of";
-					mes "^0A9696Alchemist Association^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^0A9696Alchemist Association";
 					viewpoint 1,54,132,9,0x0A9696;
 					next;
 					break;
@@ -144,11 +105,7 @@ lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 					mes "on the 1st floor of the Weapon Shop.";
 					viewpoint 1,194,35,10,0x0A9696;
 					next;
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the location";
-					mes "of the ^0A9696Armsmith^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^0A9696Armsmith";
 					next;
 					break;
 				case 2:
@@ -159,38 +116,22 @@ lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 					mes "of the Weapon Shop.";
 					viewpoint 1,194,35,11,0x4B0082;
 					next;
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the location";
-					mes "of ^4B0082Seiyablem^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^4B0082Seiyablem",1;
 					next;
 					break;
 				case 3:
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the location";
-					mes "of the ^FF4500Pet Groomer^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^FF4500Pet Groomer";
 					viewpoint 1,222,191,12,0xFF4500;
 					next;
 					break;
 				case 4:
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the locations";
-					mes "of the ^008080Kafra Employees^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^008080Kafra Employees";
 					viewpoint 1,164,99,13,0x008080;
 					viewpoint 1,164,99,14,0x008080;
 					next;
 					break;
 				case 5:
-					mes "[Lighthalzen Guide]";
-					mes "I will mark the location";
-					mes "of the ^FF1493Cool Event Corp. Staff^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^FF1493Cool Event Corp. Staff";
 					viewpoint 1,94,247,15,0xFF1493;
 					next;
 					break;
@@ -230,6 +171,14 @@ lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 			end;
 		}
 	}
+	end;
+L_Mark:
+	mes "[Lighthalzen Guide]";
+	mes "I will mark the location";
+	mes "of "+((getarg(1,0))?"":"the ")+getarg(0)+"^000000";
+	mes "on your mini-map.";
+	mes "Would you like to check any other locations?";
+	return;
 }
 
 lighthalzen,220,310,3	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz02	852