* 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, 213 insertions, 188 deletions

diff --git a/npc/guides/guides_pron.txt b/npc/guides/guides_pron.txt
index 25ac43bde..ac45b4583 100644
--- a/npc/guides/guides_pron.txt
+++ b/npc/guides/guides_pron.txt
@@ -1,13 +1,14 @@
 //===== eAthena Script ======================================= 
 //= Prontera Guides
 //===== By: ================================================== 
-//= kobra_k88
+//= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.5
+//= 1.6
 //===== Compatible With: ===================================== 
-//= eAthena  0.5.2 +
+//= eAthena  SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis Conversion]
+//= Guides for hte City of Prontera
 //===== Additional Comments: ================================= 
 //= Fully working
 //= v1.1 Now using duplicate command.
@@ -16,196 +17,220 @@
 //=     to Muad_Dib
 //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
 //= 1.5 Removed Duplicates [Silent]
+//= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-
-prontera,154,187,4	script	Guide::Prt_Guide	105,{
+prontera,154,187,4	script	Guide#prt::PrtGuide	105,{
 	cutin "prt_soldier",2;
 	mes "[Prontera Guide]";
-	mes "Welcome to Prontera, the beautiful capital of the Run-Midgard Kingdom.";
-	mes " If you have questions or need help find something in the city, don't hesitate to ask.";
-L_MENU:
-	next;
-	menu "City Guide",L_CITY,"Remove Marks from Mini-Map",L_REMOVE,"Notice",L_NOTICE,"Cancel",L_END;
-L_CITY:
-	mes "[Prontera 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.",L_NO;
-L_NO:
-  		set @COMPASS_CHECK,0;
-	goto L_CONT;
-L_YES:
-  		set @COMPASS_CHECK,1;
-L_CONT:
-L_MENU_2:
-	menu "Swordman Association",L_SWORD,"^0000FFSanctuary^000000",L_SANCTUARY,"Prontera Chivalry",L_CHIVALRY,"Weapon Shop",L_WEAPON,"Tool Shop",L_TOOL,"Inn",L_INN,"Trading Post",L_TRADING,"Pub",L_PUB,"Library",L_LIBRARY,"Job Agency",L_JOB,"Prontera Castle",L_CASTLE,"City Hall",L_HALL,"Cancel",-;
-	mes "[Prontera Guide]";
- 	mes "Pleas 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_SWORD:
-	mes "[Prontera Guide]";
-	mes "The Swordman Association, which handles Job Changes to the Swordman class, has moved to Izlude.";
-	mes "This facility is just an empty building now.";
-	viewpoint 1,237,41,1,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_SANCTUARY:
-	mes "[Prontera Guide]";
-	mes "The Prontera Sanctuary handles Job Changes to the Acolyte class, and can be found in the northeast corner of Prontera.";
-	viewpoint 1,236,316,2,0xFF0000;
-	next; 
-	goto L_WIPE;
-L_CHIVALRY:
-	mes "[Prontera Guide]";
-	mes "The Prontera Chivalry, which is responsible for the safety of our capital, is in Prontera's northwest corner.";
-	viewpoint 1,46,345,3,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_WEAPON:
-	mes "[Prontera Guide]";
-	mes "The Weapon Shop is located northeast of the central fountain.";
-	viewpoint 1,175,220,4,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_TOOL:
-	mes "[Prontera Guide]";
-	mes "The Tool Shop is located northwest of the central fountain.";
-	viewpoint 1,134,221,5,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_INN:
-	mes "[Prontera Guide]";
-	mes "The Inns in Prontera are located both to the east and west of Prontera's central fountain area.";
-	viewpoint 1,204,214,6,0xFF00FF;
-	viewpoint 1,107,192,7,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_TRADING:
-	mes "[Prontera Guide]";
-	mes "The Trading Post can be found southeast from the central fountain.";
-	viewpoint 1,179,184,8,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_PUB:
-	mes "[Prontera Guide]";
-	mes "The Pub is located southeast of the fountain, behind the Trading Post.";
-	viewpoint 1,208,154,9,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_LIBRARY:
-	mes "[Prontera Guide]";
-	mes "If you head north from the central fountain, you'll find an empty area in which both branches of the Prontera Library can be accessed if you head towards the east or west.";
-	viewpoint 1,120,267,10,0x00FF00;
-	viewpoint 1,192,267,11,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_JOB:
-	mes "[Prontera Guide]";
-	mes "The Job Agency is just southwest of the central fountain area.";
-	viewpoint 1,133,183,12,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_CASTLE:
-	mes "[Prontera Guide]";
-	mes "The Prontera Castle is located at the northern sector of this city.";
-	mes " You can go to fields that are north of Prontera by going through the castle's rear exit.";
-	viewpoint 1,156,360,13,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_HALL:
-	mes "[Prontera Guide]";
-	mes "The City Hall is located in the southwest corner in our city of Prontera.";
-	viewpoint 1,75,91,14,0x00FF00;
-	next; 
-	goto L_WIPE;
-L_WIPE:
- 		if(@COMPASS_CHECK == 1)goto L_MENU_2;
-		viewpoint 2,237,41,1,0x00FF00;
-		viewpoint 2,236,316,2,0xFF0000;
-		viewpoint 2,46,345,3,0x00FF00;
-		viewpoint 2,175,220,4,0xFF00FF;
-		viewpoint 2,8,134,5,0xFF00FF;
-		viewpoint 2,204,214,6,0xFF00FF;
-		viewpoint 2,107,192,7,0xFF00FF;
-		viewpoint 2,179,184,8,0x00FF00;
-		viewpoint 2,208,154,9,0x00FF00;
-		viewpoint 2,120,267,10,0x00FF00;
-		viewpoint 2,192,267,11,0x00FF00;
-		viewpoint 2,133,183,12,0x00FF00;
-		viewpoint 2,156,360,13,0x00FF00;
-		viewpoint 2,75,91,14,0x00FF00;
-	goto L_MENU_2;
-L_REMOVE:
-		viewpoint 2,237,41,1,0x00FF00;
-		viewpoint 2,236,316,2,0xFF0000;
-		viewpoint 2,46,345,3,0x00FF00;
-		viewpoint 2,175,220,4,0xFF00FF;
-		viewpoint 2,8,134,5,0xFF00FF;
-		viewpoint 2,204,214,6,0xFF00FF;
-		viewpoint 2,107,192,7,0xFF00FF;
-		viewpoint 2,179,184,8,0x00FF00;
-		viewpoint 2,208,154,9,0x00FF00;
-		viewpoint 2,120,267,10,0x00FF00;
-		viewpoint 2,192,267,11,0x00FF00;
-		viewpoint 2,133,183,12,0x00FF00;
-		viewpoint 2,156,360,13,0x00FF00;
-		viewpoint 2,75,91,14,0x00FF00;
-  	goto L_MENU;
-L_NOTICE:
- 	mes "[Prontera Guide]";
- 	mes "Advances in sorcery and technology have allowed us to update our information system, enabling up to mark locations on your Mini-Map for easier navigation.";
-  	next;
-  	mes "[Prontera 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 "[Prontera 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 Prontera.";
- 	goto L_MENU;
-L_END:
- 	mes "[Prontera Guide]";
- 	mes "Well, adventurer... I hope your journeys through Rune-Midgard are both fun and safe.";
-	cutin "prt_soldier",255; 
- 	close;
+	mes "Welcome to Prontera,";
+	mes "the beautiful capital of the";
+	mes "Rune-Midgarts Kingdom. If";
+	mes "you have questions or need^FFFFFF33333^000000 help finding something in the^FFFFFFco^000000 city, don't hesitate to ask.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide.:Remove Marks from Mini-Map:Notice:Cancel")) {
+		case 1:
+			mes "[Prontera 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) {
+				next;
+				switch(select("Swordman Association:^0000FFSanctuary^000000:Prontera Chivalry:Weapon Shop:Tool Shop:Inn:Trading Post:Pub:Library:Job Agency:Prontera Castle:City Hall:Cancel")) {
+				case 1:
+					mes "[Prontera Guide]";
+					mes "The Swordman Association,";
+					mes "which handles Job Changes";
+					mes "to the Swordman class, has";
+					mes "moved to Izlude. This facility";
+					mes "is just an empty building now.";
+					if (.@compass_check)
+						viewpoint 1,237,41,4,0x00FF00;
+					break;
+				case 2:
+					mes "[Prontera Guide]";
+					mes "The Prontera Sanctuary";
+					mes "handles Job Changes to";
+					mes "the Acolyte class, and can";
+					mes "be found in the northeast";
+					mes "corner of Prontera.";
+					if (.@compass_check)
+						viewpoint 1,236,316,5,0xFF0000;
+					break;
+				case 3:
+					mes "[Prontera Guide]";
+					mes "The Prontera Chivralry,";
+					mes "which is responsible for";
+					mes "the safety of our capital, is";
+					mes "in Prontera's northwest corner.";
+					if (.@compass_check)
+						viewpoint 1,46,345,6,0x00FF00;
+					break;
+				case 4:
+					mes "[Prontera Guide]";
+					mes "The Weapon Shop";
+					mes "is located northeast";
+					mes "of the central fountain.";
+					if (.@compass_check)
+						viewpoint 1,175,220,7,0xFF00FF;
+					break;
+				case 5:
+					mes "[Prontera Guide]";
+					mes "The Tool Shop";
+					mes "is located northwest";
+					mes "of the central fountain.";
+					if (.@compass_check)
+						viewpoint 1,134,221,8,0xFF00FF;
+					break;
+				case 6:
+					mes "[Prontera Guide]";
+					mes "The Inns in Prontera are";
+					mes "located both to the east";
+					mes "and west of Prontera's";
+					mes "central fountain area.";
+					if (.@compass_check) {
+						viewpoint 1,204,191,9,0xFF00FF;
+						viewpoint 1,107,192,10,0xFF00FF;
+					}
+					break;
+				case 7:
+					mes "[Prontera Guide]";
+					mes "The Trading Post";
+					mes "can be found southeast";
+					mes "from the central fountain.";
+					if (.@compass_check)
+						viewpoint 1,179,184,11,0x00FF00;
+					break;
+				case 8:
+					mes "[Prontera Guide]";
+					mes "The Pub is located";
+					mes "southeast of the fountain,";
+					mes "behind the Trading Post.";
+					if (.@compass_check)
+						viewpoint 1,208,154,12,0x00FF00;
+					break;
+				case 9:
+					mes "[Prontera Guide]";
+					mes "If you head north from";
+					mes "the central fountain, you'll";
+					mes "find an empty area in which";
+					mes "both branches of the Prontera";
+					mes "Library can be accessed if you";
+					mes "head towards the east or west.";
+					if (.@compass_check) {
+						viewpoint 1,120,267,13,0x00FF00;
+						viewpoint 1,192,267,14,0x00FF00;
+					}
+					break;
+				case 10:
+					mes "[Prontera Guide]";
+					mes "The Job Agency is";
+					mes "just southwest of the";
+					mes "central fountain area.";
+					if (.@compass_check)
+						viewpoint 1,133,183,15,0x00FF00;
+					break;
+				case 11:
+					mes "[Prontera Guide]";
+					mes "The Prontera Castle is";
+					mes "located at the northern";
+					mes "sector of this city. You can";
+					mes "go to the fields that are north";
+					mes "of Prontera by going through";
+					mes "the castle's rear exit.";
+					if (.@compass_check)
+						viewpoint 1,156,360,16,0x00FF00;
+					break;
+				case 12:
+					mes "[Prontera Guide]";
+					mes "The City Hall";
+					mes "is located in the";
+					mes "southwest corner";
+					mes "in our city of Prontera.";
+					if (.@compass_check)
+						viewpoint 1,75,91,17,0x01FF01;
+					break;
+				case 13:
+					mes "[Prontera 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,237,41,4,0x00FF00;
+			viewpoint 2,237,41,5,0x0000FF;
+			viewpoint 2,46,345,6,0x00FF00;
+			viewpoint 2,175,220,7,0xFF0000;
+			viewpoint 2,134,221,8,0xFF0000;
+			viewpoint 2,204,191,9,0xFF0000;
+			viewpoint 2,107,192,10,0xFF0000;
+			viewpoint 2,179,184,11,0x00FF00;
+			viewpoint 2,208,154,12,0x00FF00;
+			viewpoint 2,120,267,13,0x00FF00;
+			viewpoint 2,192,267,14,0x00FF00;
+			viewpoint 2,133,183,15,0x00FF00;
+			viewpoint 2,156,360,16,0x00FF00;
+			viewpoint 2,75,91,17,0x00FF00;
+			set .@compass_check,0;
+			break;
+		case 3:
+			mes "[Prontera 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 "[Prontera 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 "[Prontera 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 the city of Prontera.";
+			break;
+		case 4:
+			mes "[Prontera Guide]";
+			mes "Well, adventurer...";
+			mes "I hope your journeys";
+			mes "through Rune-Midgard";
+			mes "are both fun and safe.";
+			close2;
+			set .@loop1,0;
+			break;
+		}
+	}
+	cutin "prt_soldier",255;
+	end;
 }
 
-// East ----------------------------------------------------
-prontera,282,208,2	duplicate(Prt_Guide)	Guide#prt2	105
-//West --------------------------------------------------
-prontera,29,200,6	duplicate(Prt_Guide)	Guide#prt3	105
-// South -----------------------------------------------------
-prontera,160,29,0	duplicate(Prt_Guide)	Guide#prt4	105
-// North -----------------------------------------------
-prontera,151,330,4	duplicate(Prt_Guide)	Guide#prt5	105
+prontera,282,208,2	duplicate(PrtGuide)	East Gate-Guide	105
 
+prontera,29,200,6	duplicate(PrtGuide)	West Gate-Guide	105
 
-// Guard -----------------------------------------------------
-prontera,160,330,4	script	Guard#1::Prt_Guard	105,{
-	mes "[Guard]";
-	mes "Welcome to Prontera.";
-	close;
-}
-
-prontera,229,104,5	duplicate(Prt_Guard)	Guard#prt2	105
-prontera,223,98,8	duplicate(Prt_Guard)	Guard#prt3	105
-prontera,52,344,5	duplicate(Prt_Guard)	Guard#prt4	105
-prontera,47,339,5	duplicate(Prt_Guard)	Guard#prt5	105
-
+prontera,160,29,0	duplicate(PrtGuide)	South Gate-Guide	105
 
-//---------------------------------------------------------------------------------------- Prontera Maze ----------------------------------------------------------------------------------\\
-prt_maze02,100,69,4	script	Guard#maz01	105,{
-	mes "[Guard]";
-	mes "Hey, I don't get your point but I say you should go home and rest rather than go inside the forest.  Don't you know the 'Demon' lurks there?";
-	mes "Naturally, Nobody came back on the hoof so I am not sure whether it really exists or not... well, Do as you want, dude.  I'm not your mother.";
-	close;
-}
-prt_maze02,110,69,4	script	Guard#maz02	105,{
-	mes "[Guard]";
-	mes "Phew...That geek who went inside last time never returned either.";
-	mes "I tried to stop him so many times but he never took me seriously.  He told me he needed herbs.";
-	mes "If I were him, I would never give up my life for stupid herbs.";
-	close;
-}
+prontera,151,330,4	duplicate(PrtGuide)	North Gate-Guide	105