* 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, 272 insertions, 195 deletions

diff --git a/npc/guides/guides_pay.txt b/npc/guides/guides_pay.txt
index b1d1a123f..da8287f40 100644
--- a/npc/guides/guides_pay.txt
+++ b/npc/guides/guides_pay.txt
@@ -1,13 +1,14 @@
 //===== eAthena Script ======================================= 
 //= Payon 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 Payon
 //===== Additional Comments: ================================= 
 //= Fully working
 //= v1.1 Now using duplicate command.New Payon Locations [Darkchild]
@@ -18,203 +19,279 @@
 //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
 //= 1.4a Tixed Archer Village Guide [Lupus] 
 //= 1.5 Removed Duplicates [Silent]
+//= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-
-payon,162,67,4	script	Guide#pay1	708,{
+payon,162,67,4	script	Guide#pay	708,{
 	cutin "pay_soldier",2;
 	mes "[Payon Guide]";
-	mes "Welcome to the mountain city of Payon.";
-	mes "If you're unfammiliar with this area, I can help you find what you're looking for around here.";
-L_MENU:
-	next;
-	menu "City Guide",-,"Remove Marks from Mini-Map",L_REMOVE,"Notice",L_NOTICE,"Cancel",L_END;
-
-	mes "[Payon 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 "^FF0000Archer Guild^000000",L_ARCHER,"Weapon Shop",L_WEAPON,"Tool Shop",L_TOOL,"Pub",L_PUB,"Central Palace",L_PALACE,"The Empress",L_EMPRESS,"Palace Annex",L_ANNEX,"Royal Kitchen",L_KITCHEN,"Forge",L_FORGE,"Cancel",-;
-	mes "[Payon 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_ARCHER:
-	mes "[Payon Guide]";
-	mes "The Archer Guild handles Job Changes to the Archer Class.";
-	mes "You'll need to enter the Archer Village wich is to the northeast of Payon.";
-	viewpoint 1,228,326,1,0xFF0000;
-	next; 
-	goto L_WIPE;
-L_WEAPON:
-	mes "[Payon Guide]";
-	mes "The Weapon Shop can be found in the northwest corner of the city of Payon.";
-	viewpoint 1,139,158,2,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_TOOL:
-	mes "[Payon Guide]";
-	mes "The Tool Shop is located near the northwest corner of Payon.";
-	viewpoint 1,144,85,3,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_PUB:
-	mes "[Payon Guide]";
-	mes "The Pub can be found in the northeast part of Payon.";
-	mes "It's the best place to relax after a long day of hunting.";
-	viewpoint 1,220,117,4,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_PALACE:
-	mes "[Payon Guide]";
-	mes "The Central Palace is located to the north within the city of Payon.";
-	viewpoint 1,156,245,5,0x00FF00;
-	next;
-	goto L_WIPE;
-L_EMPRESS:
-	mes "[Payon Guide]";
-	mes "The Empress can be found to the northwest in Payon.";
-	viewpoint 1,107,327,6,0x00FF00;
-	next;
-	goto L_WIPE;
-L_ANNEX:
-	mes "[Payon Guide]";
-	mes "The Palace Annex can be found in the western part of Payon.";
-	viewpoint 1,127,204,7,0x00FF00;
-	next;
-	goto L_WIPE;
-L_KITCHEN:
-	mes "[Payon Guide]";
-	mes "The Royal Kitchen is located near the northern end of Payon.";
-	viewpoint 1,155,327,8,0x00FF00;
-	next;
-	goto L_WIPE;
-L_FORGE:
-	mes "[Payon Guide]";
-	mes "The Forge is situaded near the center of Payon.";
-	viewpoint 1,142,172,9,0xFFFF00;
-	next;
-//	goto L_WIPE;	
-L_WIPE:
- 	if(@COMPASS_CHECK == 1)goto L_MENU_2;
-	viewpoint 2,228,326,1,0xFF0000;
-	viewpoint 2,139,158,2,0xFF00FF;
-	viewpoint 2,144,85,3,0xFF00FF;
-	viewpoint 2,220,117,4,0xFF00FF;
-	viewpoint 2,156,245,5,0x00FF00;
-	viewpoint 2,107,327,6,0x00FF00;
-	viewpoint 2,127,204,7,0x00FF00;
-	viewpoint 2,155,327,8,0x00FF00;
-	viewpoint 2,142,172,9,0xFFFF00;
-	goto L_MENU_2;
-L_REMOVE:
-	viewpoint 2,228,326,1,0xFF0000;
-	viewpoint 2,139,158,2,0xFF00FF;
-	viewpoint 2,144,85,3,0xFF00FF;
-	viewpoint 2,220,117,4,0xFF00FF;
-	viewpoint 2,156,245,5,0x00FF00;
-	viewpoint 2,107,327,6,0x00FF00;
-	viewpoint 2,127,204,7,0x00FF00;
-	viewpoint 2,155,327,8,0x00FF00;
-	viewpoint 2,142,172,9,0xFFFF00;
-  	goto L_MENU;
-
-L_NOTICE:
- 	mes "[Payon 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 "[Payon 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 "[Payon 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 Payon.";
- 	goto L_MENU;
-L_END:
- 	mes "[Payon Guide]";
- 	mes "Be safe in your travels, brave adventurer.";
-	cutin "pay_soldier",255; 
- 	close;
+	mes "Welcome to the";
+	mes "mountain city of Payon.";
+	mes "If you're unfamiliar with this";
+	mes "area, I can help you find what";
+	mes "you're looking for around here.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) {
+		case 1:
+			mes "[Payon 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("^FF0000Archer Guild^000000:Weapon Shop:Tool Shop:Pub:Central Palace:The Empress:Palace Annex:Royal Kitchen:Forge:Cancel")) {
+				case 1:
+					mes "[Payon Guide]";
+					mes "The Archer Guild handles";
+					mes "Job Changes to the Archer";
+					mes "Class. You'll need to enter";
+					mes "the Archer Village which is";
+					mes "to the northeast of Payon.";
+					if (.@compass_check)
+						viewpoint 1,227,328,2,0xFF0000;
+					break;
+				case 2:
+					mes "[Payon Guide]";
+					mes "The Weapon Shop";
+					mes "can be found in the";
+					mes "northwest corner of";
+					mes "the city of Payon.";
+					if (.@compass_check)
+						viewpoint 1,139,159,3,0xFF00FF;
+					break;
+				case 3:
+					mes "[Payon Guide]";
+					mes "The Tool Shop";
+					mes "is located near";
+					mes "the northwest";
+					mes "corner of Payon.";
+					if (.@compass_check)
+						viewpoint 1,144,85,4,0xFF00FF;
+					break;
+				case 4:
+					mes "[Payon Guide]";
+					mes "The Pub can be";
+					mes "found in the northeast";
+					mes "part of Payon. It's the";
+					mes "best place to relax after";
+					mes "a long day of hunting.";
+					if (.@compass_check)
+						viewpoint 1,220,117,5,0xFF00FF;
+					break;
+				case 5:
+					mes "[Payon Guide]";
+					mes "The Central Palace";
+					mes "is located to the north";
+					mes "within the city of Payon.";
+					if (.@compass_check)
+						viewpoint 1,155,245,6,0x00FF00;
+					break;
+				case 6:
+					mes "[Payon Guide]";
+					mes "The Empress";
+					mes "can be found to the";
+					mes "northwest in Payon.";
+					if (.@compass_check)
+						viewpoint 1,107,324,7,0x00FF00;
+					break;
+				case 7:
+					mes "[Payon Guide]";
+					mes "The Palace Annex";
+					mes "can be found in the";
+					mes "western part of Payon.";
+					if (.@compass_check)
+						viewpoint 1,130,204,8,0x00FF00;
+					break;
+				case 8:
+					mes "[Payon Guide]";
+					mes "The Royal Kitchen";
+					mes "is located near the";
+					mes "northern end of Payon.";
+					if (.@compass_check)
+						viewpoint 1,154,325,9,0x00FF00;
+					break;
+				case 9:
+					mes "[Payon Guide]";
+					mes "The Forge is";
+					mes "situated near";
+					mes "the center of Payon.";
+					if (.@compass_check)
+						viewpoint 1,126,169,10,0xFFFF00;
+					break;
+				case 10:
+					mes "[Payon 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;
+				}
+			}
+			break;
+		case 2:
+			viewpoint 2,237,41,2,0x00FF00;
+			viewpoint 2,237,41,3,0x0000FF;
+			viewpoint 2,46,345,4,0xFF00FF;
+			viewpoint 2,175,220,5,0xFF0000;
+			viewpoint 2,175,220,6,0xFF0000;
+			viewpoint 2,175,220,7,0xFF0000;
+			viewpoint 2,237,41,8,0x0000FF;
+			viewpoint 2,46,345,9,0x00FF00;
+			viewpoint 2,175,220,10,0xFF0000;
+			set .@compass_check,0;
+			break;
+		case 3:
+			mes "[Payon 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 "[Payon 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 "[Payon 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 Payon.";
+			break;
+		case 4:
+			mes "[Payon Guide]";
+			mes "Be safe in";
+			mes "your travels,";
+			mes "brave adventurer.";
+			close2;
+			set .@loop1,0;
+			break;
+		}
+	}
+	cutin "pay_soldier",255;
+	end;
 }
 
-pay_arche,85,30,2	script	Guide#pay2	708,{
+pay_arche,85,30,2	script	Guide#2pay	708,{
 	cutin "pay_soldier",2;
 	mes "[Payon Guide]";
-	mes "Welcome to the Archer Village.";
-	mes "If you're unfammiliar with this area, I can help you find what you're looking for around here.";
-L_MENU:
-	next;
-	menu "Village Guide",-,"Remove Marks from Mini-Map",L_REMOVE,"Notice",L_NOTICE,"Cancel",L_END;
-
-	mes "[Payon 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 "^FF0000Archer Guild^000000",L_ARCHER,"Tool Shop",L_TOOL,"Payon Dungeon",L_DUNGEON,"Cancel",-;
-	mes "[Payon 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_ARCHER:
-	mes "[Payon Guide]";
-	mes "The Archer Guild, found northeast in the Archer Village, handles Job Changes to the Archer Class.";
-	viewpoint 1,144,164,1,0xFF0000;
-	next; 
-	goto L_WIPE;
-L_TOOL:
-	mes "[Payon Guide]";
-	mes "The Tool Shop is located near the northwest corner of the village.";
-	viewpoint 1,71,156,2,0xFF00FF;
-	next; 
-	goto L_WIPE;
-L_DUNGEON:
-	mes "[Payon Guide]";
-	mes "The entrance to the Payon Dungeon is located at the west end of the village.";
-	viewpoint 1,34,132,3,0xFFFFFF;
-	next; 
-//	goto L_WIPE;
-L_WIPE:
- 	if(@COMPASS_CHECK == 1)goto L_MENU_2;
-	viewpoint 2,144,164,1,0xFF0000;
-	viewpoint 2,71,156,2,0xFF00FF;
-	viewpoint 2,34,132,3,0xFFFFFF;
-	goto L_MENU_2;
-L_REMOVE:
-	viewpoint 2,144,164,1,0xFF0000;
-	viewpoint 2,71,156,2,0xFF00FF;
-	viewpoint 2,34,132,3,0xFFFFFF;
-  	goto L_MENU;
-
-L_NOTICE:
- 	mes "[Payon 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 "[Payon 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 "[Payon 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 Payon.";
- 	goto L_MENU;
-L_END:
- 	mes "[Payon Guide]";
- 	mes "Be safe in your travels, brave adventurer.";
-	cutin "pay_soldier",255; 
- 	close;
+	mes "Welcome to the";
+	mes "mountain city of Payon.";
+	mes "If you're unfamiliar with this";
+	mes "area, I can help you find what";
+	mes "you're looking for around here.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
+		case 1:
+			mes "[Payon Guide]";
+			mes "Please, select a menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like to leave indicators on the 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("^FF0000Archer Guild^000000:Tool Shop:Payon Dungeon:Cancel")) {
+				case 1:
+					mes "[Payon Guide]";
+					mes "The Archer Guild,";
+					mes "found northeast in";
+					mes "the Archer Village,";
+					mes "handles Job Changes";
+					mes "to the Archer Class.";
+					if (.@compass_check)
+						viewpoint 1,144,164,0,0xFFFF00;
+					break;
+				case 2:
+					mes "[Payon Guide]";
+					mes "You can find";
+					mes "a Tool Shop in";
+					mes "the northeast corner";
+					mes "of the Archer Village.";
+					if (.@compass_check)
+						viewpoint 1,71,156,1,0xFFFF00;
+					break;
+				case 3:
+					mes "[Payon Guide]";
+					mes "The entrance to";
+					mes "the Payon Dungeon";
+					mes "is located at the west";
+					mes "end of the village.";
+					if (.@compass_check)
+						viewpoint 1,34,132,2,0xFFFFFF;
+					break;
+				case 4:
+					mes "[Payon Guide]";
+					mes "If you'd like to erase the marks on the mini-map, select menu, 'Wipe all indicators on the mini-map'.";
+					set @loop2,0;
+					break;
+				}
+			}
+			break;
+		case 2:
+			viewpoint 2,237,41,0,0xFF00FF;
+			viewpoint 2,237,41,1,0xFF0000;
+			viewpoint 2,46,345,2,0xFF00FF;
+			set .@compass_check,0;
+			break;
+		case 3:
+			mes "[Payon 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 "[Payon 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 "[Payon 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 Payon.";
+			break;
+		case 4:
+			mes "[Payon Guide]";
+			mes "Be safe in";
+			mes "your travels,";
+			mes "brave adventurer.";
+			close2;
+			set .@loop1,0;
+			break;
+		}
+	}
+	cutin "pay_soldier",255;
+	end;
 }