* 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, 88 insertions, 97 deletions

diff --git a/npc/guides/guides_ama.txt b/npc/guides/guides_ama.txt
index ae262ec78..798148e4a 100644
--- a/npc/guides/guides_ama.txt
+++ b/npc/guides/guides_ama.txt
@@ -1,24 +1,25 @@
 //===== eAthena Script ======================================= 
 //= Amatsu Guides
 //===== By: ================================================== 
-//= MasterOfMuppets
+//= MasterOfMuppets; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.3
 //===== Compatible With: ===================================== 
-//=
+//= eAthena SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis Conversion]
+//= Guides for hte City of Amatsu
 //===== Additional Comments: ================================= 
 //= 1.0 First version [MasterOfMuppets]
 //= 1.1 Removed Duplicates [Silent]
+//= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-amatsu,207,89,3	script	Amatsu Guide#01	758,{
-
+amatsu,207,89,3	script	Amatsu Guide#ama	758,{
 	mes "[Amachang]";
 	mes "Welcome to Amatsu,";
 	mes "the town of kind towners";
-	mes "and beatiful cherry blossoms.";
+	mes "and beautiful cherry blossoms.";
 	next;
 	mes "[Amachang]";
 	mes "I'm Amachang,";
@@ -28,101 +29,91 @@ amatsu,207,89,3	script	Amatsu Guide#01	758,{
 	mes "Please tell me";
 	mes "if you want to know something.";
 	next;
-	menu "Palace",-,"Tool Shop",s_Tool,"Weapon Shop",s_Weap,"Bar",s_Bar;
-
-	viewpoint 1,85,235,1,0xFF0044;
-	mes "[Amachang]";
-	mes "On the mini-map,";
-	mes "go to ^FF0044+^000000";
-	mes "to find the Palace.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
-s_Tool:
-	viewpoint 1,96,117,2,0xFF9200;
-	mes "[Amachang]";
-	mes "On the mini-map,";
-	mes "go to ^FF9200+^000000";
-	mes "to find the Tool Shop.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
-s_Weap:
-	viewpoint 1,132,117,3,0x85FF00;
-	mes "[Amachang]";
-	mes "On the mini-map,";
-	mes "go to ^85FF00+^000000";
-	mes "to find the Weapon Shop.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
-
-s_Bar:
-	viewpoint 1,216,116,4,0x3366FF;
-	mes "[Amachang]";
-	mes "On the mini-map,";
-	mes "go to ^3366FF+^000000";
-	mes "to find the Bar.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
+	switch(select("Palace:Tool Shop:Weapon Shop:Bar")) {
+	case 1:
+		viewpoint 1,85,235,0,0xFF3355;
+		mes "[Amachang]";
+		mes "On the mini-map,";
+		mes "go to ^FF3355+^000000";
+		mes "to find the Palace.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 2:
+		viewpoint 1,96,118,1,0xCE6300;
+		mes "[Amachang]";
+		mes "On the mini-map,";
+		mes "go to ^CE6300+^000000";
+		mes "to find the Tool Shop.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 3:
+		viewpoint 1,132,117,2,0x55FF33;
+		mes "[Amachang]";
+		mes "On the mini-map,";
+		mes "go to ^55FF33+^000000";
+		mes "to find the Weapon Shop.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 4:
+		viewpoint 1,217,116,3,0x3355FF;
+		mes "[Amachang]";
+		mes "On the mini-map,";
+		mes "go to ^3355FF+^000000";
+		mes "to find the Bar.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	}
 }
-
-amatsu,251,283,4	script	Amatsu Guide#02	767,{
-
+	
+amatsu,251,283,4	script	Guide Man#2ama	767,{
 	mes "[Guide Man]";
-	mes "Welcome, tourist from";
-	mes "Rune-Midgard.";
+	mes "Welcome, tourist from Rune-Midgard.";
 	mes "I'm the guide of";
-	mes "out beautiful town, Amatsu.";
+	mes "our beautiful town, Amatsu.";
 	next;
 	mes "[Guide Man]";
 	mes "What are you looking for?";
 	next;
-	menu "Palace",-,"Tool Shop",s_Tool,"Weapon Shop",s_Weap,"Bar",s_Bar;
-
-	viewpoint 1,85,235,1,0xFF0044;
-	mes "[Guide Man]";
-	mes "On the mini-map,";
-	mes "go to ^FF0044+^000000";
-	mes "to find the Palace.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
-s_Tool:
-	viewpoint 1,96,117,2,0xFF9200;
-	mes "[Guide Man]";
-	mes "On the mini-map,";
-	mes "go to ^FF9200+^000000";
-	mes "to find the Tool Shop.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
-s_Weap:
-	viewpoint 1,132,117,3,0x85FF00;
-	mes "[Guide Man]";
-	mes "On the mini-map,";
-	mes "go to ^85FF00+^000000";
-	mes "to find the Weapon Shop.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
-
-s_Bar:
-	viewpoint 1,216,116,4,0x3366FF;
-	mes "[Guide Man]";
-	mes "On the mini-map,";
-	mes "go to ^3366FF+^000000";
-	mes "to find the Bar.";
-	mes "Have a good time";
-	mes "in Amatsu.";
-	close;
-
+	switch(select("Palace:Tool Shop:Weapon Shop:Bar")) {
+	case 1:
+		viewpoint 1,85,235,0,0xFF3355;
+		mes "[Guide Man]";
+		mes "On the mini-map,";
+		mes "go to ^FF3355+^000000";
+		mes "to find the Palace.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 2:
+		viewpoint 1,96,118,1,0xCE6300;
+		mes "[Guide Man]";
+		mes "On the mini-map,";
+		mes "go to ^CE6300+^000000";
+		mes "to find the Tool Shop.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 3:
+		viewpoint 1,132,117,2,0x55FF33;
+		mes "[Guide Man]";
+		mes "On the mini-map,";
+		mes "go to ^55FF33+^000000";
+		mes "to find the Weapon Shop.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 4:
+		viewpoint 1,217,116,3,0x3355FF;
+		mes "[Guide Man]";
+		mes "On the mini-map,";
+		mes "go to ^3355FF+^000000";
+		mes "to find the Bar.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	}
 }