- Moscovia NPCs. (All the generic, kafra, and guide NPCs.)

(Moscovia quest npcs still have horrible english, so that's why they aren't being committed yet.)

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

2 files changed, 25 insertions, 29 deletions

diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 3dfb0ad09..135f8f74d 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -201,37 +201,33 @@ ve_in,157,219,5	script	Inn Master#Receptionist	709,{
 }
 
 //======================== Moscovia ====================================
-mosk_in,135,191,5	script	Hotel Inn#Receptionist	961,{
-	mes "[Hotel Inn]";
-	mes "Good day~";
-	mes "Welcome to the";
-	mes "most comfortable";
-	mes "inn here in Moscovia~";
+mosk_in,135,191,5	script	Landlord#mosk	961,{
+	mes "[Landlord]";
+	mes "Oh, welcome to the Inn 'Sticky Herb Tree'.";
+	mes "It is the most comfortable and";
+	mes "calmest place in all of Moscovia.";
 	next;
-	menu "Save",Msave, "Take a Rest -> 5000 zeny",Mrent, "Cancel",Mend;
-
-	Msave:
-		mes "[Hotel Inn]";
+	if (select("Save:Stay the night - 5000z") == 1) {
+		mes "[Landlord]";
 		mes "Your respawn point";
-		mes "has been saved in Moscovia.";
-		mes "Enjoy your stay in town~";
-		savepoint "mosk_in",142,189;
+		mes "has been saved.";
+		mes "Hope we can see you again next time hoho.";
+		savepoint "mosk_in",141,188;
 		close;
-	Mrent:
-		mes "[Hotel Inn]";
-		if(Zeny < 5000){
-			mes "I'm sorry, but you don't have enough money to check in.";
-			mes "The service charge is 5,000 zeny.";
-			close;
-		}
-		mes "Enjoy your stay~";
-		close2;
-		set Zeny,Zeny - 5000;
-		percentheal 100,100;
-		warp "mosk_in",215,181;
-
-	Mend:
+	}
+	mes "[Landlord]";
+	if(Zeny < 5000) {
+		mes "The service charge is 5000z.";
+		mes "Please make sure you have enough";
+		mes "money for the service.";
 		close;
+	}
+	mes "Please be comfortable.";
+	close2;
+	set Zeny,Zeny - 5000;
+	percentheal 100,100;
+	warp "mosk_in",215,181;
+	end;
 }
 
 //======================= Inn Function ==============================
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 5216d7489..b1ee5b111 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -296,8 +296,8 @@ ve_in,252,313,0	shop	Magical Item Seller#ve	942,717:-1,1601:-1,1604:-1,1607:-1,1
 mosk_in,21,254,5	shop	Tool Dealer#mosk	968,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1	
 mosk_in,31,180,3	shop	Weapon Dealer#mosk	968,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
 mosk_in,79,177,1	shop	Armor Dealer#mosk	961,2211:-1,2401:-1,2403:-3,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
-moscovia,152,71,4	shop	Fruit Gardener#mosc	968,512:-1,513:-1,515:-1,516:-1
-moscovia,199,110,3	shop	Milk#mosc	959,519:-1
+moscovia,152,71,4	shop	Fruit Gardener#mosk	968,512:-1,513:-1,515:-1,516:-1
+moscovia,199,110,3	shop	Vendor from Milk Ranch#m	959,519:-1
 
 //=======================================================
 // Cooking Addition