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, 81 insertions, 80 deletions

diff --git a/npc/pre-re/guides/guides_moscovia.txt b/npc/pre-re/guides/guides_moscovia.txt
index de9f7ddf0..8986c7502 100644
--- a/npc/pre-re/guides/guides_moscovia.txt
+++ b/npc/pre-re/guides/guides_moscovia.txt
@@ -1,91 +1,92 @@
-//===== rAthena Script ======================================= 
-//= Moscovia Guide
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== rAthena Script =======================================
+//= Moscovia Guides
+//===== By: ==================================================
+//= Kisuka
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guide for the city of Moscovia.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Optimized (a little bit). [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the town of Moscovia.
+//===== Additional Comments: =================================
+//= 1.0 First Version. [Kisuka]
+//============================================================
 
-moscovia,226,191,4	script	Moscovia Guide#02mosc	959,{
+moscovia,161,76,4	script	Moscovia Guide#mosk	959,{
 	mes "[Moscovia Guide]";
-	mes "A paradise on the sea";
-	mes "beautiful wave and warm sunshine";
-	mes "^8B4513Moscovia^000000 is waitting for you";
-	mes "welcome to come here.";
-	mes "I'm supporting to offer information about here.";
-	mes "if you want to ask anything just feel free tell me.";
-	set .@str$,"Is there anything else I can do for you?";
-	while (1) {
-		next;
-		switch(select("[ Palace ]:[ Chapel ]:[ Weapon Shop ]:[ Armor Shop ]:[ Tool Shop ]:[ Inn ]:[ Return to Alberta ]:Remove Marks from Mini-Map:Cancel")) {
+	mes "Welcome to Moscovia";
+	mes "Here is the paradise spreading on";
+	mes "the endless seas";
+	mes "You'll be happy with the beautiful";
+	mes "scenery and the sunlight!";
+	next;
+	mes "[Moscovia Guide]";
+	mes "I was sent from Moscovia Palace";
+	mes "to guide tourists and to give them";
+	mes "information on this town.";
+	mes "If you have some questions, please ask me.";
+	next;
+	switch(select("Ask where you can go.:Delete all the marks on the mini-map.:Cancel.")) {
 		case 1:
 			mes "[Moscovia Guide]";
-			mes "In the ^006400Palace^000000 you will find our Lord the Czar and other servants.";
-			mes .@str$;
-			viewpoint 1,255,140,0,0x0A82FF;
-			break;
+			mes "Where would you like to go?";
+			next;
+			switch(select("The Palace:Armor Shop:Tool Shop:An Inn:Cancel")) {
+				case 1:
+					mes "[Moscovia Guide]";
+					mes "The Palace can be found ^ff0000+^000000 at the";
+					mes "end of the North sea from";
+					mes "Rune-Midgarts.";
+					mes "There resides our Lord the Czar of";
+					mes "Moscovia and his retainers.";
+					close2;
+					viewpoint 1,257,138,1,0xFF0000;
+					end;
+				case 2:
+					viewpoint 1,185,187,2,0x00FF00;
+					mes "[Moscovia Guide]";
+					mes "The Armor Shop is located at the";
+					mes "southwest corner of town..";
+					mes "You can buy armor made by the best";
+					mes "craftsmen of Moscovia there.";
+					close;
+				case 3:
+					mes "[Moscovia Guide]";
+					mes "The Tool Shop is located just south";
+					mes "from the center of town.";
+					mes "You can find all sorts of things";
+					mes "you need for your travels.";
+					close2;
+					viewpoint 1,223,174,3,0x00FF00;
+					end;
+				case 4:
+					mes "[Moscovia Guide]";
+					mes "The Inn 'Sticky Herb Tree' is just";
+					mes "north from the center of town.";
+					mes "If you need to rest, there is no";
+					mes "better place to stay.";
+					close2;
+					viewpoint 1,229,208,4,0x3355FF;
+					end;
+				case 5:
+					close;
+			}
 		case 2:
 			mes "[Moscovia Guide]";
-			mes "The ^008080Chapel^000000 is located here.";
-			mes .@str$;
-			viewpoint 1,253,179,1,0xAAFF00;
-			break;
+			mes "I've deleted all marks on the mini-map.";
+			mes "Whenever you'd like to put marks";
+			mes "there, you can ask me.";
+			viewpoint 2,257,138,1,0xFF0000;
+			viewpoint 2,185,187,2,0x00FF00;
+			viewpoint 2,223,174,3,0x00FF00;
+			viewpoint 2,229,208,4,0x3355FF;
+			close;
+		
 		case 3:
 			mes "[Moscovia Guide]";
-			mes "You can buy weapons from the best craftsmen in Moscovia if you go to ^FF1493Weapon Shop^000000.";
-			mes .@str$;
-			viewpoint 1,186,191,2,0x008080;
-			break;
-		case 4:
-			mes "[Moscovia Guide]";
-			mes "You will find only the best gear at the Moscovia ^8B4513Armor Shop^000000.";
-			mes .@str$;
-			viewpoint 1,204,169,3,0xB200FF;
-			break;
-		case 5:
-			mes "[Moscovia Guide]";
-			mes "The ^FF1493Tool Shop^000000 is located just south from the center of town.";
-			mes "You can find all sorts of things you need for your travels.";
-			mes .@str$;
-			viewpoint 1,221,176,4,0xFF1493;
-			break;
-		case 6:
-			mes "[Moscovia Guide]";
-			mes "The Inn 'Sticky Herb Tree' is just north from the center of town.";
-			mes "If you need to rest, there is no better place to stay.";
-			mes .@str$;
-			viewpoint 1,227,206,5,0x8B4513;
-			break;
-		case 7:
-			mes "[Moscovia Guide]";
-			mes "You can go back to Alberta at the docks.";
-			mes .@str$;
-			viewpoint 1,166,53,6,0x00BFFF;
-			break;
-		case 8:
-			mes "[Moscovia Guide]";
-			mes "I'll remove all marks from your mini-map.";
-			mes .@str$;
-			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 "[Moscovia Guide]";
-			mes "Enjoy your trip~!";
+			mes "It'd be great to walk about alone.";
+			mes "Take care.";
 			close;
-		}
 	}
-}
+}
\ No newline at end of file