Full npc folder reorganization. (I hope I didn't break anything D:)

-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders.
-NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences.
-For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates.
-All pre-renewal files has been reverted back to their pre-renewal behavior.

TODO:
-Correct pre-re quest rewards.
-Check for pre-re/re differences in mapflags.

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

1 files changed, 136 insertions, 0 deletions

diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt
new file mode 100644
index 000000000..bb88d641f
--- /dev/null
+++ b/npc/cities/moscovia.txt
@@ -0,0 +1,136 @@
+//===== rAthena Script ======================================= 
+//= Moscovia Town
+//===== By: ================================================== 
+//= Kisuka
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Moscovia Town Script
+//===== Additional Comments: ================================= 
+//= 1.0 First Version. [Kisuka]
+//= 1.1 Removed villagers (they are part of a quest). [Kisuka]
+//============================================================
+
+// Moscovia Transportation
+//============================================================ 
+alberta,246,51,4	script	Moscovia P.R. Officer#1	960,{
+	mes "[Moscovia P.R. Officer]";
+	mes "Moscovia! Do you know Moscovia?";
+	mes "the paradise spreading on the endless seas...";
+	mes "Welcome to Moscovia";
+	mes "It's adventurous and mystic.";
+	next;
+	switch(select("About Moscovia...:Go to Moscovia.:Cancel")) {
+		case 1:
+			mes "[Moscovia P.R. Officer]";
+			mes "Moscovia is a beautiful kingdom";
+			mes "on an island located north of Rune";
+			mes "Midgarts.";
+			next;
+			mes "[Moscovia P.R. Officer]";
+			mes "I'm sure that you will be";
+			mes "absolutely fascinated";
+			mes "by Moscovia's beautiful scenery";
+			mes "and gorgeous palace.";
+			next;
+			mes "[Moscovia P.R. Officer]";
+			mes "Now that our long winter has";
+			mes "passed,";
+			mes "I'm happy that I can now show you";
+			mes "our gorgeous hometown.";
+			next;
+			mes "[Moscovia P.R. Officer]";
+			mes "If you feel like visiting Moscovia";
+			mes "take the chance now!";
+			mes "I'll help you to have a nice trip";
+			mes "to Moscovia!";
+			close;
+			
+		case 2:
+			mes "[Moscovia P.R. Officer]";
+			mes "Ok then, let us start now.";
+			mes "You should pay me 10,000 zeny";
+			mes "to go to Moscovia.";
+			mes "But when you come back,";
+			mes "you don't have to pay.";
+			next;
+			mes "[Moscovia P.R. Officer]";
+			mes "Can we leave now?";
+			next;
+			if (select("Let's go!:Cancel") == 2) {
+				mes "[Moscovia P.R. Officer]";
+				mes "If you're too busy now,";
+				mes "please tell me again whenever you want.";
+				mes "I'm always ready to guide anyone to Moscovia.";
+				close;
+			}
+			if (Zeny < 10000) {
+				mes "[Moscovia P.R. Officer]";
+				mes "I'm sorry but you don't have";
+				mes "enough zeny now";
+				mes "You need 10,000 zeny";
+				mes "to go to Moscovia";
+				mes "Thank you.";
+				close;
+			}else{
+				mes "[Moscovia P.R. Officer]";
+				mes "Ok then, we're leaving now.";
+				close2;
+				set Zeny,Zeny - 10000;
+				warp "moscovia",163,55;
+				end;
+			}
+		case 3:
+			mes "[Moscovia P.R. Officer]";
+			mes "If you're too busy now,";
+			mes "please tell me again whenever you want.";
+			mes "I'm always ready to guide anyone to Moscovia.";
+			close;
+	}
+}
+
+moscovia,166,53,4	script	Moscovia P.R. Officer#2	960,{
+	mes "[Moscovia P.R. Officer]";
+	mes "How was your trip?";
+	mes "Do you have good memories from Moscovia?";
+	mes "A ship is now leaving";
+	mes "for Rune Midgarts.";
+	next;
+	if (select("Return to Alberta:Cancel") == 2) {
+		mes "[Moscovia P.R. Officer]";
+		mes "If you want to see more";
+		mes "please take your time.";
+		close;
+	}
+	mes "[Moscovia P.R. Officer]";
+	mes "Please come and visit soon.";
+	mes "Ok then, Let's get going.";
+	close2;
+	warp "alberta",244,52;
+	end;
+}
+
+// Generic Moscovia NPCs
+//============================================================ 
+moscovia,253,166,4	script	Soldier#mosk1	966,{
+	mes "[Soldier]";
+	mes "Our dear Csar Alexsay III is in the palace.";
+	mes "He rules over Moscovia.";
+	mes "Please be careful not to cause him any trouble.";
+	close;
+}
+
+// Moscovia Palace
+//============================================================ 
+-	script	Soldier#mosk::MoscSoldier	966,{
+	mes "[Soldier]";
+	mes "Please be silent or the Csar will be angry.";
+	close;
+}
+
+mosk_in,118,66,5	duplicate(MoscSoldier)	Soldier#mosk02	966
+mosk_in,133,110,3	duplicate(MoscSoldier)	Soldier#mosk03	966
+mosk_in,133,73,3	duplicate(MoscSoldier)	Soldier#mosk04	966
+mosk_in,113,124,5	duplicate(MoscSoldier)	Soldier#mosk05	966