* Rather large Kafra update. (May need further testing)

- Updated a good portion of the kafra functions.
- Added proper dialog for most functions.
- Updated guild Kafras and some o f their locations. 
* Updated all Guide NPCs. They are now mostly 100% official.
- Renamed some of the old files to make them look better, IE: yun to juno.
- Added Kunlun and Ayotaya guides.
* Added the Einbech tool Dealer since it seemed to had gotten lost when I updated shops.
* Updated Dye Maker and Hair Dyer to official. 

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

1 files changed, 208 insertions, 343 deletions

diff --git a/npc/guides/guides_lhz.txt b/npc/guides/guides_lhz.txt
index adc2b875d..7e13464e0 100644
--- a/npc/guides/guides_lhz.txt
+++ b/npc/guides/guides_lhz.txt
@@ -1,362 +1,227 @@
 //===== eAthena Script ======================================= 
 //= Lighthalzen Guides
 //===== By: ================================================== 
-//= MasterOfMuppets
+//= MasterOfMuppets; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
-//=
+//= eAthena SVN
 //===== Description: ========================================= 
-//= Lighthalzen Guide NPCs
+//= [Aegis Conversion]
+//= Guides for the City of Lighthalzen
 //===== Additional Comments: ================================= 
 //= 1.0 First Version [MasterOfMuppets]
 //= 1.1 Removed Duplicates [Silent]
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-lighthalzen,220,311,3	script	Guide::LhzSlum	852,{
-
+lighthalzen,207,310,5	script	Guide#lhz::LhzGuide	852,{
+	cutin "ein_soldier",2;
 	mes "[Lighthalzen Guide]";
-	mes "welcome to Lighthalzen,";
-	mes "the Coropration City-State.";
+	mes "Welcome to Lighthalzen,";
+	mes "the Corporation City-State.";
 	mes "If you need any guidance";
-	mes "around the city, feel free.";
+	mes "around the city, feel free";
 	mes "to ask me and I'll do my";
 	mes "very best to help you.";
-	next;
-loopback:
-	menu "City Guide",s_Guide,"Remove Marks from Mini-Map",s_Remove,"Notice.",s_Notice,"Cancel",-;
-
-	mes "[Lighthalzen Guide]";
-	mes "Lighthalzen is divided";
-	mes "into the East and West";
-	mes "districts by a railroad that";
-	mes "runs right through the middle.";
-	mes "There are always guards on";
-	mes "watch to protect the peace.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "Please don't hesitate";
-	mes "to report and suspicious";
-	mes "activity or persons to us.";
-	mes "We hope that you enjoy";
-	mes "our fair city, adventurer.";
-	close;
-
-s_Guide:
-	mes "[Lighthalzen Guide]";
-	mes "Please be aware that I'm";
-	mes "in charge of providing info";
-	mes "regarding the East District,";
-	mes "more commonly known as the";
-	mes "Slums. Select the location that";
-	mes "you'd like know more about.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "But before that,";
-	mes "would you like me";
-	mes "to mark locations";
-	mes "on your Mini-Map?";
-	next;
-	Menu "Yes",s_Yes,"No",-;
-
-	goto s_Cont;
-s_Yes:
-	set @tempguide,1;
-s_Cont:
-	menu "Tool Shop",s_Tool,"Mill",s_Mill,"Pub",s_Pub,"Cancel",-;
-
-	mes "[Lighthalzen Guide]";
-	mes "Please ask me to \"Remove";
-	mes "Marks from Mini-Map\" if you";
-	mes "no longer wish to have the";
-	mes "location marks displayed";
-	mes "on your Mini-Map.";
-	next;
-	goto loopback;
-
-s_Tool:
-	mes "[Lighthalzen Guide]";
-	mes "The Tool Shop is";
-	mes "located in the 11 o' clock";
-	mes "direction from the center";
-	mes "of the East District.";
-	if(@tempguide)viewpoint 1,324,301,1,0xFF0000;
-	next;
-	goto s_Cont;
-
-s_Mill:
-	mes "[Lighthalzen Guide]";
-	mes "On your Mini-Map,";
-	mes "the Mill can be found in";
-	mes "the 1 o'clock direction";
-	mes "in the East District.";
-	if(@tempguide)viewpoint 1,365,301,2,0xFF00FF;
-	next;
-	goto s_Cont;
-
-s_Pub:
-	mes "[Lighthalzen Guide]";
-	mes "The Pub is located";
-	mes "in the southern part";
-	mes "of the East District.";
-	if(@tempguide)viewpoint 1,346,232,3,0xCCFFFF;
-	next;
-	goto s_Cont;
-
-s_Remove:
-	viewpoint 2,324,301,1,0xFF0000;
-	viewpoint 2,365,301,2,0xFF00FF;
-	viewpoint 2,346,232,3,0xCCFFFF;
-	mes "[Lighthalzen Guide]";
-	mes "Okay, the marks from your Mini-Map have been removed.";
-	mes "If you need any guidance around Lighthalzen, please let me or one of the other Lighthalzen Guides know.";
-	next;
-	goto loopback;
-
-s_Notice:
-	mes "[Lighthalzen Guide]";
-	mes "Advances in sorcery and";
-	mes "techonlogy have allowed";
-	mes "us to update our information";
-	mes "system, enabling up to mark";
-	mes "locations on your Mini-Map";
-	mes "for easier navigation.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "Your Mini-Map is located";
-	mes "in the upper right cornern";
-	mes "of the screen. If you can't";
-	mes "see it, press the Ctrl + Tab";
-	mes "keys or click the \"Map\" button";
-	mes "in your Basic Info Window.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "On your Mini-Map,";
-	mes "click on the \"+\" and \"-\"";
-	mes "symbols to zoom in and";
-	mes "out of your Mini-Map. We";
-	mes "hope you enjoy your travels";
-	mes "here in Lighthalzen.";
-	next;
-	goto loopback;
-
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) {
+		case 1:
+			mes "[Lighthalzen Guide]";
+			mes "Please be aware that I'm";
+			mes "in charge of providing info";
+			mes "regarding the West District";
+			mes "of Lighthalzen. Now, please";
+			mes "select the location that you'd";
+			mes "like to learn more about.";
+			if (.@compass_check == 0) {
+				next;
+				mes "[Lighthalzen Guide]";
+				mes "But before that,";
+				mes "would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				switch(select("^FF0000Rekenber Corporation^000000:Train Staition:Police Station:Bank:Hotel:Airport:Merchant Guild:Jewelry Shop:Weapon Shop:Departement Store:Cancel")) {
+				case 1:
+					mes "[Lighthalzen Guide]";
+					mes "Rekenber Corporation,";
+					mes "the largest company in";
+					mes "the Schwaltzvalt Republic,";
+					mes "in located in northwestern";
+					mes "Lighthalzen. You can't miss";
+					mes "the headquarters building.";
+					if (.@compass_check)
+						viewpoint 1,102,247,2,0xFF0000;
+					break;
+				case 2:
+					mes "[Lighthalzen Guide]";
+					mes "The Train Station is";
+					mes "located in the center of";
+					mes "the city, where we have";
+					mes "a direct railroad to Einbroch.";
+					if (.@compass_check)
+						viewpoint 1,233,164,3,0xFF00FF;
+					break;
+				case 3:
+					mes "[Lighthalzen Guide]";
+					mes "Our Police Station is just";
+					mes "north of the city's center.";
+					mes "Please don't hesitate to report";
+					mes "any suspicious persons and";
+					mes "activity, or if you have any";
+					mes "problems whatsoever.";
+					if (.@compass_check)
+						viewpoint 1,236,276,4,0x99FFFFF;
+					break;
+				case 4:
+					mes "[Lighthalzen Guide]";
+					mes "The Bank is located";
+					mes "just opposite to the";
+					mes "Lighthalzen Police Station,";
+					mes "which is a pretty good idea";
+					mes "when I think about it, actually. ^FFFFFFspacer^000000";
+					if (.@compass_check)
+						viewpoint 1,198,257,5,0x0000FF;
+					break;
+				case 5:
+					mes "[Lighthalzen Guide]";
+					mes "Our Hotel is located in";
+					mes "the middle of the South Plaza.";
+					mes "Due to its quality services and";
+					mes "luxurious accomodations, this";
+					mes "hotel is extremely popular.";
+					if (.@compass_check)
+						viewpoint 1,159,133,6,0x00FF00;
+					break;
+				case 6:
+					mes "[Lighthalzen Guide]";
+					mes "The Airport is to the far";
+					mes "west of the Central Promenade.";
+					mes "You can travel anywhere within";
+					mes "the Schwaltzvalt Republic by";
+					mes "riding on one of the Airships.";
+					if (.@compass_check)
+						viewpoint 1,267,75,7,0x00FF00;
+					break;
+				case 7:
+					mes "[Lighthalzen Guide]";
+					mes "The Merchant Guild can be";
+					mes "found in the southwestern";
+					mes "part of Lighthalzen.";
+					if (.@compass_check)
+						viewpoint 1,74,53,8,0xFF99FF;
+					break;
+				case 8:
+					mes "[Lighthalzen Guide]";
+					mes "The Jewelry Shop is";
+					mes "located just west of";
+					mes "the South Plaza.";
+					if (.@compass_check)
+						viewpoint 1,93,110,9,0xFF9900;
+					break;
+				case 9:
+					mes "[Lighthalzen Guide]";
+					mes "The Weapon Shop is";
+					mes "located at the end of";
+					mes "the Central Promenade.";
+					mes "It's at least worth a look";
+					mes "if you're serious about";
+					mes "adventuring around here.";
+					if (.@compass_check)
+						viewpoint 1,196,46,10,0x330033;
+					break;
+				case 10:
+					mes "[Lighthalzen Guide]";
+					mes "The Department Store is";
+					mes "located in the middle of";
+					mes "Lighthalzen and is the biggest";
+					mes "and most convenient place for";
+					mes "shopping for almost everything.";
+					if (.@compass_check)
+						viewpoint 1,199,163,11,0xFFFF00;
+					break;
+				case 11:
+					mes "[Lighthalzen Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
+				}
+			}
+			break;
+		case 2:
+			viewpoint 2,102,247,2,0xFF0000;
+			viewpoint 2,233,164,3,0xFF00FF;
+			viewpoint 2,236,276,4,0x99FFFF;
+			viewpoint 2,198,257,5,0x0000FF;
+			viewpoint 2,159,133,6,0x00FF00;
+			viewpoint 2,267,75,7,0x00FF00;
+			viewpoint 2,74,53,8,0xFF99FF;
+			viewpoint 2,93,110,9,0xFF9900;
+			viewpoint 2,196,46,10,0x330033;
+			viewpoint 2,199,163,11,0xFFFF00;
+			set .@compass_check,0;
+			break;
+		case 3:
+			mes "[Lighthalzen Guide]";
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
+			next;
+			mes "[Lighthalzen Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
+			next;
+			mes "[Lighthalzen Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in Lighthalzen.";
+			break;
+		case 4:
+			mes "[Lighthalzen Guide]";
+			mes "Lighthalzen is divided";
+			mes "into the East and West";
+			mes "districts by a railroad that";
+			mes "runs right through the middle.";
+			mes "There are always guards on";
+			mes "watch to protect the peace.";
+			next;
+			mes "[Lighthalzen Guide]";
+			mes "Please don't hesitate";
+			mes "to report any suspicious";
+			mes "activity or persons to us.";
+			mes "We hope that you enjoy";
+			mes "our fair city, adventurer.";
+			close2;
+			set .@loop1,0;
+		}
+	}
+	cutin "ein_soldier",255;
+	end;
 }
 
-lighthalzen,207,311,3	script	Guide::LhzWest	852,{
-
-	mes "[Lighthalzen Guide]";
-	mes "welcome to Lighthalzen,";
-	mes "the Coropration City-State.";
-	mes "If you need any guidance";
-	mes "around the city, feel free.";
-	mes "to ask me and I'll do my";
-	mes "very best to help you.";
-	next;
-loopback:
-	menu "City Guide",s_Guide,"Remove Marks from Mini-Map",s_Remove,"Notice.",s_Notice,"Cancel",-;
-
-	mes "[Lighthalzen Guide]";
-	mes "Lighthalzen is divided";
-	mes "into the East and West";
-	mes "districts by a railroad that";
-	mes "runs right through the middle.";
-	mes "There are always guards on";
-	mes "watch to protect the peace.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "Please don't hesitate";
-	mes "to report and suspicious";
-	mes "activity or persons to us.";
-	mes "We hope that you enjoy";
-	mes "our fair city, adventurer.";
-	close;
-
-s_Guide:
-	mes "[Lighthalzen Guide]";
-	mes "Please be aware that I'm";
-	mes "in charge of providing info";
-	mes "regarding the West District,";
-	mes "of Lighthalzen. Now, please";
-	mes "select the location that you'd";
-	mes "like to learn more about.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "But before that,";
-	mes "would you like me";
-	mes "to mark locations";
-	mes "on your Mini-Map?";
-	next;
-	Menu "Yes",s_Yes,"No",-;
-
-	goto s_Cont;
-s_Yes:
-	set @tempguide,1;
-s_Cont:
-	menu "^FF0000Rekenber Corporation^000000",s_Rekenber,"Train Station",s_Train,"Police Station",s_Police,"Bank",s_Bank,"Hotel",s_Hotel,"Airport",s_Airport,"Merchant Guild",s_Merchant,"Jewel Shop",s_Jewel,"Weapon Shop",s_Weap,"Department Store",s_Store,"Cancel",-;
-
-	mes "[Lighthalzen Guide]";
-	mes "Please ask me to \"Remove";
-	mes "Marks from Mini-Map\" if you";
-	mes "no longer wish to have the";
-	mes "location marks displayed";
-	mes "on your Mini-Map.";
-	next;
-	goto loopback;
-
-s_Rekenber:
-	mes "[Lighthalzen Guide]";
-	mes "Rekenber Corporation,";
-	mes "the largest company in";
-	mes "the Schwarzwald Republic,";
-	mes "is located in the northwestern";
-	mes "Lighthalzen. You can't miss";
-	mes "the headquarters building.";
-	if(@tempguide)viewpoint 1,103,244,1,0xFF0000;
-	next;
-	goto s_Cont;
-
-s_Train:
-	mes "[Lighthalzen Guide]";
-	mes "The Train Station is";
-	mes "located in the center of";
-	mes "the city, where we have";
-	mes "a direct railroad to Einbroch.";
-	if(@tempguide)viewpoint 1,240,163,2,0xFF00FF;
-	next;
-	goto s_Cont;
-
-s_Police:
-	mes "[Lighthalzen Guide]";
-	mes "Our Police Station is just";
-	mes "north of the city's center.";
-	mes "Please don't hesitate to report";
-	mes "any suspicious persons and";
-	mes "activity, or if you have any";
-	mes "problems whatsoever.";
-	if(@tempguide)viewpoint 1,236,276,3,0xCCFFFF;
-	next;
-	goto s_Cont;
-
-s_Bank:
-	mes "[Lighthalzen Guide]";
-	mes "The Bank is located";
-	mes "just opposite to the";
-	mes "Lighthalzen Police Station,";
-	mes "which is a pretety good idea";
-	mes "when I think about it, actually.";
-	if(@tempguide)viewpoint 1,199,257,4,0x0000FF;
-	next;
-	goto s_Cont;
-
-s_Hotel:
-	mes "[Lighthalzen Guide]";
-	mes "Our Hotel is located in";
-	mes "the middle of the South Plaza.";
-	mes "Due to its quality of services and";
-	mes "luxurious accomodations, this";
-	mes "hotel is extremely popular.";
-	if(@tempguide)viewpoint 1,159,133,5,0x0FFF00;
-	next;
-	goto s_Cont;
-
-s_Airport:
-	mes "[Lighthalzen Guide]";
-	mes "The Airport is to the far";
-	mes "west of the Central Promenade";
-	mes "You can travel anywhere within";
-	mes "the Schwarzwald Republic by";
-	mes "riding one of the Airships.";
-	if(@tempguide)viewpoint 1,266,76,6,0x00FF00;
-	next;
-	goto s_Cont;
-
-s_Merchant:
-	mes "[Lighthalzen Guide]";
-	mes "The Merchant Guild can be";
-	mes "found in the southwestern";
-	mes "part of Lighthalzen.";
-	if(@tempguide)viewpoint 1,74,52,7,0xEFAEBD;
-	next;
-	goto s_Cont;
-
-s_Jewel:
-	mes "[Lighthalzen Guide]";
-	mes "The Jewelry Shop is";
-	mes "located just west of";
-	mes "the South Plaza.";
-	if(@tempguide)viewpoint 1,92,110,8,0xFF9500;
-	next;
-	goto s_Cont;
-
-s_Weap:
-	mes "[Lighthalzen Guide]";
-	mes "The Weapon Shop is";
-	mes "located at the end of";
-	mes "the Central Promenade.";
-	mes "It's at least worth a look";
-	mes "if you're serious about";
-	mes "adventuring around here.";
-	if(@tempguide)viewpoint 1,196,46,9,0x330033;
-	next;
-	goto s_Cont;
-
-s_Store:
-	mes "[Lighthalzen Guide]";
-	mes "The Department Store is";
-	mes "located in the middle of";
-	mes "Lighthalzen and is the biggest";
-	mes "and most convenient place for";
-	mes "shopping for almost everything.";
-	if(@tempguide)viewpoint 1,199,163,10,0xFFFF00;
-	next;
-	goto s_Cont;
-
-s_Remove:
-	viewpoint 2,103,244,1,0xFF0000;
-	viewpoint 2,240,163,2,0xFF00FF;
-	viewpoint 2,236,276,3,0xCCFFFF;
-	viewpoint 2,199,257,4,0x0000FF;
-	viewpoint 2,159,133,5,0x0FFF00;
-	viewpoint 2,266,76,6,0x00FF00;
-	viewpoint 2,74,52,7,0xEFAEBD;
-	viewpoint 2,92,110,8,0xFF9500;
-	viewpoint 2,196,46,9,0x330033;
-	viewpoint 2,199,163,10,0xFFFF00;
-	mes "[Lighthalzen Guide]";
-	mes "Okay, the marks from your Mini-Map have been removed.";
-	mes "If you need any guidance around Lighthalzen, please let me or one of the other Lighthalzen Guides know.";
-	next;
-	goto loopback;
-
-s_Notice:
-	mes "[Lighthalzen Guide]";
-	mes "Advances in sorcery and";
-	mes "techonlogy have allowed";
-	mes "us to update our information";
-	mes "system, enabling up to mark";
-	mes "locations on your Mini-Map";
-	mes "for easier navigation.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "Your Mini-Map is located";
-	mes "in the upper right cornern";
-	mes "of the screen. If you can't";
-	mes "see it, press the Ctrl + Tab";
-	mes "keys or click the \"Map\" button";
-	mes "in your Basic Info Window.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "On your Mini-Map,";
-	mes "click on the \"+\" and \"-\"";
-	mes "symbols to zoom in and";
-	mes "out of your Mini-Map. We";
-	mes "hope you enjoy your travels";
-	mes "here in Lighthalzen.";
-	next;
-	goto loopback;
-
-}
+lighthalzen,220,311,3	duplicate(LhzGuide)	Guide#2lhz	852
 
-lighthalzen,154,100,5	duplicate(LhzWest)	Guide#lhz1	852
+lighthalzen,154,100,5	duplicate(LhzGuide)	Guide#3lhz	852
 
-lighthalzen,319,243,5	duplicate(LhzSlum)	Guide#lhz2	852
+lighthalzen,307,224,3	duplicate(LhzGuide)	Guide#4lhz	852