* 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, 146 insertions, 101 deletions

diff --git a/npc/guides/guides_einbe.txt b/npc/guides/guides_einbe.txt
index d53e05675..c5ba272bb 100644
--- a/npc/guides/guides_einbe.txt
+++ b/npc/guides/guides_einbe.txt
@@ -1,13 +1,14 @@
 //===== eAthena Script ======================================= 
 //= Einbech Guides
 //===== By: ================================================== 
-//= Muad_dib
+//= Muad_dib; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.4a
+//= 1.5
 //===== Compatible With: ===================================== 
-//= eAthena 7.15 +
+//= eAthena SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis Conversion]
+//= Guides for the City of Einbroch
 //===== Additional Comments: ================================= 
 //= 1.0 Einbech guide by Muad_dib in prometheus format
 //= 1.0a Conversion to eA format [MasterOfMuppets]
@@ -16,105 +17,149 @@
 //= 1.3 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
 //= 1.4 Removed Duplicates [Silent]
 //= 1.4a missing tabs [KarLaeda]
+//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
-einbech,67,37,4	script	Guide#1::Einbech_Guide	852,{
-	cutin "ein_soldier",2;
-	mes "[Einbech Guide]";
-	mes "Welcome to Einbech, the Mining Town.";
-	mes "We're here to assist tourists, so if you have any questions, please feel free to ask us.";
-L_MENU:
-	next;
-	menu "City Guide",-,"Remove Marks from Mini-Map",L_REMOVE,"Notice",L_NOTICE,"Cancel",L_END;
-
-	mes "[Einbech Guide]";
-	mes "Please select a location from the following menu.";
-	mes "Would you like me to mark locations on your Mini-Map?";
-	next;
-	menu "Yes.",L_YES,"No.",-;
 
-	set @COMPASS_CHECK,0;
-	goto L_CONT;
-L_YES:
-	set @COMPASS_CHECK,1;
-L_CONT:
-L_MENU_2:
-	menu "Train Station",L_TRAIN,"Tavern",L_TAVERN,"Tool Shop",L_TOOL,"Swordman Guild",L_SWORD,"Mine",L_MINE,"Cancel",-;
-
-	mes "[Einbech Guide]";
-	mes "Please ask me to Remove marks from Mini-Map if you no longer wish to have the location marks displayed on your Mini-Map.";
-	goto L_MENU;
-L_TRAIN:
-	mes "[Einbech Guide]";
-	mes "The Train Stations are located in the nortwest and northeast parts of Einbech.";
-	mes "There, you can take a train to Einbroch. They are running between here and Einbroch all day long, everyday.";
-	viewpoint 1,44,216,1,0xFF0000;
-	next;
-	goto L_WIPE;
-L_TAVERN:
-	mes "[Einbech Guide]";
-	mes "The Tavern is located in the southern part of Einbech.";
-	mes "It's a nice place to relax after a long day.";
-	viewpoint 1,145,112,2,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_TOOL:
-	mes "[Einbech Guide]";
-	mes "You can find the Tool Shop in the center of Einbech.";
-	mes "There, you can purchase any tools you might need for your travels.";
-	viewpoint 1,177,135,3,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_SWORD:
-	mes "[Einbech Guide]";
-	mes "The Swordman Guild is located in the eastern outskirts of Einbech.";
-	mes "It's under construction and they haven't started accepting applications.";
-	viewpoint 1,253,109,4,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_MINE:
-	mes "[Einbech Guide]";
-	mes "The Mine, which is Einbech's major industry, is located in the northern part of this town.";
-	mes "It's where we get all of our ores, although monsters get in the mines way.";
-	viewpoint 1,138,250,5,0x00FF00;
-	next;
-	goto L_WIPE; 
-L_WIPE:
-	if(@COMPASS_CHECK == 1)goto L_MENU_2;
-	viewpoint 2,44,216,1,0xFF0000;
-	viewpoint 2,145,112,2,0xFF00FF;
-	viewpoint 2,177,135,3,0xFF00FF;
-	viewpoint 2,253,109,4,0xFF00FF;
-	viewpoint 2,138,250,5,0x00FF00;
-	goto L_MENU_2;
-L_REMOVE:
-	viewpoint 2,44,216,1,0xFF0000;
-	viewpoint 2,145,112,2,0xFF00FF;
-	viewpoint 2,177,135,3,0xFF00FF;
-	viewpoint 2,253,109,4,0xFF00FF;
-	viewpoint 2,138,250,5,0x00FF00;
-	mes "[Einbech Guide]";
-	mes "Okay, the marks from your Mini-Map have been removed.";
-	mes "If you need any guidance around Einbroch please let me or one of the other Einbech Guides know.";
-	goto L_MENU;
-L_NOTICE:
-	mes "[Einbech Guide]";
-	mes "Through the technology of the Schwarzwald Republic, we've upgraded to a digital information system that allows us to mark locations on your Mini-Map for easier navigation.";
-	next;
-  	mes "[Einbech Guide]";
-  	mes "Your Mini-Map is located in the upper right corner of the screen.";
-	mes "If you can't see it, press the Ctrl + Tab keys or click the 'Map' button in your Basic Information Window.";
-  	next;
-  	mes "[Einbech Guide]";
- 	mes "On your Mini-Map, click on the '+' and '-' symbols to zoom in and out of your Mini-Map.";
-	mes "We hope you enjoy your travels here in the city of Einbech.";
- 	goto L_MENU;
-L_END:
+einbech,67,37,4	script	Guide#4ein::EinGuide2	852,{
+	cutin "ein_soldier",2;
 	mes "[Einbech Guide]";
-	mes "We hope that you";
-	mes "enjoy your travels";
-	mes "here in Einbech.";
-	cutin "ein_soldier",255; 
-	close;
+	mes "Welcome to Einbech,";
+	mes "the Mining Town. We're";
+	mes "here to assist tourists,";
+	mes "so if you have any questions,";
+	mes "please feel free to ask us.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide.:Remove Marks from Mini-Map.:Notice.:Cancel.")) {
+		case 1:
+			mes "[Einbech Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				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("Train Station:Tavern:Tool Shop:Swordman Guild:Mine:Cancel")) {
+				case 1:
+					mes "[Einbech Guide]";
+					mes "The Train Stations are";
+					mes "located in the northwest";
+					mes "and northeast parts of";
+					mes "Einbech. There, you can";
+					mes "take a train to Einbroch.";
+					if (.@compass_check)
+						viewpoint 1,43,213,2,0xFF0000;
+					break;
+				case 2:
+					mes "[Einbech Guide]";
+					mes "The Tavern is located";
+					mes "in the southern part of";
+					mes "Einbech. It's a nice place";
+					mes "to relax after a long day.";
+					if (.@compass_check)
+						viewpoint 1,142,112,3,0xFF00FF;
+					break;
+				case 3:
+					mes "[Einbech Guide]";
+					mes "You can find the Tool";
+					mes "Shop in the center of";
+					mes "Einbech. There, you can";
+					mes "purchase any tools you";
+					mes "might need for your travels.";
+					if (.@compass_check)
+						viewpoint 1,176,136,4,0xFF00FF;
+					break;
+				case 4:
+					mes "[Einbech Guide]";
+					mes "The Swordman Guild";
+					mes "is located in the eastern";
+					mes "outskirts of Einbech. It's";
+					mes "under construction and they";
+					mes "haven't started accepting";
+					mes "applications.";
+					if (.@compass_check)
+						viewpoint 1,250,110,5,0xFF00FF;
+					break;
+				case 5:
+					mes "[Einbech Guide]";
+					mes "The Mine, which is";
+					mes "Einbech's major industry,";
+					mes "is located in the northern";
+					mes "part of this town. It's where";
+					mes "we get all our ores, although monsters get in the miners' way.";
+					if (.@compass_check)
+						viewpoint 1,138,251,6,0x00FF00;
+					break;
+				case 6:
+					mes "[Einbech 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,43,213,2,0xFF0000;
+			viewpoint 2,142,112,3,0xFF00FF;
+			viewpoint 2,176,136,4,0xFF00FF;
+			viewpoint 2,250,110,5,0xFF00FF;
+			viewpoint 2,138,251,6,0x00FF00;
+			set .@compass_check,0;
+			mes "[Einbech Guide]";
+			mes "Okay, the marks from";
+			mes "your Mini-Map have been";
+			mes "removed. If you need any";
+			mes "guidance around Einbech,";
+			mes "please let me or one of the";
+			mes "other Einbech Guides know.";
+			break;
+		case 3:
+			mes "[Einbech Guide]";
+			mes "Through the technology of";
+			mes "the Schwaltzvalt Republic,";
+			mes "we've upgraded to a digital";
+			mes "information system that allows";
+			mes "us to mark locations on your";
+			mes "Mini-Map for easier navigation.";
+			next;
+			mes "[Einbech 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 "[Einbech 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 Einbech, adventurer.";
+			break;
+		case 4:
+			mes "[Einbech Guide]";
+			mes "We hope that you";
+			mes "enjoy your travels";
+			mes "here in Einbech.";
+			close2;
+			set .@loop1,0;
+		}
+	}
+	cutin "ein_soldier",255;
+	end;
 }
 
-einbech,48,214,4	duplicate(Einbech_Guide)	Guide#Ein2	852
+einbech,48,214,4	duplicate(EinGuide2)	Guide#5ein	852