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, 90 insertions, 148 deletions

diff --git a/npc/pre-re/guides/guides_ayothaya.txt b/npc/pre-re/guides/guides_ayothaya.txt
index cafc85dc9..d153cf8d3 100644
--- a/npc/pre-re/guides/guides_ayothaya.txt
+++ b/npc/pre-re/guides/guides_ayothaya.txt
@@ -1,169 +1,111 @@
-//===== rAthena Script ======================================= 
-//= Ayothaya Guide
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== rAthena Script =======================================
+//= Ayothaya Guides
+//===== By: ==================================================
+//= MasterOfMuppets
+//===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena  SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guide for the city of Ayothaya
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//============================================================ 
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Ayotaya
+//===== Additional Comments: =================================
+//= 1.0 First version [L0ne_W0lf]
+//============================================================
 
-ayothaya,203,169,4	script	Ayothaya Guide Noi#01ay	839,{
+ayothaya,203,169,3	script	Noi#ayo	839,{
 	mes "[Noi]";
-	mes "Hello~";
-	mes "Welcome to ^8B4513Ayothaya^000000.";
-	mes "This town is linked to a river through the wild forest.";
-	mes "It's a really calm country.";
-	mes "Take your time to look around.";
-	while (1) {
+	mes "Welcome to Ayotaya.";
+	mes "Our beautiful village is built";
+	mes "above the water, surrounded";
+	mes "by a dense forest.";
+	next;
+	mes "[Noi]";
+	mes "There are many tourist attractions in this village that you won't be able to find anywhere else. Our fish markets and the the unique architecture of our buildings is enough reason to visit Ayotaya.";
+	next;
+	mes "[Noi]";
+	mes "Please feel free";
+	mes "to take a look around.";
+	next;
+	switch(select("Building Locations.:Remove marks from mini-map.:Cancel.")) {
+	case 1:
+		mes "[Noi]";
+		mes "Where would";
+		mes "you like to visit?";
 		next;
-		switch(select("[ Weapon Shop ]:[ Tool Shop ]:[ Tavern ]:[ Shrine ]:[ Fishing Spot ]:Remove Marks from Mini-Map:Cancel")) {
+		switch(select("Weapon Shop:Tool Shop:Tavern:Shrine:Fishing Spot:Cancel")) {
 		case 1:
 			mes "[Noi]";
-			mes "The ^0000FFWeapon Shop^000000";
-			mes "in Ayothaya has special weapons.";
-			mes "You can find great weapons there.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,163,90,0,0x0A82FF;
-			break;
+			mes "At our Weapon Shop,";
+			mes "you will find great weapons";
+			mes "favored by brave Ayotayan seafarers.";
+			next;
+			mes "[Noi]";
+			mes "Our Weapon Shop";
+			mes "is located at ^55FF33+^000000.";
+			viewpoint 1,165,90,2,0x55FF33;
+			close;
 		case 2:
 			mes "[Noi]";
-			mes "Our citizens purchase many products in the ^006400Tool Shop^000000.";
-			mes "Make sure you get all you need there.";
-			mes "Do you need anything else??";
-			viewpoint 1,131,86,1,0xAAFF00;
-			break;
+			mes "We Ayotayans always make sure we have everything we need before we go traveling. It never hurts to be prepared, doesn't it?";
+			next;
+			mes "[Noi]";
+			mes "Our Tool Shop";
+			mes "is located at ^3355FF+^000000.";
+			viewpoint 1,129,86,3,0x3355FF;
+			close;
 		case 3:
 			mes "[Noi]";
-			mes "Part of adventuring is collecting information.";
-			mes "The ^008080Tavern^000000 is crowded with lots of travelers where you can get useful information.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,229,72,2,0x008080;
-			break;
-		case 4:
+			mes "One of the basics of adventuring is gathering information, or at least that's what they say. You can meet people from all sorts of places in the Tavern. I'm sure you can learn something useful there.";
+			next;
 			mes "[Noi]";
-			mes "To calm your heart, go to the ^FF1493Shrine^000000 and say a prayer.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,208,280,3,0xFF1493;
-			break;
-		case 5:
+			mes "Of course, you must";
+			mes "drop by our Tavern.";
+			mes "It is located at ^00FF00+^000000.";
+			viewpoint 1,232,76,4,0x00FF00;
+			close;
+		case 4:
 			mes "[Noi]";
-			mes "Ayothaya is close to the beach, so most people enjoy fishing.";
-			mes "They really love to fish.";
-			mes "Go ^8B4513fishing^000000 and try to grab a big fish.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,255,99,4,0x8B4513;
-			break;
-		case 6:
+			mes "If you wish to pray to God, or achieve a state of peace in your mind, why don't you visit our Shrine? Even if it's just for sight-seeing, everyone is";
+			mes "welcome there.";
+			next;
 			mes "[Noi]";
-			mes "If you want to return home";
-			mes "find ^00BFFFAibakthing^000000";
-			mes "and ask him to send you back.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,151,68,5,0x00BFFF;
-			break;
-		case 7:
+			mes "Our Shrine";
+			mes "is located at ^00FF00+^000000.";
+			viewpoint 1,208,283,5,0x00FF00;
+			close;
+		case 5:
 			mes "[Noi]";
-			mes "I'll remove all marks from your mini-map.";
-			mes "Do you need anything else??";
-			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;
-			break;
-		case 8:
+			mes "Since Ayothaya was built above the surface of the water and close to a beach, it's been a favorite spot for fishermen. Why don't you catch some fish for dinner at the Fishing Spot?";
+			next;
 			mes "[Noi]";
-			mes "Enjoy your trip~!";
+			mes "Our famous";
+			mes "Fishing Spot";
+			mes "is located at ^00FF00+^000000";
+			viewpoint 1,253,99,6,0x00FF00;
 			close;
-		}
-	}
-}
-
-ayothaya,146,86,4	script	Ayothaya Guide Noa#01ay	839,{
-	mes "[Noa]";
-	mes "Hello~";
-	mes "Welcome to ^8B4513Ayothaya^000000.";
-	mes "This town is linked to a river through the wild forest.";
-	mes "It's a really calm country.";
-	mes "Take your time to look around.";
-	while (1) {
-		next;
-		switch(select("[ Kafra Employee ]:[ Weapon Shop ]:[ Tool Shop ]:[ Tavern ]:[ Shrine ]:[ Fishing Spot ]:Remove Marks from Mini-Map:Cancel")) {
-		case 1:
-			mes "[Noa]";
-			mes "The ^0000FFKafra Employee^000000 is";
-			mes "marked on your mini-map.";
-			mes "Check your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,212,169,0,0x0A82FF;
-			break;
-		case 2:
-			mes "[Noa]";
-			mes "The ^0000FFWeapon Shop^000000";
-			mes "in Ayothaya has special weapons.";
-			mes "You can find great weapons there.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,163,90,1,0xAAFF00;
-			break;
-		case 3:
-			mes "[Noa]";
-			mes "Our citizens purchase many products in the ^006400Tool Shop^000000.";
-			mes "Make sure you get all you need there.";
-			mes "Do you need anything else??";
-			viewpoint 1,131,86,2,0x008080;
-			break;
-		case 4:
-			mes "[Noa]";
-			mes "Part of adventuring is collecting information.";
-			mes "The ^008080Tavern^000000 is crowded with lots of travelers where you can get useful information.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,229,72,3,0xFF1493;
-			break;
-		case 5:
-			mes "[Noa]";
-			mes "To calm your heart, go to the ^FF1493Shrine^000000 and say a prayer.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,208,280,4,0x8B4513;
-			break;
 		case 6:
-			mes "[Noa]";
-			mes "Ayothaya is close to the beach, so most people enjoy fishing.";
-			mes "They really love to fish.";
-			mes "Go ^8B4513fishing^000000 and try to grab a big fish.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,255,99,5,0x9400D3;
-			break;
-		case 7:
-			mes "[Noa]";
-			mes "If you want to return home";
-			mes "find ^00BFFFAibakthing^000000";
-			mes "and ask him to send you back.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,151,68,6,0x00BFFF;
-			break;
-		case 8:
-			mes "[Noa]";
-			mes "I'll remove all marks from your mini-map.";
-			mes "Do you need anything else??";
-			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;
-			break;
-		case 9:
-			mes "[Noa]";
-			mes "Enjoy your trip~!";
+			mes "[Noi]";
+			mes "If you wish to remove location marks on your mini-map, please select the 'Remove marks from mini-map' command from the menu.";
 			close;
 		}
+	case 2:
+		viewpoint 2,165,90,2,0x55FF33;
+		viewpoint 2,129,86,3,0x3355FF;
+		viewpoint 2,232,76,4,0x00FF00;
+		viewpoint 2,208,283,5,0x00FF00;
+		viewpoint 2,253,99,6,0x00FF00;
+		mes "[Noi]";
+		mes "Alright...";
+		mes "I've removed all the";
+		mes "location marks from";
+		mes "your mini-map.";
+		mes "Thank you.";
+		close;
+	case 3:
+		mes "[Noi]";
+		mes "Please enjoy";
+		mes "your travels.";
+		close;
 	}
 }