Follow up r16430, reverted all the pre-re guides to their pre-renewal version. Disabled a couple of renewal quests from pre-renewal.

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

1 files changed, 104 insertions, 76 deletions

diff --git a/npc/pre-re/guides/guides_amatsu.txt b/npc/pre-re/guides/guides_amatsu.txt
index 50ffe3f24..100eb9c6a 100644
--- a/npc/pre-re/guides/guides_amatsu.txt
+++ b/npc/pre-re/guides/guides_amatsu.txt
@@ -1,22 +1,23 @@
-//===== rAthena Script ======================================= 
-//= Amatsu Guide
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== rAthena Script =======================================
+//= Amatsu Guides
+//===== By: ==================================================
+//= MasterOfMuppets; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guide for the city of Amatsu.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Optimized. [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Amatsu
+//===== Additional Comments: =================================
+//= 1.0 First version [MasterOfMuppets]
+//= 1.1 Removed Duplicates [Silent]
+//= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//============================================================
 
-amatsu,202,91,3	script	Amatsu Guide#amatsu	758,{
+amatsu,207,89,3	script	Amatsu Guide#ama	758,{
 	mes "[Amachang]";
-	mes "Welcome to ^8B4513Amatsu^000000,";
+	mes "Welcome to Amatsu,";
 	mes "the town of kind towners";
 	mes "and beautiful cherry blossoms.";
 	next;
@@ -27,65 +28,92 @@ amatsu,202,91,3	script	Amatsu Guide#amatsu	758,{
 	mes "as Miss Amatsu.";
 	mes "Please tell me";
 	mes "if you want to know something.";
-	while (1) {
-		next;
-		switch(select("[ Kafra Employee ]:[ Bar ]:[ Weapon Dealer ]:[ Tool Dealer ]:[ Amatsu Palace ]:[ Chef Assistant ]:[ Ninja Guild Building ]:[ Sea Captain ]:Remove Marks from Mini-Map:Cancel")) {
-		case 1:
-			callsub L_Mark,"^0000FFKafra Employee";
-			viewpoint 1,102,149,0,0x0A82FF;
-			break;
-		case 2:
-			callsub L_Mark,"^006400Bar";
-			viewpoint 1,215,116,1,0xAAFF00;
-			break;
-		case 3:
-			callsub L_Mark,"^008080Weapon Dealer";
-			viewpoint 1,129,117,2,0x008080;
-			break;
-		case 4:
-			callsub L_Mark,"^FF1493Tool Dealer";
-			viewpoint 1,97,117,3,0xFF1493;
-			break;
-		case 5:
-			callsub L_Mark,"^8B4513Amatsu Palace";
-			viewpoint 1,87,235,4,0x8B4513;
-			break;
-		case 6:
-			callsub L_Mark,"^8A2BE2Chef Assistant";
-			viewpoint 1,206,150,5,0x8A2BE2;
-			break;
-		case 7:
-			callsub L_Mark,"^4B0082Ninja Guild Building";
-			viewpoint 1,148,137,6,0x4B0082;
-			break;
-		case 8:
-			callsub L_Mark,"^00BFFFSea Captain";
-			viewpoint 1,195,79,7,0x00BFFF;
-			break;
-		case 9:
-			mes "[Amachang]";
-			mes "I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFFFF;
-			viewpoint 2,1,1,1,0xFFFFFF;
-			viewpoint 2,1,1,2,0xFFFFFF;
-			viewpoint 2,1,1,3,0xFFFFFF;
-			viewpoint 2,1,1,4,0xFFFFFF;
-			viewpoint 2,1,1,5,0xFFFFFF;
-			viewpoint 2,1,1,6,0xFFFFFF;
-			viewpoint 2,1,1,7,0xFFFFFF;
-			break;
-		case 10:
-			mes "[Amachang]";
-			mes "Enjoy your trip~!!";
-			close;
-		}
+	next;
+	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	Guide Man#2ama	767,{
+	mes "[Guide Man]";
+	mes "Welcome, tourist from Rune-Midgard.";
+	mes "I'm the guide of";
+	mes "our beautiful town, Amatsu.";
+	next;
+	mes "[Guide Man]";
+	mes "What are you looking for?";
+	next;
+	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;
 	}
-	end;
-L_Mark:
-	mes "[Amachang]";
-	mes "The "+getarg(0)+"^000000 is";
-	mes "marked on your mini-map.";
-	mes "Is there anything else I can do for you?";
-	return;
 }