- Optimized quests/quests_moscovia.txt.

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

1 files changed, 3721 insertions, 8431 deletions

diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index bcf1f5491..a55f944f0 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
-//= 1.9
+//= 2.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -21,6 +21,7 @@
 //= 1.7 Fixes on donpcevents and fixed some left over aegis stuff. [Kisuka]
 //= 1.8 Fixed some condition checks. [Gepard]
 //= 1.9 Corrected NPC counting mobs for the wrong NPC. (bugreport:4736) [L0ne_W0lf]
+//= 2.0 Optimized. [Joseph]
 //============================================================ 
 
 //============================================================================
@@ -31,7 +32,7 @@
 // Berbayeff - Starting Point
 //----------------------------------------------------------------------------
 moscovia,171,71,3	script	Berbayeff#npc	968,{
-	if (mos_whale_edq < 1) {
+	if (!mos_whale_edq) {
 		emotion e_an;
 		mes "[Berbayeff]";
 		mes "This..and..that...";
@@ -39,142 +40,141 @@ moscovia,171,71,3	script	Berbayeff#npc	968,{
 		mes "Makes me a braggart.";
 		next;
 		select("Do you have a problem?");
+		mes "[Berbayeff]";
+		mes "I haven't seen you before.";
+		mes "Are you a traveler?";
+		mes "If so, then you may have";
+		mes "seen many marvelous things";
+		mes "from near and far.";
+		next;
+		mes "[Berbayeff]";
+		mes "I'm sure you'll probably";
+		mes "be interested in my story.";
+		mes "All the villagers are blockheads,";
+		mes "so they treat me like an idiot.";
+		next;
+		if(select("I'm not interested in any story.:Tell me.") == 1) {
 			mes "[Berbayeff]";
-			mes "I haven't seen you before.";
-			mes "Are you a traveler?";
-			mes "If so, then you may have";
-			mes "seen many marvelous things";
-			mes "from near and far.";
-			next;
-			mes "[Berbayeff]";
-			mes "I'm sure you'll probably";
-			mes "be interested in my story.";
-			mes "All the villagers are blockheads,";
-			mes "so they treat me like an idiot.";
-			next;
-			if(select("I'm not interested in any story.:Tell me.") == 1) {
-				mes "[Berbayeff]";
-				mes "Indeed... You are not interested...";
-				mes "That's ok.";
-				next;
-				mes "[Berbayeff]";
-				mes "If you change your mind,";
-				mes "you can talk to me whenever.";
-				close;
-			}
-			emotion e_no1;
-			mes "[Berbayeff]";
-			mes "Good, I have been thinking that";
-			mes "I would tell you this story from the start.";
-			next;
-			mes "[Berbayeff]";
-			mes "You seem to have spent";
-			mes "only a few days here.";
-			mes "Have you ever heard";
-			mes "about The Moving Island?";
-			next;
-			mes "[Berbayeff]";
-			mes "In Moscovia,";
-			mes "a story is handed down";
-			mes "from the ancients, like legends.";
-			next;
-			mes "[Berbayeff]";
-			mes "It is said that";
-			mes "there is an island";
-			mes "which sometimes moves,";
-			mes "not far out at sea.";
-			next;
-			mes "[Berbayeff]";
-			mes "But, nobody has seen";
-			mes "the island before.";
-			mes "So, few people have";
-			mes "believed the legend.";
-			next;
-			mes "[Berbayeff]";
-			mes "Actually, I thought that";
-			mes "it might be a kind of";
-			mes "old story... nothing more.";
-			mes "But then... I saw...";
-			next;
-			mes "[Berbayeff]";
-			mes "Actually, I thought that";
-			mes "it might be a kind of";
-			mes "old story... nothing more.";
-			mes "But then... I saw...";
-			mes "The Moving Island!!!";
-			next;
-			mes "[Berbayeff]";
-			mes "Surprised? Right...";
-			mes "It is so surprising.";
-			mes "Frankly, you don't believe";
-			mes "any of this story either.";
-			next;
-			mes "[Berbayeff]";
-			mes "I saw the island";
-			mes "from the middle of";
-			mes "the village's south shore.";
-			next;
-			mes "[Berbayeff]";
-			mes "At first, I doubted my eyes.";
-			mes "I have never heard that that island";
-			mes "really existed here, even though I";
-			mes "have lived here all my life!";
+			mes "Indeed... You are not interested...";
+			mes "That's ok.";
 			next;
 			mes "[Berbayeff]";
-			mes "I tried to go up";
-			mes "to look at it from";
-			mes "higher ground, but";
-			mes "the island receded";
-			mes "and disappeared...";
-			mes "back to the sea.";
-			next;
-			select("The island doesn't appear anymore?");
-				mes "[Berbayeff]";
-				mes "If it does,";
-				mes "one might just think";
-				mes "that they've looked";
-				mes "at an apparition.";
-				next;
-				mes "[Berbayeff]";
-				mes "But a few nights ago...";
-				mes "Finally, the island appeared";
-				mes "in front of me again,";
-				mes "while I was driving my ship to go home.";
-				next;
-				mes "[Berbayeff]";
-				mes "At that time, I tried to";
-				mes "get near the island again,";
-				mes "slowly, but it disappeared...";
-				mes "beyond the sea once more.";
-				next;
-				mes "[Berbayeff]";
-				mes "It was then, I couldn't help";
-				mes "to finally believe";
-				mes "in the existence of";
-				mes "The Moving Island!";
-				next;
-				mes "[Berbayeff]";
-				mes "Surely, this must be";
-				mes "a great discovery!";
-				mes "Don't you think??";
-				mes "Doesn't your heart shout out in";
-				mes "hopes of adventuring out to the island?";
-				next;
-				mes "[Berbayeff]";
-				mes "I haven't given up yet!";
-				mes "Certainly, it'll appear again";
-				mes "right in front of us!";
-				next;
-				mes "[Berbayeff]";
-				mes "And on that day,";
-				mes "I'll definitely go up to that";
-				mes "island... and verify it with my own eyes!";
-				set mos_whale_edq,1;
-				close;
-	}
-	else if (mos_whale_edq == 1) {
+			mes "If you change your mind,";
+			mes "you can talk to me whenever.";
+			close;
+		}
+		emotion e_no1;
+		mes "[Berbayeff]";
+		mes "Good, I have been thinking that";
+		mes "I would tell you this story from the start.";
+		next;
+		mes "[Berbayeff]";
+		mes "You seem to have spent";
+		mes "only a few days here.";
+		mes "Have you ever heard";
+		mes "about The Moving Island?";
+		next;
+		mes "[Berbayeff]";
+		mes "In Moscovia,";
+		mes "a story is handed down";
+		mes "from the ancients, like legends.";
+		next;
+		mes "[Berbayeff]";
+		mes "It is said that";
+		mes "there is an island";
+		mes "which sometimes moves,";
+		mes "not far out at sea.";
+		next;
+		mes "[Berbayeff]";
+		mes "But, nobody has seen";
+		mes "the island before.";
+		mes "So, few people have";
+		mes "believed the legend.";
+		next;
+		mes "[Berbayeff]";
+		mes "Actually, I thought that";
+		mes "it might be a kind of";
+		mes "old story... nothing more.";
+		mes "But then... I saw...";
+		next;
+		mes "[Berbayeff]";
+		mes "Actually, I thought that";
+		mes "it might be a kind of";
+		mes "old story... nothing more.";
+		mes "But then... I saw...";
+		mes "The Moving Island!!!";
+		next;
+		mes "[Berbayeff]";
+		mes "Surprised? Right...";
+		mes "It is so surprising.";
+		mes "Frankly, you don't believe";
+		mes "any of this story either.";
+		next;
+		mes "[Berbayeff]";
+		mes "I saw the island";
+		mes "from the middle of";
+		mes "the village's south shore.";
+		next;
+		mes "[Berbayeff]";
+		mes "At first, I doubted my eyes.";
+		mes "I have never heard that that island";
+		mes "really existed here, even though I";
+		mes "have lived here all my life!";
+		next;
+		mes "[Berbayeff]";
+		mes "I tried to go up";
+		mes "to look at it from";
+		mes "higher ground, but";
+		mes "the island receded";
+		mes "and disappeared...";
+		mes "back to the sea.";
+		next;
+		select("The island doesn't appear anymore?");
+		mes "[Berbayeff]";
+		mes "If it does,";
+		mes "one might just think";
+		mes "that they've looked";
+		mes "at an apparition.";
+		next;
+		mes "[Berbayeff]";
+		mes "But a few nights ago...";
+		mes "Finally, the island appeared";
+		mes "in front of me again,";
+		mes "while I was driving my ship to go home.";
+		next;
+		mes "[Berbayeff]";
+		mes "At that time, I tried to";
+		mes "get near the island again,";
+		mes "slowly, but it disappeared...";
+		mes "beyond the sea once more.";
+		next;
+		mes "[Berbayeff]";
+		mes "It was then, I couldn't help";
+		mes "to finally believe";
+		mes "in the existence of";
+		mes "The Moving Island!";
+		next;
+		mes "[Berbayeff]";
+		mes "Surely, this must be";
+		mes "a great discovery!";
+		mes "Don't you think??";
+		mes "Doesn't your heart shout out in";
+		mes "hopes of adventuring out to the island?";
+		next;
+		mes "[Berbayeff]";
+		mes "I haven't given up yet!";
+		mes "Certainly, it'll appear again";
+		mes "right in front of us!";
+		next;
+		mes "[Berbayeff]";
+		mes "And on that day,";
+		mes "I'll definitely go up to that";
+		mes "island... and verify it with my own eyes!";
+		set mos_whale_edq,1;
+		close;
+	} else if (mos_whale_edq == 1) {
 		set .@speak,rand(1,5);
-		if (.@speak > 0 || .@speak < 3) {
+		if (.@speak < 3) {
 			mes "[Berbayeff]";
 			mes "Clearly, I want to prove";
 			mes "the existence of that island to everyone...";
@@ -185,48 +185,40 @@ moscovia,171,71,3	script	Berbayeff#npc	968,{
 			mes "Would you like to try it?";
 			close;
 		}
-		else if (.@speak > 2 || .@speak < 6) {
-			mes "[Berbayeff]";
-			mes "The best way to find the";
-			mes "island is by direct contact";
-			mes "with a ship in the sea.";
-			next;
-			mes "[Berbayeff]";
-			mes "Me?";
-			mes "Of course I have a ship.";
-			mes "I am a fisherman after all...";
-			next;
-			mes "[Berbayeff]";
-			mes "Ah, you do? You need...";
-			mes "a ship? Hm...too bad.";
-			mes "I can't lend my ship to you...";
-			next;
-			mes "[Berbayeff]";
-			mes "But maybe Mr. Ibanoff";
-			mes "can lend his ship to you";
-			mes "He likes going around";
-			mes "adventuring like me.";
-			mes "He seems to enjoy his youth...";
-			next;
-			mes "[Berbayeff]";
-			mes "Mr. Ibanoff also traveled and";
-			mes "adventured all over the world";
-			mes "like you, so he might understand";
-			mes "your sentiments well.";
-			next;
-			mes "[Berbayeff]";
-			mes "If you want to find the island";
-			mes "by ship, go to Mr. Ibanoff";
-			mes "and ask for a favor.";
-			close;
-		}
-		else {
-			mes "um...What a beautiful day?";
-			mes "Hahahahahaha...";
-			close;
-		}
-	}
-	else if (mos_whale_edq > 12 && mos_whale_edq < 42) {
+		mes "[Berbayeff]";
+		mes "The best way to find the";
+		mes "island is by direct contact";
+		mes "with a ship in the sea.";
+		next;
+		mes "[Berbayeff]";
+		mes "Me?";
+		mes "Of course I have a ship.";
+		mes "I am a fisherman after all...";
+		next;
+		mes "[Berbayeff]";
+		mes "Ah, you do? You need...";
+		mes "a ship? Hm...too bad.";
+		mes "I can't lend my ship to you...";
+		next;
+		mes "[Berbayeff]";
+		mes "But maybe Mr. Ibanoff";
+		mes "can lend his ship to you";
+		mes "He likes going around";
+		mes "adventuring like me.";
+		mes "He seems to enjoy his youth...";
+		next;
+		mes "[Berbayeff]";
+		mes "Mr. Ibanoff also traveled and";
+		mes "adventured all over the world";
+		mes "like you, so he might understand";
+		mes "your sentiments well.";
+		next;
+		mes "[Berbayeff]";
+		mes "If you want to find the island";
+		mes "by ship, go to Mr. Ibanoff";
+		mes "and ask for a favor.";
+		close;
+	} else if (mos_whale_edq > 12 && mos_whale_edq < 42) {
 		emotion e_omg;
 		mes "[Berbayeff]";
 		mes "Are you serious? Did you say";
@@ -238,19 +230,18 @@ moscovia,171,71,3	script	Berbayeff#npc	968,{
 		mes "I was right, wasn't I?";
 		mes "You must be a great adventurer.";
 		close;
-	}else{
-		mes "[Berbayeff]";
-		mes "Welcome to Moscovia.";
-		mes "What's your impression thus far?";
-		mes "Looks gorgeous, huh?";
-		next;
-		mes "[Berbayeff]";
-		mes "Most travelers and strangers";
-		mes "like our village.";
-		mes "I want you to visit places here and";
-		mes "there. You'll probably love this town.";
-		close;
 	}
+	mes "[Berbayeff]";
+	mes "Welcome to Moscovia.";
+	mes "What's your impression thus far?";
+	mes "Looks gorgeous, huh?";
+	next;
+	mes "[Berbayeff]";
+	mes "Most travelers and strangers";
+	mes "like our village.";
+	mes "I want you to visit places here and";
+	mes "there. You'll probably love this town.";
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -441,23 +432,21 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 			mes "repair the ship.";
 			set mos_whale_edq,3;
 			close;
-		}else{
-			emotion e_ag;
-			mes "[Mr. Ibanoff]";
-			mes "You want to borrow";
-			mes "my ship so spontaneously??";
-			mes "I don't even know you!!";
-			mes "You are more rude than you look.";
-			next;
-			mes "[Mr. Ibanoff]";
-			mes "I don't know, how you know";
-			mes "that I have a ship...";
-			mes "Anyway, I can't lend my ship";
-			mes "willingly to strangers.";
-			close;
 		}
-	}
-	else if (mos_whale_edq == 3) {
+		emotion e_ag;
+		mes "[Mr. Ibanoff]";
+		mes "You want to borrow";
+		mes "my ship so spontaneously??";
+		mes "I don't even know you!!";
+		mes "You are more rude than you look.";
+		next;
+		mes "[Mr. Ibanoff]";
+		mes "I don't know, how you know";
+		mes "that I have a ship...";
+		mes "Anyway, I can't lend my ship";
+		mes "willingly to strangers.";
+		close;
+	} else if (mos_whale_edq == 3) {
 		mes "[Mr. Ibanoff]";
 		mes "Did you bring all the materials?";
 		mes "If we have all the materials,";
@@ -497,85 +486,21 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 			mes "If you are ready to depart, talk to";
 			mes "me before the sun sets.";
 			close;
-		}else{
-			mes "[Mr. Ibanoff]";
-			mes "These materials are insufficient.";
-			mes "Perhaps you forgot some of them?";
-			next;
-			mes "[Mr. Ibanoff]";
-			mes "The materials needed are:";
-			mes "^0000FFStrange Steel Piece 10, Rusty Screw 10, Flexible Tube 5, Jubilee 10^000000.";
-			close;
 		}
-	}
-	else if (mos_whale_edq == 4) {
+		mes "[Mr. Ibanoff]";
+		mes "These materials are insufficient.";
+		mes "Perhaps you forgot some of them?";
+		next;
+		mes "[Mr. Ibanoff]";
+		mes "The materials needed are:";
+		mes "^0000FFStrange Steel Piece 10, Rusty Screw 10, Flexible Tube 5, Jubilee 10^000000.";
+		close;
+	} else if (mos_whale_edq == 4) {
 		mes "[Mr. Ibanoff]";
 		mes "Oh. Are you ready to depart?";
 		mes "Good, let's see...";
 		next;
-		if (gettime(3) >= 0 && gettime(3) < 3) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else if (gettime(3) >= 6 && gettime(3) < 9) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else if (gettime(3) >= 12 && gettime(3) < 15) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else if (gettime(3) >= 18 && gettime(3) < 21) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else {
-			mes "[Mr. Ibanoff]";
-			mes "Gee. The tide is too high.";
-			mes "It's too dangerous to depart";
-			mes "right now because of the waves";
-			mes "getting too rugged.";
-			next;
-			mes "[Mr. Ibanoff]";
-			mes "When the sea calmes down a bit,";
-			mes "you can come back. We can't depart";
-			mes "right now.";
-			close;
-		}
-	}
-	else if (mos_whale_edq > 4 && mos_whale_edq < 15) {
+	} else if (mos_whale_edq < 15) {
 		mes "[Mr. Ibanoff]";
 		mes "That last sailing was tough...";
 		mes "But, all adventures";
@@ -596,69 +521,7 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 			mes "When you are ready to depart, tell me.";
 			close;
 		}
-		if (gettime(3) >= 0 && gettime(3) < 3) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else if (gettime(3) >= 6 && gettime(3) < 9) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else if (gettime(3) >= 12 && gettime(3) < 15) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else if (gettime(3) >= 18 && gettime(3) < 21) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else {
-			mes "[Mr. Ibanoff]";
-			mes "Gee. The tide is too high.";
-			mes "It's too dangerous to depart";
-			mes "right now because of the waves";
-			mes "getting too rugged.";
-			next;
-			mes "[Mr. Ibanoff]";
-			mes "When the sea calmes down a bit,";
-			mes "you can come back. We can't depart";
-			mes "right now.";
-			close;
-		}
-	}
-	else if (mos_whale_edq == 15) {
+	} else if (mos_whale_edq == 15) {
 		mes "[Mr. Ibanoff]";
 		mes "Hey you... You are alive!";
 		mes "When you were swept away by the";
@@ -720,8 +583,7 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 			mes "together with you! Eh? Hahaha!";
 			set mos_whale_edq,16;
 			close;
-	}
-	else if (mos_whale_edq > 15 && mos_whale_edq < 18) {
+	} else if (mos_whale_edq < 18) {
 		mes "[Mr. Ibanoff]";
 		mes "If our dear Csar listens to this";
 		mes "kind of story, he would find it a";
@@ -730,8 +592,7 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 		mes "[Mr. Ibanoff]";
 		mes "He might even give you a prize...";
 		close;
-	}
-	else if (mos_whale_edq == 18) {
+	} else if (mos_whale_edq == 18) {
 		mes "[Mr. Ibanoff]";
 		mes "Hm. Our dear Csar requested";
 		mes "evidence of the whale island?...";
@@ -773,8 +634,7 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 		mes "prove the existence of Whale Island";
 		mes "to our dear Csar.";
 		close;
-	}
-	else if (mos_whale_edq == 19) {
+	} else if (mos_whale_edq == 19) {
 		mes "[Mr. Ibanoff]";
 		mes "Oh! Are you ready to depart?";
 		next;
@@ -783,69 +643,7 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 			mes "When you are ready to depart, tell me.";
 			close;
 		}
-		if (gettime(3) >= 0 && gettime(3) < 3) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else if (gettime(3) >= 6 && gettime(3) < 9) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else if (gettime(3) >= 12 && gettime(3) < 15) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else if (gettime(3) >= 18 && gettime(3) < 21) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else {
-			mes "[Mr. Ibanoff]";
-			mes "Gee. The tide is too high.";
-			mes "It's too dangerous to depart";
-			mes "right now because of the waves";
-			mes "getting too rugged.";
-			next;
-			mes "[Mr. Ibanoff]";
-			mes "When the sea calmes down a bit,";
-			mes "you can come back. We can't depart";
-			mes "right now.";
-			close;
-		}
-	}
-	else if (mos_whale_edq > 19 && mos_whale_edq < 32) {
+	} else if (mos_whale_edq < 32) {
 		mes "[Mr. Ibanoff]";
 		mes "What a surprise!!";
 		mes "Where have you been??";
@@ -862,69 +660,7 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 		mes "I can guess you'd like to go to";
 		mes "Whale Island once again...";
 		next;
-		if (gettime(3) >= 0 && gettime(3) < 3) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else if (gettime(3) >= 6 && gettime(3) < 9) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else if (gettime(3) >= 12 && gettime(3) < 15) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else if (gettime(3) >= 18 && gettime(3) < 21) {
-			mes "[Mr. Ibanoff]";
-			mes "Hmm. It's not a bad time.";
-			mes "We should hurry up";
-			mes "while the tides are low.";
-			mes "The ship is prepared already";
-			mes "at a dock nearby, so we can depart";
-			mes "right away.";
-			close2;
-			warp "mosk_ship",94,110;
-			end;
-		}
-		else {
-			mes "[Mr. Ibanoff]";
-			mes "Gee. The tide is too high.";
-			mes "It's too dangerous to depart";
-			mes "right now because of the waves";
-			mes "getting too rugged.";
-			next;
-			mes "[Mr. Ibanoff]";
-			mes "When the sea calmes down a bit,";
-			mes "you can come back. We can't depart";
-			mes "right now.";
-			close;
-		}
-	}
-	else if (mos_whale_edq == 32) {
+	} else if (mos_whale_edq == 32) {
 		mes "[Mr. Ibanoff]";
 		mes "Oh. You came back!";
 		mes "So, how did you do?";
@@ -946,8 +682,7 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 		mes "ready.";
 		set mos_whale_edq,33;
 		close;
-	}
-	else if (mos_whale_edq > 32 && mos_whale_edq < 39) {
+	} else if (mos_whale_edq < 39) {
 		mes "[Mr. Ibanoff]";
 		mes "Oh. Did you get all the";
 		mes "materials you needed?";
@@ -965,8 +700,7 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 		close2;
 		warp "mosk_fild01",93,94;
 		end;
-	}
-	else if (mos_whale_edq > 38 && mos_whale_edq < 41) {
+	} else if (mos_whale_edq < 41) {
 		mes "[Mr. Ibanoff]";
 		mes "Finally, everything has ended";
 		mes "successfully. With this, I add 1";
@@ -977,8 +711,7 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 		mes "chance to have another fantastic";
 		mes "adventure with a person like you!";
 		close;
-	}
-	else if (mos_whale_edq == 41) {
+	} else if (mos_whale_edq == 41) {
 		mes "[Mr. Ibanoff]";
 		mes "I heard that you played a great";
 		mes "performance, with the instrument";
@@ -995,22 +728,19 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 		mes "chance to have another fantastic";
 		mes "adventure with a person like you!";
 		close;
-	}
-	else if (mos_whale_edq > 90 && mos_whale_edq < 100) {
+	} else if (mos_whale_edq > 90 && mos_whale_edq < 100) {
 		mes "[Mr. Ibanoff]";
 		mes "What's going on?";
 		mes "You should ride a ship now? Let's ready to leave hurry up.";
 		set mos_whale_edq,4;
 		close;
-	}
-	else if (mos_whale_edq > 200 && mos_whale_edq < 300) {
+	} else if (mos_whale_edq > 200 && mos_whale_edq < 300) {
 		mes "[Mr. Ibanoff]";
 		mes "What's going on?";
 		mes "You should ride a ship now? Let's ready to leave hurry up.";
 		set mos_whale_edq,19;
 		close;
-	}
-	else{
+	} else {
 		mes "[Mr. Ibanoff]";
 		mes "You are also an adventurer from another province. I also was a great adventurer.";
 		next;
@@ -1018,6 +748,29 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 		mes "Uf...I just want to be 20 years younger, so I can travel here and there with invigorating youth such as you... Time is an enemy. Hahahahaha!";
 		close;
 	}
+	if ((gettime(3) >= 0 && gettime(3) < 3) || (gettime(3) >= 6 && gettime(3) < 9) || (gettime(3) >= 12 && gettime(3) < 15) || (gettime(3) >= 18 && gettime(3) < 21))  {
+		mes "[Mr. Ibanoff]";
+		mes "Hmm. It's not a bad time.";
+		mes "We should hurry up";
+		mes "while the tides are low.";
+		mes "The ship is prepared already";
+		mes "at a dock nearby, so we can depart";
+		mes "right away.";
+		close2;
+		warp "mosk_ship",94,110;
+		end;
+	}
+	mes "[Mr. Ibanoff]";
+	mes "Gee. The tide is too high.";
+	mes "It's too dangerous to depart";
+	mes "right now because of the waves";
+	mes "getting too rugged.";
+	next;
+	mes "[Mr. Ibanoff]";
+	mes "When the sea calmes down a bit,";
+	mes "you can come back. We can't depart";
+	mes "right now.";
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -1054,121 +807,37 @@ mosk_ship,98,110,3	script	Mr. Ibanoff#npc2	964,{
 		mes "forward, to the east.";
 		set mos_whale_edq,5;
 		close;
-	}
-	else if (mos_whale_edq == 5) {
+	} else if (mos_whale_edq == 5) {
 		mes "[Mr. Ibanoff]";
 		mes "Keep the direction by holding the";
 		mes "rudder to move forward to the";
 		mes "East.";
 		close;
-	}
-	else if (mos_whale_edq == 6) {
-		set .@ship1,rand(1,4);
-		if (.@ship1 == 3) {
+	} else if (mos_whale_edq == 6 || mos_whale_edq == 21) {
+		set .@r,(mos_whale_edq == 21)?3:4;
+		if (rand(1,.@r) == 3) {
 			mes "[Mr. Ibanoff]";
 			mes "Hm. The sea currents have changed.";
 			mes "Adjust the rudder forward to the";
 			mes "North, to follow the currents.";
-			set mos_whale_edq,7;
-			close;
-		}else{
-			mes "[Mr. Ibanoff]";
-			mes "Nothing yet... Nothing has changed";
-			mes "in the flow of water. There is";
-			mes "nothing to note...";
-			next;
-			mes "[Mr. Ibanoff]";
-			mes "We had better keep sailing on this";
-			mes "heading for now.";
+			set mos_whale_edq,mos_whale_edq+1;
 			close;
 		}
-	}
-	else if ($@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We must first repulse the";
-		mes "monsters!";
-		close;
-	}
-	else if (mos_whale_edq == 7 && $@mos1_edq == 0) {
 		mes "[Mr. Ibanoff]";
-		mes "Hey!";
-		mes "Did you not hear me?";
-		mes "Change the rudder forward to the";
-		mes "North, and follow the currents!";
-		close;
-	}
-	else if (mos_whale_edq == 8 && $@mos1_edq == 0) {
-		set .@ship1,rand(1,3);
-		if (.@ship1 == 3) {
-			set .@ship2,rand(1,4);
-			if (.@ship2 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "East, to follow the currents.";
-				set mos_whale_edq,91;
-				close;
-			}
-			else if (.@ship2 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "West, to follow the currents.";
-				set mos_whale_edq,92;
-				close;
-			}
-			else if (.@ship2 == 3) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "South, to follow the currents.";
-				set mos_whale_edq,93;
-				close;
-			}
-			else if (.@ship2 == 4) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "North, to follow the currents.";
-				set mos_whale_edq,94;
-				close;
-			}
-		}else{
-			mes "[Mr. Ibanoff]";
-			mes "Nothing yet... Nothing has changed";
-			mes "in the flow of water. There is";
-			mes "nothing to note...";
-			next;
-			mes "[Mr. Ibanoff]";
-			mes "We had better keep sailing on this heading for now.";
-			close;
-		}
-	}
-	else if (mos_whale_edq == 91 && $@mos1_edq == 0) {
-		mes "[Mr. Ibanoff]";
-		mes "Hey!";
-		mes "Did you not hear me?";
-		mes "Change the rudder forward to the";
-		mes "East, and follow the currents!";
-		close;
-	}
-	else if (mos_whale_edq == 92 && $@mos1_edq == 0) {
+		mes "Nothing yet... Nothing has changed";
+		mes "in the flow of water. There is";
+		mes "nothing to note...";
+		next;
 		mes "[Mr. Ibanoff]";
-		mes "Hey!";
-		mes "Did you not hear me?";
-		mes "Change the rudder forward to the";
-		mes "West, and follow the currents!";
+		mes "We had better keep sailing on this";
+		mes "heading for now.";
 		close;
-	}
-	else if (mos_whale_edq == 93 && $@mos1_edq == 0) {
+	} else if ($@mos1_edq) {
 		mes "[Mr. Ibanoff]";
-		mes "Hey!";
-		mes "Did you not hear me?";
-		mes "Change the rudder forward to the";
-		mes "South, and follow the currents!";
+		mes "We must first repulse the";
+		mes "monsters!";
 		close;
-	}
-	else if (mos_whale_edq == 94 && $@mos1_edq == 0) {
+	} else if (mos_whale_edq == 7 || mos_whale_edq == 22) {
 		mes "[Mr. Ibanoff]";
 		mes "Hey!";
 		mes "Did you not hear me?";
@@ -1176,59 +845,8 @@ mosk_ship,98,110,3	script	Mr. Ibanoff#npc2	964,{
 		mes "North, and follow the currents!";
 		close;
 	}
-	else if (mos_whale_edq == 10 && $@mos1_edq == 0) {
-		set .@ship1,rand(1,3);
-		if (.@ship1 == 2) {
-			set .@ship2,rand(1,4);
-			if (.@ship2 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "East, to follow the currents.";
-				set mos_whale_edq,91;
-				close;
-			}
-			else if (.@ship2 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "West, to follow the currents.";
-				set mos_whale_edq,92;
-				close;
-			}
-			else if (.@ship2 == 3) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "South, to follow the currents.";
-				set mos_whale_edq,93;
-				close;
-			}
-			else if (.@ship2 == 4) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "North, to follow the currents.";
-				set mos_whale_edq,94;
-				close;
-			}
-		}else{
-			mes "[Mr. Ibanoff]";
-			mes "Nothing yet... Nothing has changed";
-			mes "in the flow of water. There is";
-			mes "nothing to note...";
-			next;
-			mes "[Mr. Ibanoff]";
-			mes "We had better keep sailing on this heading for now.";
-			close;
-		}
-	}
-	else if (mos_whale_edq == 10 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We must first repulse the";
-		mes "monsters!";
-		close;
-	}
+	else if (mos_whale_edq == 8 || mos_whale_edq == 10) callsub S_D_1,3,91,92,93,94;
+	else if (mos_whale_edq >= 91 && mos_whale_edq <= 94) callsub S_D_2,91,0;
 	else if (mos_whale_edq == 11) {
 		mes "[Mr. Ibanoff]";
 		mes "Look... Beyond the sea!";
@@ -1243,17 +861,14 @@ mosk_ship,98,110,3	script	Mr. Ibanoff#npc2	964,{
 		set mos_whale_edq,12;
 		donpcevent "#findship::OnEnable";
 		close;
-	}
-	else if (mos_whale_edq == 12) {
+	} else if (mos_whale_edq == 12) {
 		mes "[Mr. Ibanoff]";
 		mes "What are you doing...? Go around";
 		mes "the deck to look more carefully!";
 		mes "Go!";
 		donpcevent "#findship::OnEnable";
 		close;
-		return;
-	}
-	else if (mos_whale_edq == 19) {
+	} else if (mos_whale_edq == 19) {
 		mes "[Mr. Ibanoff]";
 		mes "This time, I hope to find that";
 		mes "whale island again without any";
@@ -1275,174 +890,16 @@ mosk_ship,98,110,3	script	Mr. Ibanoff#npc2	964,{
 		mes "forward, to the east.";
 		set mos_whale_edq,20;
 		close;
-	}
-	else if (mos_whale_edq == 20) {
+	} else if (mos_whale_edq == 20) {
 		mes "[Mr. Ibanoff]";
 		mes "Keep the direction by holding the";
 		mes "rudder to move forward to the";
 		mes "East.";
 		close;
 	}
-	else if (mos_whale_edq == 21) {
-		set .@ship1,rand(1,3);
-		if (.@ship1 == 2) {
-			mes "[Mr. Ibanoff]";
-			mes "Hm. The sea currents have changed.";
-			mes "Adjust the rudder forward to the";
-			mes "North, to follow the currents.";
-			set mos_whale_edq,22;
-			close;
-		}else{
-			mes "[Mr. Ibanoff]";
-			mes "Nothing yet... Nothing has changed";
-			mes "in the flow of water. There is";
-			mes "nothing to note...";
-			next;
-			mes "[Mr. Ibanoff]";
-			mes "We had better keep sailing on this heading for now.";
-			close;
-		}
-	}
-	else if ($@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We must first repulse the";
-		mes "monsters!";
-		close;
-	}
-	else if (mos_whale_edq == 22 && $@mos1_edq == 0) {
-		mes "[Mr. Ibanoff]";
-		mes "Hey!";
-		mes "Did you not hear me?";
-		mes "Change the rudder forward to the";
-		mes "North, and follow the currents!";
-		close;
-	}
-	else if (mos_whale_edq == 23 && $@mos1_edq == 0) {
-		set .@ship1,rand(1,5);
-		if (.@ship1 == 3) {
-			set .@ship2,rand(1,4);
-			if (.@ship2 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "East, to follow the currents.";
-				set mos_whale_edq,241;
-				close;
-			}
-			else if (.@ship2 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "West, to follow the currents.";
-				set mos_whale_edq,242;
-				close;
-			}
-			else if (.@ship2 == 3) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "South, to follow the currents.";
-				set mos_whale_edq,243;
-				close;
-			}
-			else if (.@ship2 == 4) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "North, to follow the currents.";
-				set mos_whale_edq,244;
-				close;
-			}
-		}else{
-			mes "[Mr. Ibanoff]";
-			mes "Nothing yet... Nothing has changed";
-			mes "in the flow of water. There is";
-			mes "nothing to note...";
-			next;
-			mes "[Mr. Ibanoff]";
-			mes "We had better keep sailing on this heading for now.";
-			close;
-		}
-	}
-	else if (mos_whale_edq == 241 && $@mos1_edq == 0) {
-		mes "[Mr. Ibanoff]";
-		mes "Hey!";
-		mes "Did you not hear me?";
-		mes "Change the rudder forward to the";
-		mes "East, and follow the currents!";
-		close;
-	}
-	else if (mos_whale_edq == 242 && $@mos1_edq == 0) {
-		mes "[Mr. Ibanoff]";
-		mes "Hey!";
-		mes "Did you not hear me?";
-		mes "Change the rudder forward to the";
-		mes "West, and follow the currents!";
-		close;
-	}
-	else if (mos_whale_edq == 243 && $@mos1_edq == 0) {
-		mes "[Mr. Ibanoff]";
-		mes "Hey!";
-		mes "Did you not hear me?";
-		mes "Change the rudder forward to the";
-		mes "East, and follow the currents!";
-		close;
-	}
-	else if (mos_whale_edq == 244 && $@mos1_edq == 0) {
-		mes "[Mr. Ibanoff]";
-		mes "Hey!";
-		mes "Did you not hear me?";
-		mes "Change the rudder forward to the";
-		mes "East, and follow the currents!";
-		close;
-	}
-	else if (mos_whale_edq == 25 && $@mos1_edq == 0) {
-		set .@ship1,rand(1,4);
-		if (.@ship1 == 3) {
-			set .@ship2,rand(1,4);
-			if (.@ship2 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "East, to follow the currents.";
-				set mos_whale_edq,241;
-				close;
-			}
-			else if (.@ship2 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "West, to follow the currents.";
-				set mos_whale_edq,242;
-				close;
-			}
-			else if (.@ship2 == 3) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "South, to follow the currents.";
-				set mos_whale_edq,243;
-				close;
-			}
-			else if (.@ship2 == 4) {
-				mes "[Mr. Ibanoff]";
-				mes "Hm. The sea currents have changed.";
-				mes "Adjust the rudder forward to the";
-				mes "North, to follow the currents.";
-				set mos_whale_edq,244;
-				close;
-			}
-		}else{
-			mes "[Mr. Ibanoff]";
-			mes "Nothing yet... Nothing has changed";
-			mes "in the flow of water. There is";
-			mes "nothing to note...";
-			next;
-			mes "[Mr. Ibanoff]";
-			mes "We had better keep sailing on this heading for now.";
-			close;
-		}
-	}
+	else if (mos_whale_edq == 23 || mos_whale_edq == 25) callsub S_D_1,5,241,242,243,244;
+	else if (mos_whale_edq == 241 || mos_whale_edq == 243 || mos_whale_edq == 244) callsub S_D_2,1,1;
+	else if (mos_whale_edq == 242) callsub S_D_2,1,2;
 	else if (mos_whale_edq == 26) {
 		mes "[Mr. Ibanoff]";
 		mes "Look there!";
@@ -1480,88 +937,44 @@ mosk_ship,98,110,3	script	Mr. Ibanoff#npc2	964,{
 		warp "mosk_fild01",93,94;
 		end;
 	}
-	else if (mos_whale_edq == 7 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We must first repulse the";
-		mes "monsters!";
-		close;
-	}
-	else if (mos_whale_edq == 8 && $@mos1_edq == 0) {
-		mes "[Mr. Ibanoff]";
-		mes "Don't adjust wheels now.";
-		mes "You can do that under my direction.";
-		close;
-	}
-	else if (mos_whale_edq == 8 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We must first repulse the";
-		mes "monsters!";
-		close;
-	}
-	else if (mos_whale_edq == 7 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We must first repulse the";
-		mes "monsters!";
-		close;
-	}
-	else if (mos_whale_edq == 8 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We must first repulse the";
-		mes "monsters!";
-		close;
-	}
-	else if (mos_whale_edq == 10 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We must first repulse the";
-		mes "monsters!";
-		close;
-	}
-	else if (mos_whale_edq > 89 && mos_whale_edq < 100 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We must first repulse the";
-		mes "monsters!";
-		close;
-	}
-	else if (mos_whale_edq == 22 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We must first repulse the";
-		mes "monsters!";
-		close;
-	}
-	else if (mos_whale_edq == 23 && $@mos1_edq == 0) {
-		mes "[Mr. Ibanoff]";
-		mes "Don't adjust wheels now.";
-		mes "You can do that under my direction.";
-		close;
-	}
-	else if (mos_whale_edq == 23 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We must first repulse the";
-		mes "monsters!";
-		close;
-	}
-	else if (mos_whale_edq == 25 && $@mos1_edq > 0) {
+	mes "[Mr. Ibanoff]";
+	mes "What? How did you get on";
+	mes "this ship?? You... No.";
+	mes "I'll forgive you this once, but go";
+	mes "back now.";
+	close2;
+	warp "moscovia",163,55;
+	end;
+
+S_D_1:
+	if (rand(1,4) == 3) {
+		set .@ship2,rand(4);
+		setarray .@d$,"East","West","South","North";
 		mes "[Mr. Ibanoff]";
-		mes "We must first repulse the";
-		mes "monsters!";
+		mes "Hm. The sea currents have changed.";
+		mes "Adjust the rudder forward to the";
+		mes .@d$[.@ship2]+", to follow the currents.";
+		set mos_whale_edq,getarg(.@ship2);
 		close;
 	}
-	else if (mos_whale_edq > 239 && mos_whale_edq < 250 && $@mos1_edq > 0) {
+	mes "[Mr. Ibanoff]";
+	mes "Nothing yet... Nothing has changed";
+	mes "in the flow of water. There is";
+	mes "nothing to note...";
+	next;
+	mes "[Mr. Ibanoff]";
+	mes "We had better keep sailing on this heading for now.";
+	close;
+	
+S_D_2:
+		setarray .@d$[getarg(0)],"East","West","South","North";
 		mes "[Mr. Ibanoff]";
-		mes "We must first repulse the";
-		mes "monsters!";
+		mes "Hey!";
+		mes "Did you not hear me?";
+		mes "Change the rudder forward to the";
+		if (getarg(1)) mes .@d$[getarg(1)]+", and follow the currents!";
+		else mes .@d$[mos_whale_edq]+", and follow the currents!";
 		close;
-	}
-	else{
-		mes "[Mr. Ibanoff]";
-		mes "What? How did you get on";
-		mes "this ship?? You... No.";
-		mes "I'll forgive you this once, but go";
-		mes "back now.";
-		close2;
-		warp "moscovia",163,55;
-		end;
-	}
 }
 
 //----------------------------------------------------------------------------
@@ -1569,803 +982,65 @@ mosk_ship,98,110,3	script	Mr. Ibanoff#npc2	964,{
 //----------------------------------------------------------------------------
 mosk_ship,101,111,4	script	rudder#ship	111,{
 	if (mos_whale_edq == 5) {
-		mes "Which way?";
-		next;
-		switch(select("East:West:South:North")) {
-		case 1:
-			mes "[Mr. Ibanoff]";
-			mes "Good. Firstly, we should";
-			mes "keep heading east this way.";
-			mes "When I give the order,";
-			mes "please adjust the rudder again.";
-			set mos_whale_edq,6;
-			close;
-			break;
-		case 2:
-			mes "[Mr. Ibanoff]";
-			mes "I said that we should go East!";
-			mes "You should sail in the right";
-			mes "direction! To the east!";
-			close;
-			break;
-		case 3:
-			mes "[Mr. Ibanoff]";
-			mes "I said that we should go East!";
-			mes "You should sail in the right";
-			mes "direction! To the east!";
-			close;
-			break;
-		case 4:
-			mes "[Mr. Ibanoff]";
-			mes "I said that we should go East!";
-			mes "You should sail in the right";
-			mes "direction! To the east!";
-			close;
-		}
-	}
-	else if (mos_whale_edq == 4) {
+		callsub S_Rud1,1,0;
+	} else if (mos_whale_edq == 4) {
 		mes "[Mr. Ibanoff]";
 		mes "You don't have to adjust the rudder for now.";
 		mes "Wait for my direction.";
 		close;
-	}
-	else if (mos_whale_edq == 6) {
+	} else if (mos_whale_edq == 6) {
 		mes "[Mr. Ibanoff]";
 		mes "Do not yet adjust the rudder.";
 		mes "Only when I order you to,";
 		mes "you adjust the rudder.";
 		close;
-	}
-	else if (mos_whale_edq == 7 && $@mos1_edq == 0) {
-		mes "Which way?";
-		next;
-		switch(select("East:West:South:North")) {
-		case 1:
-			set .@ship_mon1,rand(1,5);
-			if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,5);
-			}
-			else if (.@ship_mon1 == 4) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				close;
-			}
-			break;
-		case 2:
-			set .@ship_mon1,rand(1,5);
-			if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,5);
-			}
-			else if (.@ship_mon1 == 4) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				close;
-			}
-			break;
-		case 3:
-			set .@ship_mon1,rand(1,5);
-			if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,5);
-			}
-			else if (.@ship_mon1 == 4) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				close;
-			}
-			break;
-		case 4:
-			mes "[Mr. Ibanoff]";
-			mes "Good. Firstly, we should";
-			mes "Keep heading north this way.";
-			mes "When I give the order,";
-			mes "please adjust the rudder again.";
-			set mos_whale_edq,8;
-			close;
-		}
-	}
-	else if (mos_whale_edq == 7 && $@mos1_edq > 0) {
+	} else if (mos_whale_edq == 7 && $@mos1_edq == 0) {
+		callsub S_Rud1,4,1;
+	} else if (mos_whale_edq == 7 && $@mos1_edq > 0) {
 		mes "[Mr. Ibanoff]";
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	}
-	else if (mos_whale_edq == 8 && $@mos1_edq == 0) {
+	} else if (mos_whale_edq == 8 && $@mos1_edq == 0) {
 		mes "[Mr. Ibanoff]";
 		mes "Do not yet adjust the rudder.";
 		mes "Only when I order you to,";
 		mes "you adjust the rudder.";
 		close;
-	}
-	else if (mos_whale_edq == 8 && $@mos1_edq > 0) {
+	} else if (mos_whale_edq == 8 && $@mos1_edq > 0) {
 		mes "[Mr. Ibanoff]";
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	}
-	else if (mos_whale_edq == 91 && $@mos1_edq == 0) {
-		mes "Which way?";
-		next;
-		switch(select("East:West:South:North")) {
-		case 1:
-			set .@ship_mon2,rand(1,4);
-			if (.@ship_mon2 == 3) {
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading east this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Wait! Something has appeared in front of us...";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Monsters!!!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "These monsters are like none I have";
-				mes "ever encountered! Be careful! We";
-				mes "must repulse these monsters!";
-				set $@mos1_edq,$@mos1_edq+1;
-				set mos_whale_edq,11;
-				donpcevent "Baehideun3#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading east this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				set mos_whale_edq,10;
-				close;
-			}
-			break;
-		case 2:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				close;
-			}
-			break;
-		case 3:
-			set .@ship_mon1,rand(1,4);
-			if (.@sship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				close;
-			}
-			break;
-		case 4:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				close;
-			}
-		}
-	}
-	else if (mos_whale_edq == 92 && $@mos1_edq == 0) {
-		mes "Which way?";
-		next;
-		switch(select("East:West:South:North")) {
-		case 1:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				close;
-			}
-			break;
-		case 2:
-			set .@ship_mon2,rand(1,4);
-			if (.@ship_mon2 == 3) {
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading west this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Wait! Something has appeared in front of us...";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Monsters!!!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "These monsters are like none I have";
-				mes "ever encountered! Be careful! We";
-				mes "must repulse these monsters!";
-				set $@mos1_edq,$@mos1_edq+1;
-				set mos_whale_edq,11;
-				donpcevent "Baehideun3#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading west this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				set mos_whale_edq,10;
-				close;
-			}
-			break;
-		case 3:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				close;
-			}
-			break;
-		case 4:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				close;
-			}
-		}
-	}
-	else if (mos_whale_edq == 93 && $@mos1_edq == 0) {
-		mes "Which way?";
-		next;
-		switch(select("East:West:South:North")) {
-		case 1:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				close;
-			}
-			break;
-		case 2:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				close;
-			}
-			break;
-		case 3:
-			set .@ship_mon2,rand(1,4);
-			if (.@ship_mon2 == 3) {
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading south this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Wait! Something has appeared in front of us...";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Monsters!!!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "These monsters are like none I have";
-				mes "ever encountered! Be careful! We";
-				mes "must repulse these monsters!";
-				set $@mos1_edq,$@mos1_edq+1;
-				set mos_whale_edq,11;
-				donpcevent "Baehideun3#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading south this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				set mos_whale_edq,10;
-				close;
-			}
-			break;
-		case 4:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				close;
-			}
-		}
-	}
-	else if (mos_whale_edq == 94 && $@mos1_edq == 0) {
-		mes "Which way?";
-		next;
-		switch(select("East:West:South:North")) {
-		case 1:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				close;
-			}
-			break;
-		case 2:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				close;
-			}
-			break;
-		case 3:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				close;
-			}
-			break;
-		case 4:
-			set .@ship_mon2,rand(1,4);
-			if (.@ship_mon2 == 3) {
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading north this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Wait! Something has appeared in front of us...";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Monsters!!!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "These monsters are like none I have";
-				mes "ever encountered! Be careful! We";
-				mes "must repulse these monsters!";
-				set $@mos1_edq,$@mos1_edq+1;
-				set mos_whale_edq,11;
-				donpcevent "Baehideun3#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading north this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				set mos_whale_edq,10;
-				close;
-			}
-		}
-	}
-	else if (mos_whale_edq == 7 && $@mos1_edq > 0) {
+	} else if (mos_whale_edq == 91 && $@mos1_edq == 0) {
+		callsub S_Rud1,1,2;
+	} else if (mos_whale_edq == 92 && $@mos1_edq == 0) {
+		callsub S_Rud1,2,2;
+	} else if (mos_whale_edq == 93 && $@mos1_edq == 0) {
+		callsub S_Rud1,3,2;
+	} else if (mos_whale_edq == 94 && $@mos1_edq == 0) {
+		callsub S_Rud1,4,2;
+	} else if (mos_whale_edq == 7 && $@mos1_edq > 0) {
 		mes "[Mr. Ibanoff]";
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	}
-	else if (mos_whale_edq == 8 && $@mos1_edq > 0) {
+	} else if (mos_whale_edq == 8 && $@mos1_edq > 0) {
 		mes "[Mr. Ibanoff]";
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	}
-	else if (mos_whale_edq == 10 && $@mos1_edq > 0) {
+	} else if (mos_whale_edq == 10 && $@mos1_edq > 0) {
 		mes "[Mr. Ibanoff]";
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	}
-	else if (mos_whale_edq == 11 && $@mos1_edq > 0) {
+	} else if (mos_whale_edq == 11 && $@mos1_edq > 0) {
 		mes "[Mr. Ibanoff]";
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	}
-	else if (mos_whale_edq > 10 && mos_whale_edq < 13) {
+	} else if (mos_whale_edq > 10 && mos_whale_edq < 13) {
 		mes "[Mr. Ibanoff]";
 		mes "Look... Beyond the sea!";
 		mes "Do you see something moving";
@@ -2377,846 +1052,144 @@ mosk_ship,101,111,4	script	rudder#ship	111,{
 		mes "Go around the deck to look more";
 		mes "carefully! Go!";
 		close;
-	}
-	else if (mos_whale_edq > 89 && mos_whale_edq < 100 && $@mos1_edq > 0) {
+	} else if (mos_whale_edq > 89 && mos_whale_edq < 100 && $@mos1_edq > 0) {
 		mes "[Mr. Ibanoff]";
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	}
-	else if (mos_whale_edq == 20) {
-		mes "Which way?";
-		next;
-		switch(select("East:West:South:North")) {
-		case 1:
-			mes "[Mr. Ibanoff]";
-			mes "Good. Firstly, we should";
-			mes "Keep heading east this way.";
-			mes "When I give the order,";
-			mes "please adjust the rudder again.";
-			set mos_whale_edq,21;
-			close;
-			break;
-		case 2:
-			mes "[Mr. Ibanoff]";
-			mes "I said that we should go East!";
-			mes "You should sail in the right";
-			mes "direction! To the east!";
-			close;
-			break;
-		case 3:
-			mes "[Mr. Ibanoff]";
-			mes "I said that we should go East!";
-			mes "You should sail in the right";
-			mes "direction! To the east!";
-			close;
-			break;
-		case 4:
-			mes "[Mr. Ibanoff]";
-			mes "I said that we should go East!";
-			mes "You should sail in the right";
-			mes "direction! To the east!";
-			close;
-		}
-	}
-	else if (mos_whale_edq == 21) {
+	} else if (mos_whale_edq == 20) {
+		callsub S_Rud1,1,0;
+	} else if (mos_whale_edq == 21) {
 		mes "[Mr. Ibanoff]";
 		mes "Do not yet adjust the rudder.";
 		mes "Only when I order you to,";
 		mes "you adjust the rudder.";
 		close;
-	}
-	else if (mos_whale_edq == 22 && $@mos1_edq == 0) {
-		mes "Which way?";
-		next;
-		switch(select("East:West:South:North")) {
-		case 1:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 4) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				close;
-			}
-			break;
-		case 2:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 4) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				close;
-			}
-			break;
-		case 3:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 4) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				close;
-			}
-			break;
-		case 4:
-			mes "[Mr. Ibanoff]";
-			mes "Good. Firstly, we should";
-			mes "Keep heading north this way.";
-			mes "When I give the order,";
-			mes "please adjust the rudder again.";
-			set mos_whale_edq,23;
-			close;
-		}
-	}
-	else if (mos_whale_edq == 22 && $@mos1_edq > 0) {
+	} else if (mos_whale_edq == 22 && $@mos1_edq == 0) {
+		callsub S_Rud1,4,1;
+	} else if (mos_whale_edq == 22 && $@mos1_edq > 0) {
 		mes "[Mr. Ibanoff]";
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	}
-	else if (mos_whale_edq == 23 && $@mos1_edq == 0) {
+	} else if (mos_whale_edq == 23 && $@mos1_edq == 0) {
 		mes "[Mr. Ibanoff]";
 		mes "Do not yet adjust the rudder.";
 		mes "Only when I order you to,";
 		mes "you adjust the rudder.";
 		close;
-	}
-	else if (mos_whale_edq == 23 && $@mos1_edq > 0) {
+	} else if (mos_whale_edq == 23 && $@mos1_edq > 0) {
 		mes "[Mr. Ibanoff]";
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	}
-	else if (mos_whale_edq == 241 && $@mos1_edq == 0) {
-		mes "Which way?";
-		next;
-		switch(select("East:West:South:North")) {
-		case 1:
-			set .@ship_mon2,rand(1,5);
-			if (.@ship_mon2 == 3) {
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading east this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Wait! Something has appeared in front of us...";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Monsters!!!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "These monsters are like none I have";
-				mes "ever encountered! Be careful! We";
-				mes "must repulse these monsters!";
-				set $@mos1_edq,$@mos1_edq+1;
-				set mos_whale_edq,26;
-				donpcevent "Baehideun4#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading east this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				set mos_whale_edq,25;
-				close;
-			}
-			break;
-		case 2:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				close;
-			}
-			break;
-		case 3:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				close;
-			}
-			break;
-		case 4:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go East!";
-				mes "You should sail in the right";
-				mes "direction! To the east!";
-				close;
-			}
-		}
-	}
-	else if (mos_whale_edq == 242 && $@mos1_edq == 0) {
-		mes "Which way?";
-		next;
-		switch(select("East:West:South:North")) {
-		case 1:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				close;
-			}
-			break;
-		case 2:
-			set .@ship_mon2,rand(1,5);
-			if (.@ship_mon2 == 3) {
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading west this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Wait! Something has appeared in front of us...";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Monsters!!!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "These monsters are like none I have";
-				mes "ever encountered! Be careful! We";
-				mes "must repulse these monsters!";
-				set $@mos1_edq,$@mos1_edq+1;
-				set mos_whale_edq,26;
-				donpcevent "Baehideun4#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading west this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				set mos_whale_edq,25;
-				close;
-			}
-			break;
-		case 3:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				close;
-			}
-			break;
-		case 4:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go West!";
-				mes "You should sail in the right";
-				mes "direction! To the west!";
-				close;
-			}
-		}
-	}
-	else if (mos_whale_edq == 243 && $@mos1_edq == 0) {
-		mes "Which way?";
-		next;
-		switch(select("East:West:South:North")) {
-		case 1:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				close;
-			}
-			break;
-		case 2:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				close;
-			}
-			break;
-		case 3:
-			set .@ship_mon2,rand(1,5);
-			if (.@ship_mon2 == 3) {
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading south this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Wait! Something has appeared in front of us...";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Monsters!!!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "These monsters are like none I have";
-				mes "ever encountered! Be careful! We";
-				mes "must repulse these monsters!";
-				set $@mos1_edq,$@mos1_edq+1;
-				set mos_whale_edq,26;
-				donpcevent "Baehideun4#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading south this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				set mos_whale_edq,25;
-				close;
-			}
-			break;
-		case 4:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go South!";
-				mes "You should sail in the right";
-				mes "direction! To the south!";
-				close;
-			}
-		}
-	}
-	else if (mos_whale_edq == 244 && $@mos1_edq == 0) {
-		mes "Which way?";
-		next;
-		switch(select("East:West:South:North")) {
-		case 1:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				close;
-			}
-			break;
-		case 2:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				close;
-			}
-			break;
-		case 3:
-			set .@ship_mon1,rand(1,4);
-			if (.@ship_mon1 == 1) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun1#ship::OnEnable";
-				close;
-				set .@ship_mon1,rand(1,4);
-			}
-			else if (.@ship_mon1 == 2) {
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Oh no! Monsters have appeared!";
-				mes "Let's get ready to fight! Hurry!";
-				set $@mos1_edq,$@mos1_edq+1;
-				donpcevent "Baehideun2#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "I said that we should go North!";
-				mes "You should sail in the right";
-				mes "direction! To the north!";
-				close;
-			}
-			break;
-		case 4:
-			set .@ship_mon2,rand(1,5);
-			if (.@ship_mon2 == 3) {
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading north this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Wait! Something has appeared in front of us...";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Monsters!!!";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "These monsters are like none I have";
-				mes "ever encountered! Be careful! We";
-				mes "must repulse these monsters!";
-				set $@mos1_edq,$@mos1_edq+1;
-				set mos_whale_edq,26;
-				donpcevent "Baehideun4#ship::OnEnable";
-				close;
-			}else{
-				mes "[Mr. Ibanoff]";
-				mes "Good. Firstly, we should";
-				mes "Keep heading north this way.";
-				mes "When I give the order,";
-				mes "please adjust the rudder again.";
-				set mos_whale_edq,25;
-				close;
-			}
-		}
-	}
-	else if ($@mos1_edq > 0) {
+	} else if (mos_whale_edq == 241 && $@mos1_edq == 0) {
+		callsub S_Rud1,1,2;
+	} else if (mos_whale_edq == 242 && $@mos1_edq == 0) {
+		callsub S_Rud1,2,2;
+	} else if (mos_whale_edq == 243 && $@mos1_edq == 0) {
+		callsub S_Rud1,3,2;
+	} else if (mos_whale_edq == 244 && $@mos1_edq == 0) {
+		callsub S_Rud1,4,1;
+	} else if ($@mos1_edq > 0) {
 		mes "[Mr. Ibanoff]";
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	}
-	else if (mos_whale_edq == 22 && $@mos1_edq > 0) {
+	} else if (mos_whale_edq == 22 && $@mos1_edq > 0) {
 		mes "[Mr. Ibanoff]";
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	}
-	else if (mos_whale_edq == 23 && $@mos1_edq > 0) {
+	} else if (mos_whale_edq == 23 && $@mos1_edq > 0) {
 		mes "[Mr. Ibanoff]";
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	}
-	else if (mos_whale_edq == 25 && $@mos1_edq > 0) {
+	} else if (mos_whale_edq == 25 && $@mos1_edq > 0) {
 		mes "[Mr. Ibanoff]";
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	}
-	else if (mos_whale_edq == 25 && $@mos1_edq == 0) {
+	} else if (mos_whale_edq == 25 && $@mos1_edq == 0) {
 		mes "[Mr. Ibanoff]";
 		mes "You can adjust the rudder,";
 		mes "under my direction.";
 		close;
-	}
-	else if (mos_whale_edq > 239 && mos_whale_edq < 250 && $@mos1_edq > 0) {
+	} else if (mos_whale_edq > 239 && mos_whale_edq < 250 && $@mos1_edq > 0) {
 		mes "[Mr. Ibanoff]";
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	}
-	else if (mos_whale_edq == 26) {
+	} else if (mos_whale_edq == 26) {
 		mes "[Mr. Ibanoff]";
 		mes "Hey! Listen to what I am saying.";
 		mes "How come you go there without my";
 		mes "permission...";
 		next;
 	}
-	else{
+	mes "[Mr. Ibanoff]";
+	mes "What? How did you get on";
+	mes "this ship?? You... No.";
+	mes "I'll forgive you this once, but go";
+	mes "back now.";
+	close2;
+	//set mos_whale_edq,4; lol, why is this here?
+	warp "moscovia",162,56;
+	end;
+	
+S_Rud1:
+	mes "Which way?";
+	next;
+	setarray .@d$[1],"East","West","South","North";
+	set .@j, select(implode(.@d$,":")) - 1;
+	if (.@j == getarg(0)) {
 		mes "[Mr. Ibanoff]";
-		mes "What? How did you get on";
-		mes "this ship?? You... No.";
-		mes "I'll forgive you this once, but go";
-		mes "back now.";
-		close2;
-		//set mos_whale_edq,4; lol, why is this here?
-		warp "moscovia",162,56;
-		end;
+		mes "Good. Firstly, we should";
+		mes "keep heading "+strtolower(.@d$[getarg(0)])+" this way.";
+		mes "When I give the order,";
+		mes "please adjust the rudder again.";
+		if (getarg(1) == 2) set .@r,rand(1,4);
+		if (getarg(1) == 2 && .@r == 3) {
+			next;
+			mes "[Mr. Ibanoff]";
+			mes "Wait! Something has appeared in front of us...";
+			next;
+			mes "[Mr. Ibanoff]";
+			mes "Monsters!!!";
+			next;
+			mes "[Mr. Ibanoff]";
+			mes "These monsters are like none I have";
+			mes "ever encountered! Be careful! We";
+			mes "must repulse these monsters!";
+			set $@mos1_edq,$@mos1_edq+1;
+			donpcevent "Baehideun3#ship::OnEnable";
+		}
+		set mos_whale_edq,(getarg(1) == 2)?((mos_whale_edq >= 241)?((.@r != 3)?26:25):((.@r != 3)?10:11)):mos_whale_edq + 1;			
+		close;
+	}	
+	mes "[Mr. Ibanoff]";
+	mes "I said that we should go "+.@d$[getarg(0)]+"!";
+	mes "You should sail in the right";
+	mes "direction! To the "+strtolower(.@d$[getarg(0)])+"!";
+	if (getarg(1) >= 1) {
+		set .@r,(getarg(1) == 1)?5:4;
+		if (rand(1,.@r) <= 2) {
+			next;
+			mes "[Mr. Ibanoff]";
+			mes "Oh no! Monsters have appeared!";
+			mes "Let's get ready to fight! Hurry!";
+			set $@mos1_edq,$@mos1_edq+1;
+			donpcevent "Baehideun1#ship::OnEnable";
+		}
 	}
+	close;	
 }
 
 //----------------------------------------------------------------------------
 // Aged Stranger - Whale Island
 //----------------------------------------------------------------------------
 mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
-	if (checkweight(1201,1) == 0 ) {
-		mes "[Aged Stranger]";
-		mes "You're carrying too many items.";
-		mes "Please come after using kafra service.";
-		close;
-	}
 	if ((MaxWeight-Weight) < 2000) {
 		mes "[Aged Stranger]";
 		mes "You're carrying too many items.";
@@ -3304,28 +1277,17 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 		mes "to the land from whence you came.";
 		mes "You can relax.";
 		next;
-		mes "-The old man starts to play";
-		mes "his instrument, with eyes closed.";
-		mes "He is unresponsive...";
-		mes "like having fallen into a world";
-		mes "only his own.-";
+		callsub S_AS_3;
 		set mos_whale_edq,14;
 		close2;
 		sleep2 20000;
 		set mos_whale_edq,15;
 		end;
-	}
-	else if (mos_whale_edq == 14) {
-		soundeffect "mos_gusli1.wav",0;
-		mes "-The old man starts to play";
-		mes "his instrument, with eyes closed.";
-		mes "He is unresponsive...";
-		mes "like having fallen into a world";
-		mes "only his own.-";
+	} else if (mos_whale_edq == 14) {
+		callsub S_AS_3;
 		set mos_whale_edq,15;
 		close;
-	}
-	else if (mos_whale_edq == 15) {
+	} else if (mos_whale_edq == 15) {
 		mes "[Aged Stranger]";
 		mes "Hm... Almost there...";
 		mes "Young man, you will arrive back on";
@@ -3355,114 +1317,112 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 		close2;
 		warp "moscovia",163,54;
 		end;
-	}
-	else if (mos_whale_edq == 30) {
+	} else if (mos_whale_edq == 30) {
 		mes "[Aged Stranger]";
 		mes "Hahaha... I didn't know that I";
 		mes "would meet you again! How did you";
 		mes "return?";
 		next;
 		select("Explain the whole story.");
+		mes "[Aged Stranger]";
+		mes "Hm... just like that?";
+		mes "Whoever hasn't come here directly";
+		mes "would expect you to return like";
+		mes "that. Well.";
+		next;
+		mes "[Aged Stranger]";
+		mes "I just wanted to spend the rest of";
+		mes "my life here, leisurely... I'm";
+		mes "interested in the world... but I'm";
+		mes "no match for it...";
+		next;
+		mes "[Aged Stranger]";
+		mes "Do not look sorry for me.";
+		mes "When you went back I didn't ask you";
+		mes "not to say anything about this";
+		mes "island to others.";
+		next;
+		mes "[Aged Stranger]";
+		mes "If I had decided to hide where";
+		mes "nobody can find... Well, you";
+		mes "needn't worry too much about that";
+		mes "now.";
+		next;
+		mes "[Aged Stranger]";
+		mes "Anyway, are you troubled?";
+		mes "What are you going to do?";
+		next;
+		if(select("Think more.:Don't you have a way?") == 1) {
 			mes "[Aged Stranger]";
-			mes "Hm... just like that?";
-			mes "Whoever hasn't come here directly";
-			mes "would expect you to return like";
-			mes "that. Well.";
-			next;
-			mes "[Aged Stranger]";
-			mes "I just wanted to spend the rest of";
-			mes "my life here, leisurely... I'm";
-			mes "interested in the world... but I'm";
-			mes "no match for it...";
-			next;
-			mes "[Aged Stranger]";
-			mes "Do not look sorry for me.";
-			mes "When you went back I didn't ask you";
-			mes "not to say anything about this";
-			mes "island to others.";
-			next;
-			mes "[Aged Stranger]";
-			mes "If I had decided to hide where";
-			mes "nobody can find... Well, you";
-			mes "needn't worry too much about that";
-			mes "now.";
-			next;
-			mes "[Aged Stranger]";
-			mes "Anyway, are you troubled?";
-			mes "What are you going to do?";
-			next;
-			if(select("Think more.:Don't you have a way?") == 1) {
-				mes "[Aged Stranger]";
-				mes "Do that. Think carefully, the";
-				mes "answer is to be found...";
-				mes "Hoohoohoo!";
-				close;
-			}
-			mes "[Aged Stranger]";
-			mes "To bring the Csar here and show him";
-			mes "everything?!? It's difficult...";
-			next;
-			mes "[Aged Stranger]";
-			mes "An evidence of whale island...";
-			mes "That's all you need if only it";
-			mes "existed in this island...";
-			next;
-			soundeffect "mos_gusli1.wav",0;
-			mes "-The aged man closes his eyes and";
-			mes "starts to play his instrument, as";
-			mes "he falls in thought.-";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Old man, could you make one of";
-			mes "those instruments for me? That is a";
-			mes "marvelous thing that I've seen only";
-			mes "here.";
-			next;
-			mes "[Aged Stranger]";
-			mes "Oh... That's a good idea.";
-			mes "There isn't an instrument like this";
-			mes "in all Moscovia! Absolutely...";
-			next;
-			mes "[Aged Stranger]";
-			mes "Hm... If you grant my request, I";
-			mes "will make this instrument for you.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "What is your request?";
-			next;
-			mes "[Aged Stranger]";
-			mes "Just in time. I have always used";
-			mes "this instrument which is already";
-			mes "over 50 years old. The body is so";
-			mes "worn. It's not surprising that it's";
-			mes "falling apart...";
-			next;
-			mes "[Aged Stranger]";
-			mes "It is made with strings that only";
-			mes "exist in this place, but you can";
-			mes "get the other materials for it in";
-			mes "the mainland.";
-			next;
-			mes "[Aged Stranger]";
-			mes "If you bring the materials, I can";
-			mes "make a new one.";
-			next;
-			mes "[Aged Stranger]";
-			mes "The materials are ^0000FFLog 30, Tough Vines 20, Antelope Horn 20, Sea-otter Fur 10^000000.";
-			next;
-			mes "[Aged Stranger]";
-			mes "I won't move the island, so you can";
-			mes "find it when you come back with the";
-			mes "materials.";
-			next;
-			mes "[Aged Stranger]";
-			mes "Tell me whenever you're ready, and";
-			mes "I'll send you back to the";
-			mes "mainland.";
-			set mos_whale_edq,31;
+			mes "Do that. Think carefully, the";
+			mes "answer is to be found...";
+			mes "Hoohoohoo!";
 			close;
-	}
-	else if (mos_whale_edq == 31) {
+		}
+		mes "[Aged Stranger]";
+		mes "To bring the Csar here and show him";
+		mes "everything?!? It's difficult...";
+		next;
+		mes "[Aged Stranger]";
+		mes "An evidence of whale island...";
+		mes "That's all you need if only it";
+		mes "existed in this island...";
+		next;
+		soundeffect "mos_gusli1.wav",0;
+		mes "-The aged man closes his eyes and";
+		mes "starts to play his instrument, as";
+		mes "he falls in thought.-";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Old man, could you make one of";
+		mes "those instruments for me? That is a";
+		mes "marvelous thing that I've seen only";
+		mes "here.";
+		next;
+		mes "[Aged Stranger]";
+		mes "Oh... That's a good idea.";
+		mes "There isn't an instrument like this";
+		mes "in all Moscovia! Absolutely...";
+		next;
+		mes "[Aged Stranger]";
+		mes "Hm... If you grant my request, I";
+		mes "will make this instrument for you.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "What is your request?";
+		next;
+		mes "[Aged Stranger]";
+		mes "Just in time. I have always used";
+		mes "this instrument which is already";
+		mes "over 50 years old. The body is so";
+		mes "worn. It's not surprising that it's";
+		mes "falling apart...";
+		next;
+		mes "[Aged Stranger]";
+		mes "It is made with strings that only";
+		mes "exist in this place, but you can";
+		mes "get the other materials for it in";
+		mes "the mainland.";
+		next;
+		mes "[Aged Stranger]";
+		mes "If you bring the materials, I can";
+		mes "make a new one.";
+		next;
+		mes "[Aged Stranger]";
+		mes "The materials are ^0000FFLog 30, Tough Vines 20, Antelope Horn 20, Sea-otter Fur 10^000000.";
+		next;
+		mes "[Aged Stranger]";
+		mes "I won't move the island, so you can";
+		mes "find it when you come back with the";
+		mes "materials.";
+		next;
+		mes "[Aged Stranger]";
+		mes "Tell me whenever you're ready, and";
+		mes "I'll send you back to the";
+		mes "mainland.";
+		set mos_whale_edq,31;
+		close;
+	} else if (mos_whale_edq == 31) {
 		mes "[Aged Stranger]";
 		mes "Okay, are you ready to go back to the mainland?";
 		next;
@@ -3478,17 +1438,12 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 		mes "[Aged Stranger]";
 		mes "I see. If so, let's go.";
 		next;
-		mes "-The old man starts to play";
-		mes "his instrument, with eyes closed.";
-		mes "He is unresponsive...";
-		mes "like having fallen into a world";
-		mes "only his own.-";
 		set mos_whale_edq,32;
+		callsub S_AS_3;
 		close2;
 		warp "moscovia",162,56;
 		end;
-	}
-	else if (mos_whale_edq == 33) {
+	} else if (mos_whale_edq == 33) {
 		mes "[Aged Stranger]";
 		mes "Oh... Did you get all the";
 		mes "materials?";
@@ -3508,43 +1463,40 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 			mes "Wait for a moment until I make the";
 			mes "instrument successfully.";
 			close;
-		}else{
+		}
+		mes "[Aged Stranger]";
+		mes "Ugh... We need more materials...";
+		mes "We need ^0000FFLog 30, Tough Vines 20, Antelope Horn 20, Sea-otter Fur 10^000000.";
+		next;
+		mes "[Aged Stranger]";
+		mes "What will you do? Will you go back";
+		mes "to the mainland to find the";
+		mes "materials?";
+		next;
+		if(select("What are the materials?:I am ready.") == 1) {
 			mes "[Aged Stranger]";
-			mes "Ugh... We need more materials...";
-			mes "We need ^0000FFLog 30, Tough Vines 20, Antelope Horn 20, Sea-otter Fur 10^000000.";
+			mes "You should bring these materials:";
 			next;
 			mes "[Aged Stranger]";
-			mes "What will you do? Will you go back";
-			mes "to the mainland to find the";
-			mes "materials?";
-			next;
-			if(select("What are the materials?:I am ready.") == 1) {
-				mes "[Aged Stranger]";
-				mes "You should bring these materials:";
-				next;
+			mes "You should bring these materials:";
+			mes "^0000FFLog 30, Tough Vines 20, Antelope Horn 20, Sea-otter Fur 10^000000.";
+			close;
+		}
+		mes "[Aged Stranger]";
+		mes "I see. If so, let's go.";
+		next;
+		callsub S_AS_3;
+		close2;
+		warp "moscovia",162,56;
+		end;
+	} else if (mos_whale_edq == 34 || mos_whale_edq == 35) {
+		if (mos_whale_edq == 34) {
+			if (rand(1,3) != 2) {
 				mes "[Aged Stranger]";
-				mes "You should bring these materials:";
-				mes "^0000FFLog 30, Tough Vines 20, Antelope Horn 20, Sea-otter Fur 10^000000.";
+				mes "It's not completed yet. Please wait a little longer.";
 				close;
 			}
 			mes "[Aged Stranger]";
-			mes "I see. If so, let's go.";
-			next;
-			soundeffect "mos_gusli1.wav",0;
-			mes "-The old man starts to play";
-			mes "his instrument, with eyes closed.";
-			mes "He is unresponsive...";
-			mes "like having fallen into a world";
-			mes "only his own.-";
-			close2;
-			warp "moscovia",162,56;
-			end;
-		}
-	}
-	else if (mos_whale_edq == 34) {
-		set .@comple,rand(1,3);
-		if (.@comple == 2) {
-			mes "[Aged Stranger]";
 			mes "I have succeeded in making the";
 			mes "instrument! Here you are. It's yours.";
 			mes "This instrument is called a Gusli.";
@@ -3569,194 +1521,9 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 			mes "island. Everything is going to be";
 			mes "well.";
 			next;
-			mes "So, what will you do now?";
-			next;
-			switch(select("How would I get back here?:I want to learn the Gusli.:Go back to the mainland.")) {
-			case 1:
-				mes "[Aged Stranger]";
-				mes "You are my friend now,";
-				mes "and you have this instrument.";
-				mes "Whenever you want to come back";
-				mes "here again, just play the Gusli";
-				mes "at the docks of Moscovia.";
-				next;
-				mes "[Aged Stranger]";
-				mes "Even if it's difficult to play it";
-				mes "well, because you may not yet know";
-				mes "how to play it, it's not a problem.";
-				mes "Just make a sound.";
-				next;
-				mes "[Aged Stranger]";
-				mes "This island... this whale... can";
-				mes "perceive the sound of a Gusli from";
-				mes "an endless distance away.";
-				next;
-				mes "[Aged Stranger]";
-				mes "If you play this instrument,";
-				mes "wherever you are, I'll go to you";
-				mes "with this island. Only if you are a";
-				mes "friend... heheh.";
-				close;
-				break;
-			case 2:
-				mes "[Aged Stranger]";
-				mes "You really want to...";
-				mes "learn this instrument...";
-				mes "don't you?";
-				mes "Well... it's hard to learn";
-				mes "in such a short time...";
-				next;
-				mes "[Aged Stranger]";
-				mes "It's okay if you can't play this";
-				mes "instrument. I already made it for you.";
-				next;
-				mes "[Aged Stranger]";
-				mes "But I can teach you how";
-				mes "to play it anyway.";
-				mes "I can't be too sure, though";
-				mes "because I have never taught others.";
-				next;
-				mes "[Aged Stranger]";
-				mes "Okay. If you are ready to play the";
-				mes "Gusli, let me know.";
-				set mos_whale_edq,36;
-				close;
-				break;
-			case 3:
-				mes "[Aged Stranger]";
-				mes "I see. Okay, let's go.";
-				next;
-				mes "[Aged Stranger]";
-				mes "Whenever you want to come back here";
-				mes "again, play the Gusli at the docks";
-				mes "of Moscovia.";
-				next;
-				mes "[Aged Stranger]";
-				mes "Even if it's difficult to play it";
-				mes "well, because you may not yet know";
-				mes "how to play it, it's not a problem.";
-				mes "Just make a sound.";
-				next;
-				mes "[Aged Stranger]";
-				mes "This island... this whale... can";
-				mes "perceive the sound of a Gusli from";
-				mes "an endless distance away.";
-				next;
-				mes "[Aged Stranger]";
-				mes "If you play this instrument,";
-				mes "wherever you are, I'll go to you";
-				mes "with this island. Only if you are a";
-				mes "friend... heheh.";
-				next;
-				soundeffect "mos_gusli1.wav",0;
-				mes "-The old man starts to play";
-				mes "his instrument, with eyes closed.";
-				mes "He is unresponsive...";
-				mes "like having fallen into a world";
-				mes "only his own.-";
-				close2;
-				warp "moscovia",162,56;
-				end;
-			}
-		}else{
-			mes "[Aged Stranger]";
-			mes "It's not completed yet. Please wait a little longer.";
-			close;
-		}
-	}
-	else if (mos_whale_edq == 35) {
-		mes "[Aged Stranger]";
-		mes "So, what will you do now?";
-		next;
-		switch(select("How would I get back here?:I want to learn the Gusli.:Go back to the mainland.")) {
-		case 1:
-			mes "[Aged Stranger]";
-			mes "You are my friend now,";
-			mes "and you have this instrument.";
-			mes "Whenever you want to come back";
-			mes "here again, just play the Gusli";
-			mes "at the docks of Moscovia.";
-			next;
-			mes "[Aged Stranger]";
-			mes "Even if it's difficult to play it";
-			mes "well, because you may not yet know";
-			mes "how to play it, it's not a problem.";
-			mes "Just make a sound.";
-			next;
-			mes "[Aged Stranger]";
-			mes "This island... this whale... can";
-			mes "perceive the sound of a Gusli from";
-			mes "an endless distance away.";
-			next;
-			mes "[Aged Stranger]";
-			mes "If you play this instrument,";
-			mes "wherever you are, I'll go to you";
-			mes "with this island. Only if you are a";
-			mes "friend... heheh.";
-			close;
-			break;
-		case 2:
-			mes "[Aged Stranger]";
-			mes "You really want to...";
-			mes "learn this instrument...";
-			mes "don't you?";
-			mes "Well... it's hard to learn";
-			mes "in such a short time...";
-			next;
-			mes "[Aged Stranger]";
-			mes "It's okay if you can't play this";
-			mes "instrument. I already made it for you.";
-			next;
-			mes "[Aged Stranger]";
-			mes "But I can teach you how";
-			mes "to play it anyway.";
-			mes "I can't be too sure, though";
-			mes "because I have never taught others.";
-			next;
-			mes "[Aged Stranger]";
-			mes "Okay. If you are ready to play the";
-			mes "Gusli, let me know.";
-			set mos_whale_edq,36;
-			close;
-			break;
-		case 3:
-			mes "[Aged Stranger]";
-			mes "I see. Okay, let's go.";
-			next;
-			mes "[Aged Stranger]";
-			mes "Whenever you want to come back here";
-			mes "again, play the Gusli at the docks";
-			mes "of Moscovia.";
-			next;
-			mes "[Aged Stranger]";
-			mes "Even if it's difficult to play it";
-			mes "well, because you may not yet know";
-			mes "how to play it, it's not a problem.";
-			mes "Just make a sound.";
-			next;
-			mes "[Aged Stranger]";
-			mes "This island... this whale... can";
-			mes "perceive the sound of a Gusli from";
-			mes "an endless distance away.";
-			next;
-			mes "[Aged Stranger]";
-			mes "If you play this instrument,";
-			mes "wherever you are, I'll go to you";
-			mes "with this island. Only if you are a";
-			mes "friend... heheh.";
-			next;
-			soundeffect "mos_gusli1.wav",0;
-			mes "-The old man starts to play";
-			mes "his instrument, with eyes closed.";
-			mes "He is unresponsive...";
-			mes "like having fallen into a world";
-			mes "only his own.-";
-			close2;
-			warp "moscovia",162,56;
-			end;
 		}
-	}
-	else if (mos_whale_edq == 36) {
+		callsub S_AS_2,1;
+	} else if (mos_whale_edq == 36) {
 		mes "[Aged Stranger]";
 		mes "Are you ready to learn the Gusli?";
 		mes "Please equip the Gusli.";
@@ -3784,108 +1551,23 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 				mes "[Aged Stranger]";
 				mes "This may go faster than I expected.";
 				next;
-				mes "[Aged Stranger]";
-				mes "Okay, it's time for your turn. Play it. Play the song that I played.";
-				next;
-				set .@music_bard,rand(1,3);
-				if (.@music_bard == 2) {
-					soundeffect "mos_gusli1.wav",0;
-					emotion e_no1;
-					specialeffect2 EF_EXIT;
-					mes "[Aged Stranger]";
-					mes "Oh! You are good at playing the";
-					mes "Gusli! In such a short time... you";
-					mes "are great!";
-					next;
-					mes "[Aged Stranger]";
-					mes "You've done well. I don't need to";
-					mes "teach you anymore. Your ability";
-					mes "will be improved with more practice.";
-					next;
-					mes "[Aged Stranger]";
-					mes "Now go back to the mainland and";
-					mes "play the Gusli for our dear Csar.";
-					next;
-					mes "[Aged Stranger]";
-					mes "With your ability to play, surely";
-					mes "you can win the admiration of all.";
-					set mos_whale_edq,38;
-					close;
-				}else{
-					mes "[Aged Stranger]";
-					mes "Um, a little bit greenhorn...";
-					mes "Do not play that way.";
-					mes "Take more time to concentrate while";
-					mes "you play.";
-					next;
-					mes "[Aged Stranger]";
-					mes "Practice more on your own.";
-					mes "I will check on you again.";
-					mes "If you practice, you will be good";
-					mes "at it in no time.";
-					set mos_whale_edq,37;
-					close;
-				}
-			}else{
-				mes "[Aged Stranger]";
-				mes "Okay, it's time for your turn. Play";
-				mes "it. Play the song that I played.";
-				next;
-				set .@music_etc,rand(1,6);
-				if (.@music_etc == 3) {
-					soundeffect "mos_gusli1.wav",0;
-					emotion e_no1;
-					specialeffect2 EF_EXIT;
-					mes "[Aged Stranger]";
-					mes "Oh! You are good at playing the";
-					mes "Gusli! In such a short time... you";
-					mes "are great!";
-					next;
-					mes "[Aged Stranger]";
-					mes "You've done well. I don't need to";
-					mes "teach you anymore. Your ability";
-					mes "will be improved with more practice.";
-					next;
-					mes "[Aged Stranger]";
-					mes "Now go back to the mainland and";
-					mes "play the Gusli for our dear Csar.";
-					next;
-					mes "[Aged Stranger]";
-					mes "With your ability to play, surely";
-					mes "you can win the admiration of all.";
-					set mos_whale_edq,38;
-					close;
-				}else{
-					soundeffect "mos_gusli2.wav",0;
-					mes "[Aged Stranger]";
-					mes "Um, a little bit greenhorn...";
-					mes "Do not play that way.";
-					mes "Take more time to concentrate while";
-					mes "you play.";
-					next;
-					mes "[Aged Stranger]";
-					mes "Practice more on your own.";
-					mes "I will check on you again.";
-					mes "If you practice, you will be good";
-					mes "at it in no time.";
-					set mos_whale_edq,37;
-					close;
-				}
 			}
-		}else{
 			mes "[Aged Stranger]";
-			mes "Um... Your preparations are not";
-			mes "good. You're not holding the";
-			mes "instrument correctly. Equip it";
-			mes "properly, and then you can learn.";
+			mes "Okay, it's time for your turn. Play it. Play the song that I played.";
 			next;
-			mes "[Aged Stranger]";
-			mes "Tell me again when you are prepared";
-			mes "to play the Gusli correctly.";
-			close;
+			callsub S_AS_1;		
 		}
-	}
-	else if (mos_whale_edq == 37) {
+		mes "[Aged Stranger]";
+		mes "Um... Your preparations are not";
+		mes "good. You're not holding the";
+		mes "instrument correctly. Equip it";
+		mes "properly, and then you can learn.";
+		next;
+		mes "[Aged Stranger]";
+		mes "Tell me again when you are prepared";
+		mes "to play the Gusli correctly.";
+		close;
+	} else if (mos_whale_edq == 37) {
 		mes "[Aged Stranger]";
 		mes "Are you ready to learn the Gusli?";
 		next;
@@ -3899,173 +1581,26 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 				mes "absolutely play it wonderfully.";
 				mes "Cheer up.";
 				next;
+			}
 				mes "[Aged Stranger]";
 				mes "Good. Let's play again. Play the";
 				mes "song that I played.";
 				next;
-				set .@music_bard,rand(1,3);
-				if (.@music_bard == 2) {
-					soundeffect "mos_gusli1.wav",0;
-					emotion e_no1;
-					specialeffect2 EF_EXIT;
-					mes "[Aged Stranger]";
-					mes "Oh! You are good at playing the";
-					mes "Gusli! In such a short time... you";
-					mes "are great!";
-					next;
-					mes "[Aged Stranger]";
-					mes "You've done well. I don't need to";
-					mes "teach you anymore. Your ability";
-					mes "will be improved with more practice.";
-					next;
-					mes "[Aged Stranger]";
-					mes "Now go back to the mainland and";
-					mes "play the Gusli for our dear Csar.";
-					next;
-					mes "[Aged Stranger]";
-					mes "With your ability to play, surely";
-					mes "you can win the admiration of all.";
-					set mos_whale_edq,38;
-					close;
-				}else{
-					mes "[Aged Stranger]";
-					mes "Um, a little bit greenhorn...";
-					mes "Do not play that way.";
-					mes "Take more time to concentrate while";
-					mes "you play.";
-					next;
-					mes "[Aged Stranger]";
-					mes "Practice more on your own.";
-					mes "I will check on you again.";
-					mes "If you practice, you will be good";
-					mes "at it in no time.";
-					set mos_whale_edq,37;
-					close;
-				}
-			}else{
-				mes "[Aged Stranger]";
-				mes "Good. Let's play again. Play the";
-				mes "song that I played.";
-				next;
-				set .@music_etc,rand(1,6);
-				if (.@music_etc == 3) {
-					soundeffect "mos_gusli1.wav",0;
-					emotion e_no1;
-					specialeffect2 EF_EXIT;
-					mes "[Aged Stranger]";
-					mes "Oh! You are good at playing the";
-					mes "Gusli! In such a short time... you";
-					mes "are great!";
-					next;
-					mes "[Aged Stranger]";
-					mes "You've done well. I don't need to";
-					mes "teach you anymore. Your ability";
-					mes "will be improved with more practice.";
-					next;
-					mes "[Aged Stranger]";
-					mes "Now go back to the mainland and";
-					mes "play the Gusli for our dear Csar.";
-					next;
-					mes "[Aged Stranger]";
-					mes "With your ability to play, surely";
-					mes "you can win the admiration of all.";
-					set mos_whale_edq,38;
-					close;
-				}else{
-					mes "[Aged Stranger]";
-					mes "Um, a little bit greenhorn...";
-					mes "Do not play that way.";
-					mes "Take more time to concentrate while";
-					mes "you play.";
-					next;
-					mes "[Aged Stranger]";
-					mes "Practice more on your own.";
-					mes "I will check on you again.";
-					mes "If you practice, you will be good";
-					mes "at it in no time.";
-					set mos_whale_edq,37;
-					close;
-				}
-			}
-		}else{
-			mes "[Aged Stranger]";
-			mes "Um... Your preparations are not";
-			mes "good. You're not holding the";
-			mes "instrument correctly. Equip it";
-			mes "properly, and then you can learn.";
-			next;
-			mes "[Aged Stranger]";
-			mes "Tell me again when you are prepared";
-			mes "to play the Gusli correctly.";
-			close;
+				callsub S_AS_1;
 		}
-	}
-	else if (mos_whale_edq == 38) {
 		mes "[Aged Stranger]";
-		mes "So, what will you do now?";
-		next;
-		if(select("How would I get back here?:Go back to the mainland.") == 1) {
-			mes "[Aged Stranger]";
-			mes "You are my friend now,";
-			mes "and you have this instrument.";
-			mes "Whenever you want to come back";
-			mes "here again, just play the Gusli";
-			mes "at the docks of Moscovia.";
-			next;
-			mes "[Aged Stranger]";
-			mes "Even if it's difficult to play it";
-			mes "well, because you may not yet know";
-			mes "how to play it, it's not a problem.";
-			mes "Just make a sound.";
-			next;
-			mes "[Aged Stranger]";
-			mes "This island... this whale... can";
-			mes "perceive the sound of a Gusli from";
-			mes "an endless distance away.";
-			next;
-			mes "[Aged Stranger]";
-			mes "If you play this instrument,";
-			mes "wherever you are, I'll go to you";
-			mes "with this island. Only if you are a";
-			mes "friend... heheh.";
-			close;
-		}
-		mes "[Aged Stranger]";
-		mes "I see. Okay, let's go.";
-		next;
-		mes "[Aged Stranger]";
-		mes "Whenever you want to come back here";
-		mes "again, play the Gusli at the docks";
-		mes "of Moscovia.";
-		next;
-		mes "[Aged Stranger]";
-		mes "Even if it's difficult to play it";
-		mes "well, because you may not yet know";
-		mes "how to play it, it's not a problem.";
-		mes "Just make a sound.";
-		next;
-		mes "[Aged Stranger]";
-		mes "This island... this whale... can";
-		mes "perceive the sound of a Gusli from";
-		mes "an endless distance away.";
+		mes "Um... Your preparations are not";
+		mes "good. You're not holding the";
+		mes "instrument correctly. Equip it";
+		mes "properly, and then you can learn.";
 		next;
 		mes "[Aged Stranger]";
-		mes "If you play this instrument,";
-		mes "wherever you are, I'll go to you";
-		mes "with this island. Only if you are a";
-		mes "friend... heheh.";
-		next;
-		soundeffect "mos_gusli1.wav",0;
-		mes "-The old man starts to play";
-		mes "his instrument, with eyes closed.";
-		mes "He is unresponsive...";
-		mes "like having fallen into a world";
-		mes "only his own.-";
-		close2;
-		warp "moscovia",162,56;
-		end;
-	}
-	else if (mos_whale_edq > 38) {
+		mes "Tell me again when you are prepared";
+		mes "to play the Gusli correctly.";
+		close;
+	} else if (mos_whale_edq == 38) {
+		callsub S_AS_2,0;
+	} else if (mos_whale_edq > 38) {
 		mes "[Aged Stranger]";
 		mes "This is the Whale Island.";
 		mes "I don't know how you came here.";
@@ -4085,12 +1620,7 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 			mes "[Aged Stranger]";
 			mes "I see. If so, let's go.";
 			next;
-			soundeffect "mos_gusli1.wav",0;
-			mes "-The old man starts to play";
-			mes "his instrument, with eyes closed.";
-			mes "He is unresponsive...";
-			mes "like having fallen into a world";
-			mes "only his own.-";
+			callsub S_AS_3;
 			close2;
 			warp "moscovia",162,56;
 			end;
@@ -4117,12 +1647,7 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 			mes "[Aged Stranger]";
 			mes "I see. If so, let's go.";
 			next;
-			soundeffect "mos_gusli1.wav",0;
-			mes "-The old man starts to play";
-			mes "his instrument, with eyes closed.";
-			mes "He is unresponsive...";
-			mes "like having fallen into a world";
-			mes "only his own.-";
+			callsub S_AS_3;
 			close2;
 			warp "mosk_fild02",204,54;
 			end;
@@ -4156,18 +1681,151 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 		warp "moscovia",162,56;
 		end;
 	}
+	end;
+	
+S_AS_1:
+	if (rand(1,3) == 2) {
+		soundeffect "mos_gusli1.wav",0;
+		emotion e_no1;
+		specialeffect2 EF_EXIT;
+		mes "[Aged Stranger]";
+		mes "Oh! You are good at playing the";
+		mes "Gusli! In such a short time... you";
+		mes "are great!";
+		next;
+		mes "[Aged Stranger]";
+		mes "You've done well. I don't need to";
+		mes "teach you anymore. Your ability";
+		mes "will be improved with more practice.";
+		next;
+		mes "[Aged Stranger]";
+		mes "Now go back to the mainland and";
+		mes "play the Gusli for our dear Csar.";
+		next;
+		mes "[Aged Stranger]";
+		mes "With your ability to play, surely";
+		mes "you can win the admiration of all.";
+		set mos_whale_edq,38;
+		close;
+	}
+	mes "[Aged Stranger]";
+	mes "Um, a little bit greenhorn...";
+	mes "Do not play that way.";
+	mes "Take more time to concentrate while";
+	mes "you play.";
+	next;
+	mes "[Aged Stranger]";
+	mes "Practice more on your own.";
+	mes "I will check on you again.";
+	mes "If you practice, you will be good";
+	mes "at it in no time.";
+	set mos_whale_edq,37;
+	close;
+	
+S_AS_2:
+	mes "[Aged Stranger]";
+	mes "So, what will you do now?";
+	next;
+	switch (select("How would I get back here?:"+((getarg(0))?"I want to learn the Gusli":"")+":Go back to the mainland.")) {
+		Case 1:
+			mes "[Aged Stranger]";
+			mes "You are my friend now,";
+			mes "and you have this instrument.";
+			mes "Whenever you want to come back";
+			mes "here again, just play the Gusli";
+			mes "at the docks of Moscovia.";
+			next;
+			mes "[Aged Stranger]";
+			mes "Even if it's difficult to play it";
+			mes "well, because you may not yet know";
+			mes "how to play it, it's not a problem.";
+			mes "Just make a sound.";
+			next;
+			mes "[Aged Stranger]";
+			mes "This island... this whale... can";
+			mes "perceive the sound of a Gusli from";
+			mes "an endless distance away.";
+			next;
+			mes "[Aged Stranger]";
+			mes "If you play this instrument,";
+			mes "wherever you are, I'll go to you";
+			mes "with this island. Only if you are a";
+			mes "friend... heheh.";
+			close;
+		Case 2:
+			mes "[Aged Stranger]";
+			mes "You really want to...";
+			mes "learn this instrument...";
+			mes "don't you?";
+			mes "Well... it's hard to learn";
+			mes "in such a short time...";
+			next;
+			mes "[Aged Stranger]";
+			mes "It's okay if you can't play this";
+			mes "instrument. I already made it for you.";
+			next;
+			mes "[Aged Stranger]";
+			mes "But I can teach you how";
+			mes "to play it anyway.";
+			mes "I can't be too sure, though";
+			mes "because I have never taught others.";
+			next;
+			mes "[Aged Stranger]";
+			mes "Okay. If you are ready to play the";
+			mes "Gusli, let me know.";
+			set mos_whale_edq,36;
+			close;	
+		Case 3:
+			mes "[Aged Stranger]";
+			mes "I see. Okay, let's go.";
+			next;
+			mes "[Aged Stranger]";
+			mes "Whenever you want to come back here";
+			mes "again, play the Gusli at the docks";
+			mes "of Moscovia.";
+			next;
+			mes "[Aged Stranger]";
+			mes "Even if it's difficult to play it";
+			mes "well, because you may not yet know";
+			mes "how to play it, it's not a problem.";
+			mes "Just make a sound.";
+			next;
+			mes "[Aged Stranger]";
+			mes "This island... this whale... can";
+			mes "perceive the sound of a Gusli from";
+			mes "an endless distance away.";
+			next;
+			mes "[Aged Stranger]";
+			mes "If you play this instrument,";
+			mes "wherever you are, I'll go to you";
+			mes "with this island. Only if you are a";
+			mes "friend... heheh.";
+			next;
+			soundeffect "mos_gusli1.wav",0;
+			mes "-The old man starts to play";
+			mes "his instrument, with eyes closed.";
+			mes "He is unresponsive...";
+			mes "like having fallen into a world";
+			mes "only his own.-";
+			close2;
+			warp "moscovia",162,56;
+			end;
+	}
+	
+S_AS_3:
+	soundeffect "mos_gusli1.wav",0;
+	mes "-The old man starts to play";
+	mes "his instrument, with eyes closed.";
+	mes "He is unresponsive...";
+	mes "like having fallen into a world";
+	mes "only his own.-";
+	return;
 }
 
 //----------------------------------------------------------------------------
 // Csar Alexsay III - Moscovia Palace
 //----------------------------------------------------------------------------
 mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
-	if (checkweight(1201,1) == 0 ) {
-		mes "[Csar Alexsay III]";
-		mes "You're carrying too many items.";
-		mes "Please come after using kafra service.";
-		close;
-	}
 	if ((MaxWeight-Weight) < 2000) {
 		mes "[Csar Alexsay III]";
 		mes "You're carrying too many items.";
@@ -4247,22 +1905,14 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 				set mos_nowinter,14;
 				close;
 			}
-			mes "[Csar Alexsay III]";
-			mes "I said to bring me";
-			mes "40 Yaga's Pestles";
-			mes "from the Baba Yaga.";
-			set mos_nowinter,13;
-			close;
-		}else{
-			mes "[Csar Alexsay III]";
-			mes "I said to bring me";
-			mes "40 Yaga's Pestles";
-			mes "from the Baba Yaga.";
-			set mos_nowinter,13;
-			close;
 		}
-	}
-	else if (mos_nowinter == 13) {
+		mes "[Csar Alexsay III]";
+		mes "I said to bring me";
+		mes "40 Yaga's Pestles";
+		mes "from the Baba Yaga.";
+		set mos_nowinter,13;
+		close;
+	} else if (mos_nowinter == 13) {
 		mes "[Csar Alexsay III]";
 		mes "Did you bring some evidence to";
 		mes "resolve your issue of doubt, traveler?";
@@ -4297,20 +1947,19 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 				mes "So take care of yourself.";
 				set mos_nowinter,14;
 				close;
-			}else{
-				mes "[Csar Alexsay III]";
-				mes "Your items do not match the";
-				mes "count of 40 Yaga's Pestles.";
-				mes "Did you forget the amount,";
-				mes "or did you wish to lie to me...";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "I will treat that as a joke!";
-				mes "A kind of sarcasm!";
-				mes "You go away now and bring some";
-				mes "evidence to certify your innocence.";
-				close;
 			}
+			mes "[Csar Alexsay III]";
+			mes "Your items do not match the";
+			mes "count of 40 Yaga's Pestles.";
+			mes "Did you forget the amount,";
+			mes "or did you wish to lie to me...";
+			next;
+			mes "[Csar Alexsay III]";
+			mes "I will treat that as a joke!";
+			mes "A kind of sarcasm!";
+			mes "You go away now and bring some";
+			mes "evidence to certify your innocence.";
+			close;
 		}
 		mes "[Csar Alexsay III]";
 		mes "I said to bring me";
@@ -4320,8 +1969,7 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 		mes "[Csar Alexsay III]";
 		mes "Are you here to tease me?";
 		close;
-	}
-	else if (mos_nowinter == 14) {
+	} else if (mos_nowinter == 14) {
 		mes "[Csar Alexsay III]";
 		mes "It'd be great if I stayed put, for";
 		mes "the good of both me and my people.";
@@ -4336,8 +1984,7 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 		mes "Please help Baba Yaga";
 		mes "to seize the summer.";
 		close;
-	}
-	else if (mos_nowinter == 20) {
+	} else if (mos_nowinter == 20) {
 		mes "[Csar Alexsay III]";
 		mes "Are you here for...";
 		next;
@@ -4375,354 +2022,339 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 		mes "Stay here as long as you want, and";
 		mes "enjoy yourself to the fullest this summer.";
 		close;
-	}
-	else{
-		if (mos_whale_edq < 16) {
+	} if (mos_whale_edq < 16) {
+		mes "[Csar Alexsay III]";
+		mes "Welcome to Moscovia!";
+		mes "I am the ruler, Csar Aleksay III, of Moscovia.";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "Go back to your hometown and talk about the beauty of Moscovia! Talk about my great government to all the people of the lands!";
+		close;
+	} else if (mos_whale_edq == 16) {
+		mes "[Csar Alexsay III]";
+		mes "A foreign traveler...?";
+		mes " Do you have something to tell me?";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "If it is not important,";
+		mes "have an audience with the Prime Minister first.";
+		close;
+	} else if (mos_whale_edq == 17) {
+		mes "[Csar Alexsay III]";
+		mes "Oh, are you the traveler who told me about an interesting adventure story...";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "Not only are you not from Moscovia, but also... you have found the moving island, which only existed in legends! I want to hear details...";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "Let's hear it...";
+		mes "Tell me quickly.";
+		mes "I'm anxious to know the truth about the island...";
+		next;
+		select("Tell the story all the while.");
+		mes "...";
+		next;
+		mes "... ...";
+		next;
+		mes "... ... ...";
+		next;
+		mes "... ... ... ...";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "Surely, an interesting story... But it sounds so unbelievable! What do you think, Prime Minister?";
+		next;
+		mes "[Prime Minister Dmitree]";
+		mes "It doesn't sound like a lie,";
+		mes "but it's difficult to believe";
+		mes "completely. I mean, I've known";
+		mes "a whale to be huge, but...";
+		next;
+		mes "[Prime Minister Dmitree]";
+		mes "a person living there...";
+		mes "water streaming...";
+		mes "and a tree growing on it...!!!";
+		mes "Hmm...";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "I agree. I have heard many kinds of mysterious adventure stories, but this sounds like an absurd story!";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "Not to mention that it's happened near my nation. Unbelievable!";
+		next;
+		mes "[Prime Minister Dmitree]";
+		mes "But Csar... In my memory,";
+		mes "I heard that exactly, the";
+		mes "last time a story was told";
+		mes "about the mysterious moving island. But there was a musical instrument...which an old man played.";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "Really? Tell me the details.";
+		next;
+		mes "[Prime Minister Dmitree]";
+		mes "Surely, I have heard the same";
+		mes "story, as told in the legends";
+		mes "of our ancestors; about an old man who lived there.";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "Hm. There are many doubtful points. Ordinarily, I would give you a big prize, but in this case, it is difficult to believe.";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "Bring me something to prove";
+		mes "the existence of the whale.";
+		mes "If you do, I will give you a big prize.";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "But if you don't,";
+		mes "I will punish you for your lies! Bring this instrument that supposedly an old man has.";
+		next;
+		mes "[Prime Minister Dmitree]";
+		mes "Csar... This is a foreigner...";
+		mes "No disrespect was meant to you.";
+		mes "Perhaps a little more generosity is in order?.";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "No way! If the story is not true, many other foreign travelers who pass by this land will disrespect me like this... What would you have me do?";
+		next;
+		mes "[Prime Minister Dmitree]";
+		mes "......";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "You got it, traveler?";
+		mes "You have a heavy responsibility.";
+		mes "Bring evidence of this whale island to me, to provide me with some relief. Now go.";
+		set mos_whale_edq,18;
+		close;
+	} else if (mos_whale_edq > 17 && mos_whale_edq < 35) {
+		mes "[Csar Alexsay III]";
+		mes "I'm tired... I want to take a rest, so... leave.";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "Just think about finding the whale island...";
+		close;
+	} else if (mos_whale_edq == 35) {
+		mes "[Csar Alexsay III]";
+		mes "Oh. You've come back...";
+		mes "Hm. Did you find something to bring";
+		mes "to me from the whale island?";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "Did you bring the instrument?";
+		mes "A Gooselri? Which only exists";
+		mes "in the whale island? Let's see.";
+		next;
+		if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707 || countitem(2707) > 0) {
 			mes "[Csar Alexsay III]";
-			mes "Welcome to Moscovia!";
-			mes "I am the ruler, Csar Aleksay III, of Moscovia.";
+			mes "Oh... Is this instrument... a Gooselri?";
 			next;
-			mes "[Csar Alexsay III]";
-			mes "Go back to your hometown and talk about the beauty of Moscovia! Talk about my great government to all the people of the lands!";
-			close;
-		}
-		else if (mos_whale_edq == 16) {
-			mes "[Csar Alexsay III]";
-			mes "A foreign traveler...?";
-			mes " Do you have something to tell me?";
+			mes "[Prime Minister Dmitree]";
+			mes "Actually, Csar, I believe it is";
+			mes "called a Gusli.";
 			next;
 			mes "[Csar Alexsay III]";
-			mes "If it is not important,";
-			mes "have an audience with the Prime Minister first.";
-			close;
-		}
-		else if (mos_whale_edq == 17) {
-			mes "[Csar Alexsay III]";
-			mes "Oh, are you the traveler who told me about an interesting adventure story...";
+			mes "Oh. Prime Minister, is this the";
+			mes "correct instrument from the";
+			mes "legends, then?";
 			next;
-			mes "[Csar Alexsay III]";
-			mes "Not only are you not from Moscovia, but also... you have found the moving island, which only existed in legends! I want to hear details...";
+			mes "[Prime Minister Dmitree]";
+			mes "I can't be sure, but this is";
+			mes "definitely an instrument never seen";
+			mes "in our lands before.";
 			next;
 			mes "[Csar Alexsay III]";
-			mes "Let's hear it...";
-			mes "Tell me quickly.";
-			mes "I'm anxious to know the truth about the island...";
+			mes "Hm. This is also my first time";
+			mes "seeing this kind of musical";
+			mes "instrument. So mysterious... Hey!";
+			mes "Can you play it?";
 			next;
-			select("Tell the story all the while.");
-				mes "...";
-				next;
-				mes "... ...";
-				next;
-				mes "... ... ...";
-				next;
-				mes "... ... ... ...";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "Surely, an interesting story... But it sounds so unbelievable! What do you think, Prime Minister?";
-				next;
-				mes "[Prime Minister Dmitree]";
-				mes "It doesn't sound like a lie,";
-				mes "but it's difficult to believe";
-				mes "completely. I mean, I've known";
-				mes "a whale to be huge, but...";
-				next;
-				mes "[Prime Minister Dmitree]";
-				mes "a person living there...";
-				mes "water streaming...";
-				mes "and a tree growing on it...!!!";
-				mes "Hmm...";
-				next;
+			if(select("I can play.:I can't play it.") == 1) {
 				mes "[Csar Alexsay III]";
-				mes "I agree. I have heard many kinds of mysterious adventure stories, but this sounds like an absurd story!";
+				mes "You can play it!";
+				mes "Good, play it right away!";
 				next;
+				soundeffect "mos_gusli2.wav",0;
+				emotion e_ag,0,"Csar Alexsay III#npc";
+				emotion e_ag,0,"Prime Minister Dmitree#m";
 				mes "[Csar Alexsay III]";
-				mes "Not to mention that it's happened near my nation. Unbelievable!";
+				mes "Um... What is this? Do you mock me?";
+				mes "You are so impudent... You...!";
 				next;
 				mes "[Prime Minister Dmitree]";
-				mes "But Csar... In my memory,";
-				mes "I heard that exactly, the";
-				mes "last time a story was told";
-				mes "about the mysterious moving island. But there was a musical instrument...which an old man played.";
+				mes "Csar... Calm down, please.";
+				mes "If you are quick to anger by such a";
+				mes "lowly person, it will become a";
+				mes "problem of prestige for you.";
 				next;
 				mes "[Csar Alexsay III]";
-				mes "Really? Tell me the details.";
+				mes "Agh... I agree with you.";
+				mes "You. Give a proper prize to the";
+				mes "adventurer and send them on their way.";
 				next;
 				mes "[Prime Minister Dmitree]";
-				mes "Surely, I have heard the same";
-				mes "story, as told in the legends";
-				mes "of our ancestors; about an old man who lived there.";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "Hm. There are many doubtful points. Ordinarily, I would give you a big prize, but in this case, it is difficult to believe.";
+				mes "How can I re...reward...?";
 				next;
+				emotion e_pif;
 				mes "[Csar Alexsay III]";
-				mes "Bring me something to prove";
-				mes "the existence of the whale.";
-				mes "If you do, I will give you a big prize.";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "But if you don't,";
-				mes "I will punish you for your lies! Bring this instrument that supposedly an old man has.";
+				mes "I ordered you instead Prime";
+				mes "Minister, to make this poor player";
+				mes "disappear from in front of my eyes,";
+				mes "right now.";
 				next;
 				mes "[Prime Minister Dmitree]";
-				mes "Csar... This is a foreigner...";
-				mes "No disrespect was meant to you.";
-				mes "Perhaps a little more generosity is in order?.";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "No way! If the story is not true, many other foreign travelers who pass by this land will disrespect me like this... What would you have me do?";
+				mes "You should be grateful for the";
+				mes "Csar's mercy... impudent";
+				mes "traveler...";
 				next;
 				mes "[Prime Minister Dmitree]";
-				mes "......";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "You got it, traveler?";
-				mes "You have a heavy responsibility.";
-				mes "Bring evidence of this whale island to me, to provide me with some relief. Now go.";
-				set mos_whale_edq,18;
+				mes "Even though I regard as your effort for the time so, award you. Take it and go out.";
+				getitem 12702,1;
+				getexp 50000,0;
+				set mos_whale_edq,39;
 				close;
-		}
-		else if (mos_whale_edq > 17 && mos_whale_edq < 35) {
+			}
+			mes "[Csar Alexsay III]";
+			mes "Um... That's too bad.";
+			mes "I see... Will I ever believe...";
+			next;
 			mes "[Csar Alexsay III]";
-			mes "I'm tired... I want to take a rest, so... leave.";
+			mes "Thanks for your efforts.";
+			mes "Hey, Prime Minister,";
+			mes "reward this traveler.";
+			next;
+			mes "[Prime Minister Dmitree]";
+			mes "How can I reward the traveler?";
 			next;
 			mes "[Csar Alexsay III]";
-			mes "Just think about finding the whale island...";
+			mes "I leave the matter in your hands;";
+			mes "it's up to you. I will take a";
+			mes "rest.";
+			next;
+			mes "[Prime Minister Dmitree]";
+			mes "The Csar didn't take pleasure in";
+			mes "your story, as I expected.";
+			next;
+			mes "[Prime Minister Dmitree]";
+			mes "Even though I regard as your effort for the time so, award you. Take it.";
+			getitem 12702,1;
+			getexp 70000,0;
+			set mos_whale_edq,40;
 			close;
 		}
-		else if (mos_whale_edq == 35) {
+		mes "[Csar Alexsay III]";
+		mes "What are you doing? Can you play it";
+		mes "without even holding the musical instrument???";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "Don't be impudent with me! Do it right!";
+		close;
+	} else if (mos_whale_edq == 38) {
+		mes "[Csar Alexsay III]";
+		mes "Oh you come...hum did you find";
+		mes "something to satisfy me";
+		mes "at the whale island?";
+		next;
+		if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707 || countitem(2707)) {
 			mes "[Csar Alexsay III]";
-			mes "Oh. You've come back...";
-			mes "Hm. Did you find something to bring";
-			mes "to me from the whale island?";
+			mes "Oh... Is this instrument... a Gooselri?";
 			next;
-			mes "[Csar Alexsay III]";
-			mes "Did you bring the instrument?";
-			mes "A Gooselri? Which only exists";
-			mes "in the whale island? Let's see.";
+			mes "[Prime Minister Dmitree]";
+			mes "Actually, Csar, I believe it is called a Gusli.";
 			next;
-			if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707 || countitem(2707) > 0) {
-				mes "[Csar Alexsay III]";
-				mes "Oh... Is this instrument... a Gooselri?";
-				next;
-				mes "[Prime Minister Dmitree]";
-				mes "Actually, Csar, I believe it is";
-				mes "called a Gusli.";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "Oh. Prime Minister, is this the";
-				mes "correct instrument from the";
-				mes "legends, then?";
-				next;
-				mes "[Prime Minister Dmitree]";
-				mes "I can't be sure, but this is";
-				mes "definitely an instrument never seen";
-				mes "in our lands before.";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "Hm. This is also my first time";
-				mes "seeing this kind of musical";
-				mes "instrument. So mysterious... Hey!";
-				mes "Can you play it?";
-				next;
-				if(select("I can play.:I can't play it.") == 1) {
-					mes "[Csar Alexsay III]";
-					mes "You can play it!";
-					mes "Good, play it right away!";
-					next;
-					soundeffect "mos_gusli2.wav",0;
-					emotion e_ag,0,"Csar Alexsay III#npc";
-					emotion e_ag,0,"Prime Minister Dmitree#m";
-					mes "[Csar Alexsay III]";
-					mes "Um... What is this? Do you mock me?";
-					mes "You are so impudent... You...!";
-					next;
-					mes "[Prime Minister Dmitree]";
-					mes "Csar... Calm down, please.";
-					mes "If you are quick to anger by such a";
-					mes "lowly person, it will become a";
-					mes "problem of prestige for you.";
-					next;
-					mes "[Csar Alexsay III]";
-					mes "Agh... I agree with you.";
-					mes "You. Give a proper prize to the";
-					mes "adventurer and send them on their way.";
-					next;
-					mes "[Prime Minister Dmitree]";
-					mes "How can I re...reward...?";
-					next;
-					emotion e_pif;
-					mes "[Csar Alexsay III]";
-					mes "I ordered you instead Prime";
-					mes "Minister, to make this poor player";
-					mes "disappear from in front of my eyes,";
-					mes "right now.";
-					next;
-					mes "[Prime Minister Dmitree]";
-					mes "You should be grateful for the";
-					mes "Csar's mercy... impudent";
-					mes "traveler...";
-					next;
-					mes "[Prime Minister Dmitree]";
-					mes "Even though I regard as your effort for the time so, award you. Take it and go out.";
-					getitem 12702,1;
-					getexp 50000,0;
-					set mos_whale_edq,39;
-					close;
-				}
-				mes "[Csar Alexsay III]";
-				mes "Um... That's too bad.";
-				mes "I see... Will I ever believe...";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "Thanks for your efforts.";
-				mes "Hey, Prime Minister,";
-				mes "reward this traveler.";
-				next;
-				mes "[Prime Minister Dmitree]";
-				mes "How can I reward the traveler?";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "I leave the matter in your hands;";
-				mes "it's up to you. I will take a";
-				mes "rest.";
-				next;
-				mes "[Prime Minister Dmitree]";
-				mes "The Csar didn't take pleasure in";
-				mes "your story, as I expected.";
-				next;
-				mes "[Prime Minister Dmitree]";
-				mes "Even though I regard as your effort for the time so, award you. Take it.";
-				getitem 12702,1;
-				getexp 70000,0;
-				set mos_whale_edq,40;
-				close;
-			}else{
-				mes "[Csar Alexsay III]";
-				mes "What are you doing? Can you play it";
-				mes "without even holding the musical instrument???";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "Don't be impudent with me! Do it right!";
-				close;
-			}
-		}
-		else if (mos_whale_edq == 38) {
 			mes "[Csar Alexsay III]";
-			mes "Oh you come...hum did you find";
-			mes "something to satisfy me";
-			mes "at the whale island?";
+			mes "Oh. Prime Minister, is this the";
+			mes "correct instrument from the";
+			mes "legends, then?";
+			next;
+			mes "[Prime Minister Dmitree]";
+			mes "I can't be sure, but this is";
+			mes "definitely an instrument never seen";
+			mes "in our lands before.";
 			next;
-			if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707 || countitem(2707) > 0) {
-				mes "[Csar Alexsay III]";
-				mes "Oh... Is this instrument... a Gooselri?";
-				next;
-				mes "[Prime Minister Dmitree]";
-				mes "Actually, Csar, I believe it is called a Gusli.";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "Oh. Prime Minister, is this the";
-				mes "correct instrument from the";
-				mes "legends, then?";
-				next;
-				mes "[Prime Minister Dmitree]";
-				mes "I can't be sure, but this is";
-				mes "definitely an instrument never seen";
-				mes "in our lands before.";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "Hm. This is also my first time";
-				mes "seeing this kind of musical";
-				mes "instrument. So mysterious... Hey!";
-				mes "Can you play it?";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Yes. I learned how to play it at Whale Island.";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "Oh! Oh!... You can play it!";
-				mes "Play it right away. I wonder about its sound.";
-				next;
-				soundeffect "mos_gusli1.wav",0;
-				mes "-When the music of the Gusli is";
-				mes "played, all the people in the";
-				mes "Csar's Palace fall in with the tune.-";
-				next;
-				emotion e_sob,0,"Csar Alexsay III#npc";
-				emotion e_sob,0,"Prime Minister Dmitree#m";
-				mes "[Csar Alexsay III]";
-				mes "Oh! I can't hear without tears.";
-				mes "That's a sad tune.";
-				next;
-				mes "[Prime Minister Dmitree]";
-				mes "That's right, Csar.";
-				mes "I have never heard a sad tune such as this.";
-				mes "Kh-huk. Sniff.";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "Huk... You. Give a big prize to";
-				mes "this traveler!";
-				next;
-				mes "[Prime Minister Dmitree]";
-				mes "Hukhuk... Sniff. How can I reward this?";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "I leave this matter in your hands.";
-				mes "Give a proper prize to whom has";
-				mes "Shown me a great story and";
-				mes "beautiful music.";
-				next;
-				mes "[Prime Minister Dmitree]";
-				mes "I express thanks to you on behalf";
-				mes "of our dear Csar and all the people";
-				mes "in his palace. I will reward your";
-				mes "efforts, in the name of the Csar.";
-				getitem 617,1;
-				getexp 120000,0;
-				set mos_whale_edq,41;
-				close;
-			}else{
-				mes "[Csar Alexsay III]";
-				mes "But you... Where do you keep the";
-				mes "instrument which you are to show me?";
-				next;
-				mes "[Csar Alexsay III]";
-				mes "Don't you need to be holding the instrument, in order to play it???";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "I'm sorry. I will be ready now, and try again to play it.";
-				close;
-			}
-		}
-		else if (mos_whale_edq == 39) {
 			mes "[Csar Alexsay III]";
-			mes "What happen... If you have special things go out.";
-			close;
-		}
-		else if (mos_whale_edq == 40) {
+			mes "Hm. This is also my first time";
+			mes "seeing this kind of musical";
+			mes "instrument. So mysterious... Hey!";
+			mes "Can you play it?";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Yes. I learned how to play it at Whale Island.";
+			next;
 			mes "[Csar Alexsay III]";
-			mes "Um... You are a traveler as I saw.";
-			mes "If you have special things, don't interfere my rest.";
-			close;
-		}
-		else if (mos_whale_edq == 41) {
+			mes "Oh! Oh!... You can play it!";
+			mes "Play it right away. I wonder about its sound.";
+			next;
+			soundeffect "mos_gusli1.wav",0;
+			mes "-When the music of the Gusli is";
+			mes "played, all the people in the";
+			mes "Csar's Palace fall in with the tune.-";
+			next;
+			emotion e_sob,0,"Csar Alexsay III#npc";
+			emotion e_sob,0,"Prime Minister Dmitree#m";
 			mes "[Csar Alexsay III]";
-			mes "Oh... You. ~";
-			mes "Nice to see you again.";
-			mes "I want for you to sometimes stop by here and play some music for me. ~";
-			close;
-		}
-		else{
+			mes "Oh! I can't hear without tears.";
+			mes "That's a sad tune.";
+			next;
+			mes "[Prime Minister Dmitree]";
+			mes "That's right, Csar.";
+			mes "I have never heard a sad tune such as this.";
+			mes "Kh-huk. Sniff.";
+			next;
 			mes "[Csar Alexsay III]";
-			mes "Welcome to Moscovia,";
-			mes "I am Csar Alexsay the Third.";
+			mes "Huk... You. Give a big prize to";
+			mes "this traveler!";
+			next;
+			mes "[Prime Minister Dmitree]";
+			mes "Hukhuk... Sniff. How can I reward this?";
 			next;
 			mes "[Csar Alexsay III]";
-			mes "Go back to your hometown and tell everyone about the beauty of Moscovia,";
-			mes "and my great government.";
+			mes "I leave this matter in your hands.";
+			mes "Give a proper prize to whom has";
+			mes "Shown me a great story and";
+			mes "beautiful music.";
+			next;
+			mes "[Prime Minister Dmitree]";
+			mes "I express thanks to you on behalf";
+			mes "of our dear Csar and all the people";
+			mes "in his palace. I will reward your";
+			mes "efforts, in the name of the Csar.";
+			getitem 617,1;
+			getexp 120000,0;
+			set mos_whale_edq,41;
 			close;
 		}
+		mes "[Csar Alexsay III]";
+		mes "But you... Where do you keep the";
+		mes "instrument which you are to show me?";
+		next;
+		mes "[Csar Alexsay III]";
+		mes "Don't you need to be holding the instrument, in order to play it???";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "I'm sorry. I will be ready now, and try again to play it.";
+		close;
+	} else if (mos_whale_edq == 39) {
+		mes "[Csar Alexsay III]";
+		mes "What happen... If you have special things go out.";
+		close;
+	} else if (mos_whale_edq == 40) {
+		mes "[Csar Alexsay III]";
+		mes "Um... You are a traveler as I saw.";
+		mes "If you have special things, don't interfere my rest.";
+		close;
+	} else if (mos_whale_edq == 41) {
+		mes "[Csar Alexsay III]";
+		mes "Oh... You. ~";
+		mes "Nice to see you again.";
+		mes "I want for you to sometimes stop by here and play some music for me. ~";
+		close;
 	}
+	mes "[Csar Alexsay III]";
+	mes "Welcome to Moscovia,";
+	mes "I am Csar Alexsay the Third.";
+	next;
+	mes "[Csar Alexsay III]";
+	mes "Go back to your hometown and tell everyone about the beauty of Moscovia,";
+	mes "and my great government.";
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -4738,8 +2370,7 @@ mosk_in,127,89,3	script	Prime Minister Dmitree#m	967,{
 		mes "from suspicion... do everything you";
 		mes "can to prove your innocence.";
 		close;
-	}
-	else if (mos_nowinter == 14) {
+	} else if (mos_nowinter == 14) {
 		mes "[Prime Minister Dmitree]";
 		mes "You have just cleared your name,";
 		mes "but... we don't trust you wholly yet.";
@@ -4749,8 +2380,7 @@ mosk_in,127,89,3	script	Prime Minister Dmitree#m	967,{
 		mes "if you succeed in taking hold of";
 		mes "the summer... I might be able to.";
 		close;
-	}
-	else if (mos_nowinter == 20) {
+	} else if (mos_nowinter == 20) {
 		mes "[Prime Minister Dmitree]";
 		mes "We know that you mean well.";
 		mes "But we can't fully trust you,";
@@ -4779,92 +2409,76 @@ mosk_in,127,89,3	script	Prime Minister Dmitree#m	967,{
 		mes "Go and announce it to him.";
 		close;
 	}
-	else{
-		if (mos_whale_edq < 16) {
-			mes "[Prime Minister Dmitree]";
-			mes "You are a foreign traveler. This is the Moscovia Palace, home of Csar Aleksay the Third. Extending your every courtesy here... is not bad manners.";
-			close;
-		}
-		else if (mos_whale_edq == 16) {
+	if (mos_whale_edq < 16) {
+		mes "[Prime Minister Dmitree]";
+		mes "You are a foreign traveler. This is the Moscovia Palace, home of Csar Aleksay the Third. Extending your every courtesy here... is not bad manners.";
+		close;
+	} else if (mos_whale_edq == 16) {
+		mes "[Prime Minister Dmitree]";
+		mes "Traveler, why have you come to the Csar's Palace?";
+		next;
+		if(select("Just to look around.:To see the dear Csar.") == 1) {
 			mes "[Prime Minister Dmitree]";
-			mes "Traveler, why have you come to the Csar's Palace?";
+			mes "If so... look around with caution. Do not bother the Csar.";
 			next;
-			if(select("Just to look around.:To see the dear Csar.") == 1) {
-				mes "[Prime Minister Dmitree]";
-				mes "If so... look around with caution. Do not bother the Csar.";
-				next;
-				mes "[Prime Minister Dmitree]";
-				mes "Moscovia welcomes all travelers such as yourself!";
-				next;
-				mes "[Prime Minister Dmitree]";
-				mes "Marvelously, our dear Csar likes it very much when interesting stories are often told to him.";
-				close;
-			}
 			mes "[Prime Minister Dmitree]";
-			mes "Did you come to see our dear Csar? If so, tell me your business with him in advance.";
+			mes "Moscovia welcomes all travelers such as yourself!";
 			next;
-			if(select("I'd like to say hello.:I have an adventure story for him.") == 1) {
-				mes "[Prime Minister Dmitree]";
-				mes "I will tell him directly about your business. You don't need to worry yourself with the Csar.";
-				close;
-			}
 			mes "[Prime Minister Dmitree]";
-			mes "I wonder what sort of things have happened to you... The Csar will be very pleased to hear your stories.";
-			next;
-			mes "[Prime Minister Dmitree]";
-			mes "I will admit you. If our dear Csar is satisfied with your story, he will give you a big prize.";
-			set mos_whale_edq,17;
-			close;
-		}
-		else if (mos_whale_edq == 17) {
-			mes "[Prime Minister Dmitree]";
-			mes "I already announced you,";
-			mes "so go see him and speak to him directly.";
-			close;
-		}
-		else if (mos_whale_edq > 17 && mos_whale_edq < 35) {
-			mes "[Prime Minister Dmitree]";
-			mes "Now, our dear Csar needs a rest.";
-			mes "You should do your duty and go find the whale island.";
-			close;
-		}
-		else if (mos_whale_edq == 35) {
-			mes "[Prime Minister Dmitree]";
-			mes "Ah! You've come back.";
-			mes "I will request for you to see him immediately.";
+			mes "Marvelously, our dear Csar likes it very much when interesting stories are often told to him.";
 			close;
 		}
-		else if (mos_whale_edq == 38) {
-			mes "[Prime Minister Dmitree]";
-			mes "Ah! You've come back.";
-			mes "I will request for you to see him immediately.";
-			close;
-		}
-		else if (mos_whale_edq == 39) {
-			mes "[Prime Minister Dmitree]";
-			mes "I don't want to hear your terrible ";
-			mes "performance anymore so, go out away.";
-			close;
-		}
-		else if (mos_whale_edq == 40) {
-			mes "[Prime Minister Dmitree]";
-			mes "What's up? Dear Chare is taking a rest.";
-			mes "If you have nothing special, go out.";
-			close;
-		}
-		else if (mos_whale_edq == 41) {
-			mes "[Prime Minister Dmitree]";
-			mes "Your Gusli performance was so touching.";
-			mes "Unforgettable! Whenever you are here, please allow us to hear that tune again.";
-			close;
-		}else{
+		mes "[Prime Minister Dmitree]";
+		mes "Did you come to see our dear Csar? If so, tell me your business with him in advance.";
+		next;
+		if(select("I'd like to say hello.:I have an adventure story for him.") == 1) {
 			mes "[Prime Minister Dmitree]";
-			mes "You are a foreign traveler. This is a palace";
-			mes "which lives Alexei the Third.";
-			mes "Extend you every courtesy don't not bad manner.";
+			mes "I will tell him directly about your business. You don't need to worry yourself with the Csar.";
 			close;
 		}
+		mes "[Prime Minister Dmitree]";
+		mes "I wonder what sort of things have happened to you... The Csar will be very pleased to hear your stories.";
+		next;
+		mes "[Prime Minister Dmitree]";
+		mes "I will admit you. If our dear Csar is satisfied with your story, he will give you a big prize.";
+		set mos_whale_edq,17;
+		close;
+	} else if (mos_whale_edq == 17) {
+		mes "[Prime Minister Dmitree]";
+		mes "I already announced you,";
+		mes "so go see him and speak to him directly.";
+		close;
+	} else if (mos_whale_edq > 17 && mos_whale_edq < 35) {
+		mes "[Prime Minister Dmitree]";
+		mes "Now, our dear Csar needs a rest.";
+		mes "You should do your duty and go find the whale island.";
+		close;
+	} else if (mos_whale_edq == 35 || mos_whale_edq == 38) {
+		mes "[Prime Minister Dmitree]";
+		mes "Ah! You've come back.";
+		mes "I will request for you to see him immediately.";
+		close;
+	} else if (mos_whale_edq == 39) {
+		mes "[Prime Minister Dmitree]";
+		mes "I don't want to hear your terrible ";
+		mes "performance anymore so, go out away.";
+		close;
+	} else if (mos_whale_edq == 40) {
+		mes "[Prime Minister Dmitree]";
+		mes "What's up? Dear Chare is taking a rest.";
+		mes "If you have nothing special, go out.";
+		close;
+	} else if (mos_whale_edq == 41) {
+		mes "[Prime Minister Dmitree]";
+		mes "Your Gusli performance was so touching.";
+		mes "Unforgettable! Whenever you are here, please allow us to hear that tune again.";
+		close;
 	}
+	mes "[Prime Minister Dmitree]";
+	mes "You are a foreign traveler. This is a palace";
+	mes "which lives Alexei the Third.";
+	mes "Extend you every courtesy don't not bad manner.";
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -4872,54 +2486,51 @@ mosk_in,127,89,3	script	Prime Minister Dmitree#m	967,{
 //----------------------------------------------------------------------------
 moscovia,136,46,4	script	Find#ship	844,4,4,{
 	end;
-	
+
 OnTouch:
-	if (mos_whale_edq > 34) {
-		mes "-Watching the sea from the docks,";
-		mes "it suddenly dawns upon you that you";
-		mes "have memories from Whale Island.-";
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Stop by the whale island?";
-		next;
-		if(select("Go to Whale Island.:Stay put.") == 1) {
-			if (getequipid(EQI_ACC_L) == 2707 || getequipid(EQI_ACC_R) == 2707) {
-				soundeffect "mos_gusli2.wav",0;
-				mes "-Slowly, your hands are on the";
-				mes "Gusli, and the playing starts...";
-				mes "reminding you of the melody which";
-				mes "the aged stranger had played...-";
-				next;
-				mes "[Village resident]";
-				mes "So...something is rising from the sea!!!";
-				next;
-				mes "[Village Youth]";
-				mes "What...What is that...??";
-				next;
-				mes "[Mr. Ibanoff]";
-				mes "Ohohoh!... That's the whale";
-				mes "island...!!! Someday, I hope to go there! Hahaha.";
-				next;
-				warp "mosk_fild01",95,93;
-			}else{
-				mes "["+strcharinfo(0)+"]";
-				mes "Oh my goodness... Slipped right out";
-				mes "of my mind... to forget equipping the Gusli.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "The aged stranger said that when I";
-				mes "want to go to Whale Island again, I";
-				mes "should play the Gusli from this place...";
-				close;
-			}
+	if (mos_whale_edq < 35) end;
+	mes "-Watching the sea from the docks,";
+	mes "it suddenly dawns upon you that you";
+	mes "have memories from Whale Island.-";
+	next;
+	mes "["+strcharinfo(0)+"]";
+	mes "Stop by the whale island?";
+	next;
+	if(select("Go to Whale Island.:Stay put.") == 1) {
+		if (getequipid(EQI_ACC_L) == 2707 || getequipid(EQI_ACC_R) == 2707) {
+			soundeffect "mos_gusli2.wav",0;
+			mes "-Slowly, your hands are on the";
+			mes "Gusli, and the playing starts...";
+			mes "reminding you of the melody which";
+			mes "the aged stranger had played...-";
+			next;
+			mes "[Village resident]";
+			mes "So...something is rising from the sea!!!";
+			next;
+			mes "[Village Youth]";
+			mes "What...What is that...??";
+			next;
+			mes "[Mr. Ibanoff]";
+			mes "Ohohoh!... That's the whale";
+			mes "island...!!! Someday, I hope to go there! Hahaha.";
+			next;
+			warp "mosk_fild01",95,93;
+		}else{
+			mes "["+strcharinfo(0)+"]";
+			mes "Oh my goodness... Slipped right out";
+			mes "of my mind... to forget equipping the Gusli.";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "The aged stranger said that when I";
+			mes "want to go to Whale Island again, I";
+			mes "should play the Gusli from this place...";
+			close;
 		}
-		mes "["+strcharinfo(0)+"]";
-		mes "I can go some other time.";
-		mes "I will do other work now.";
-		close;
-	}else{
-		end;
 	}
+	mes "["+strcharinfo(0)+"]";
+	mes "I can go some other time.";
+	mes "I will do other work now.";
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -4949,7 +2560,7 @@ OnDisable:
 	end;
 
 OnTouch:
-	if (mos_whale_edq == 12) {
+	if (mos_whale_edq != 12) end;
 		mes "seeewaaaaaaaaaaa";
 		next;
 		mes "[Mr. Ibanoff]";
@@ -4969,173 +2580,68 @@ OnTouch:
 		close2;
 		warp "mosk_fild01",95,93;
 		end;
-	}else{
-		end;
-	}
-	end;
 
 OnTimer300000:
 	donpcevent "#findship::OnDisable";
 	end;
 }
 
-mosk_ship,2,2,4	script	Baehideun1#ship	-1,{
+-	script	Baehideun#main	-1,{
 OnInit:
-	disablenpc "Baehideun1#ship";
+	if (compare(strnpcinfo(0),"main")) end;
+	disablenpc strnpcinfo(0);
 	stopnpctimer;
 	end;
 	
 OnEnable:
-	enablenpc "Baehideun1#ship";
-	monster "mosk_ship",89,112,"Sea Monster",1425,1,"Baehideun1#ship::OnMyMobDead";
-	monster "mosk_ship",85,110,"Sea Monster",1425,1,"Baehideun1#ship::OnMyMobDead";
+	enablenpc strnpcinfo(0);
+	set .@c,charat(strnpcinfo(0),9);
+	switch (.@c) {
+		Case 1: setarray .@m, 89,112,1425,85,110,1425; break;
+		Case 2: setarray .@m, 89,112,1425,80,110,1426,83,114,1426,85,110,1425; break;
+		Case 3: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
+		Case 4: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
+	}
+	for (set .@i, 0; .@i < getarraysize(.@m); set .@i, .@i + 3)
+		monster "mosk_ship",.@m[.@i],.@m[.@i+1],"Sea Monster",.@m[.@i+2],1,strnpcinfo(0)+"::OnMyMobDead";
 	initnpctimer;
 	end;
 
 OnDisable:
 	set $@mos1_edq,0;
 	stopnpctimer;
-	disablenpc "Baehideun1#ship";
+	disablenpc strnpcinfo(0);
 	end;
 
 OnMyMobDead:
-	if (mobcount("mosk_ship","Baehideun1#ship::OnMyMobDead") < 1) {
+	if (!mobcount("mosk_ship",strnpcinfo(0)+"::OnMyMobDead")) {
 		set $@mos1_edq,0;
 		mes "[Mr. Ibanoff]";
 		mes "Now that all the monsters are gone,";
 		mes "we can start sailing again";
 		mes "normally.";
-		donpcevent "Baehideun1#ship::OnDisable";
-		close;
-	}
-	end;
-
-OnTimer300000:
-	killmonster "mosk_ship","Baehideun1#ship::OnMyMobDead";
-	set $@mos1_edq,0;
-	donpcevent "Baehideun1#ship::OnDisable";
-	end;
-}
-
-mosk_ship,3,3,4	script	Baehideun2#ship	-1,{
-OnInit:
-	disablenpc "Baehideun2#ship";
-	stopnpctimer;
-	end;
-
-OnEnable:
-	enablenpc "Baehideun2#ship";
-	monster "mosk_ship",89,112,"Sea Monster",1425,1,"Baehideun2#ship::OnMyMobDead";
-	monster "mosk_ship",80,110,"Sea Monster",1426,1,"Baehideun2#ship::OnMyMobDead";
-	monster "mosk_ship",83,114,"Sea Monster",1426,1,"Baehideun2#ship::OnMyMobDead";
-	monster "mosk_ship",85,110,"Sea Monster",1425,1,"Baehideun2#ship::OnMyMobDead";
-	initnpctimer;
-	end;
-
-OnDisable:
-	set $@mos1_edq,0;
-	stopnpctimer;
-	disablenpc "Baehideun2#ship";
-	end;
-
-OnMyMobDead:
-	if (mobcount("mosk_ship","Baehideun2#ship::OnMyMobDead") < 1) {
-		set $@mos1_edq,0;
-		mes "[Mr. Ibanoff]";
-		mes "Now that all the monsters are gone,";
-		mes "we can start sailing again";
-		mes "normally.";
-		donpcevent "Baehideun2#ship::OnDisable";
-		close;
-	}
-	end;
-
-OnTimer300000:
-	killmonster "mosk_ship","Baehideun2#ship::OnMyMobDead";
-	set $@mos1_edq,0;
-	donpcevent "Baehideun2#ship::OnDisable";
-	end;
-}
-
-mosk_ship,5,5,4	script	Baehideun3#ship	-1,{
-OnInit:
-	disablenpc "Baehideun3#ship";
-	stopnpctimer;
-	end;
-
-OnEnable:
-	enablenpc "Baehideun3#ship";
-	monster "mosk_ship",85,111,"Sea Monster",1451,1,"Baehideun3#ship::OnMyMobDead";
-	monster "mosk_ship",89,112,"Sea Monster",1543,1,"Baehideun3#ship::OnMyMobDead";
-	monster "mosk_ship",90,106,"Sea Monster",1543,1,"Baehideun3#ship::OnMyMobDead";
-	initnpctimer;
-	end;
-
-OnDisable:
-	set $@mos1_edq,0;
-	stopnpctimer;
-	disablenpc "Baehideun3#ship";
-	end;
-
-OnMyMobDead:
-	if (mobcount("mosk_ship","Baehideun3#ship::OnMyMobDead") < 1) {
-		set $@mos1_edq,0;
-		mes "[Mr. Ibanoff]";
-		mes "Now that all the monsters are gone,";
-		mes "we can start sailing again";
-		mes "normally.";
-		set mos_whale_edq,11;
-		donpcevent "Baehideun3#ship::OnDisable";
-		close;
-	}
-	end;
-
-OnTimer300000:
-	killmonster "mosk_ship","Baehideun3#ship::OnMyMobDead";
-	set $@mos1_edq,0;
-	donpcevent "Baehideun3#ship::OnDisable";
-	end;
-}
-
-mosk_ship,15,15,4	script	Baehideun4#ship	-1,{
-OnInit:
-	disablenpc "Baehideun4#ship";
-	stopnpctimer;
-	end;
-
-OnEnable:
-	enablenpc "Baehideun4#ship";
-	monster "mosk_ship",85,111,"Sea Monster",1451,1,"Baehideun4#ship::OnMyMobDead";
-	monster "mosk_ship",89,112,"Sea Monster",1543,1,"Baehideun4#ship::OnMyMobDead";
-	monster "mosk_ship",90,106,"Sea Monster",1543,1,"Baehideun4#ship::OnMyMobDead";
-	initnpctimer;
-	end;
-
-OnDisable:
-	set $@mos1_edq,0;
-	stopnpctimer;
-	disablenpc "Baehideun4#ship";
-	end;
-
-OnMyMobDead:
-	if (mobcount("mosk_ship","Baehideun4#ship::OnMyMobDead") < 1) {
-		set $@mos1_edq,0;
-		mes "[Mr. Ibanoff]";
-		mes "Now that all the monsters are gone,";
-		mes "we can start sailing again";
-		mes "normally.";
-		set mos_whale_edq,26;
-		donpcevent "Baehideun4#ship::OnDisable";
+		set .@c,charat(strnpcinfo(0),9);
+		switch (.@c) {
+			Case 1: break;
+			Case 2: break;
+			Case 3: set mos_whale_edq,11; break;
+			Case 4: set mos_whale_edq,26; break;
+		}
+		donpcevent strnpcinfo(0)+"::OnDisable";
 		close;
 	}
 	end;
 
 OnTimer300000:
-	killmonster "mosk_ship","Baehideun4#ship::OnMyMobDead";
+	killmonster "mosk_ship",strnpcinfo(0)+"::OnMyMobDead";
 	set $@mos1_edq,0;
-	donpcevent "Baehideun4#ship::OnDisable";
+	donpcevent strnpcinfo(0)+"::OnDisable";
 	end;
 }
+mosk_ship,2,2,4	duplicate(Baehideun#main)	Baehideun1#ship	-1
+mosk_ship,3,3,4	duplicate(Baehideun#main)	Baehideun2#ship	-1
+mosk_ship,5,5,4	duplicate(Baehideun#main)	Baehideun3#ship	-1
+mosk_ship,15,15,4	duplicate(Baehideun#main)	Baehideun4#ship	-1
 
 //============================================================================
 // Help Mikhail
@@ -5144,94 +2650,95 @@ OnTimer300000:
 //----------------------------------------------------------------------------
 // Gallina - Starting Point
 //----------------------------------------------------------------------------
-mosk_in,144,279,5	script	Gallina#mos	959,{
-	if (mos_swan == 0) {
-		mes "[Gallina]";
-		mes "Oh, where the heck is he?";
-		mes "I'll teach him a lesson.";
-		mes "He's timid like Dad.";
-		next;
-		mes "[Anna]";
-		mes "Mikhail, he's a coward, a crybaby.";
-		mes "Mikhail, he's a coward, a crybaby.";
-		next;
-		mes "[Gallina]";
-		mes "It's because you didn't look after your brother. So you clean the house, Anna?";
-		next;
-		emotion e_sob,0,"Anna#mos";
-		mes "[Anna]";
-		mes "Oh, my................";
-		next;
-		if(select("Talk to her.:Just pass by her") == 1) {
-			mes "["+strcharinfo(0)+"]";
-			mes "Hello, there?";
-			next;
-			mes "[Gallina]";
-			mes "Oh, God!";
-			mes "I didn't see you there. Sorry!";
-			mes "You want to buy a hotcake, don't you?";
-			mes "I'm sorry but we're not ready to open the store..";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "No, that's ok.";
-			mes "Is there something that I can help with? What's the matter?";
-			next;
-			mes "[Gallina]";
-			mes "Oh, well...";
-			mes "My son, Mikhail broke our Matrushka while I was away from home.";
-			mes "He's afraid that I would punish him. So he ran away.";
-			next;
-			mes "[Gallina]";
-			mes "How timid the boy is!";
-			mes "I doubt that he'd be able to be a great general in the future";
-			next;
-			mes "[Gallina]";
-			mes "He used to come home at this time.";
-			mes "I'm worried that something bad has happened to him.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "You look anxious. I'd like to help you to find your son.";
-			next;
-			mes "[Gallina]";
-			mes "Did you say I'm anxious?";
-			mes "I'm just anxious for him to get home.";
-			mes "...So I can punish him for what he did.";
-			next;
-			mes "[Gallina]";
-			mes "But it's not good that I refuse your kindness";
-			mes "Will you find Mikhail for me?";
-			next;
-			if(select("I was not serious.:Yes, I will!") == 1) {
-				mes "[Gallina]";
-				mes "You meanie! I'm not in the mood for jokes.";
-				close;
-			}
-			mes "[Gallina]";
-			mes "Oh, God, You're so kind";
-			mes "Mikhail is such a timid boy. I guess he didn't leave this village.";
-			mes "Please bring him to me, then~";
-			set mos_swan,1;
-			close;
-		}
+function	script	F_MOS_1	{
+	mes "[Gallina]";
+	mes "Oh, where the heck is he?";
+	mes "I'll teach him a lesson.";
+	mes "He's timid like Dad.";
+	next;
+	mes "[Anna]";
+	mes "Mikhail, he's a coward, a crybaby.";
+	mes "Mikhail, he's a coward, a crybaby.";
+	next;
+	mes "[Gallina]";
+	mes "It's because you didn't look after your brother. So you clean the house, Anna?";
+	next;
+	emotion e_sob,0,"Anna#mos";
+	mes "[Anna]";
+	mes "Oh, my................";
+	next;
+	if(select("Talk to her.:Just pass by her") == 2) {
 		mes "[Gallina]";
 		mes "I'm worried that he's making trouble somewhere...";
 		close;
 	}
-	else if (mos_swan == 1) {
+	mes "["+strcharinfo(0)+"]";
+	mes "Hello, there?";
+	next;
+	mes "[Gallina]";
+	mes "Oh, God!";
+	mes "I didn't see you there. Sorry!";
+	mes "You want to buy a hotcake, don't you?";
+	mes "I'm sorry but we're not ready to open the store..";
+	next;
+	mes "["+strcharinfo(0)+"]";
+	mes "No, that's ok.";
+	mes "Is there something that I can help with? What's the matter?";
+	next;
+	mes "[Gallina]";
+	mes "Oh, well...";
+	mes "My son, Mikhail broke our Matrushka while I was away from home.";
+	mes "He's afraid that I would punish him. So he ran away.";
+	next;
+	mes "[Gallina]";
+	mes "How timid the boy is!";
+	mes "I doubt that he'd be able to be a great general in the future";
+	next;
+	mes "[Gallina]";
+	mes "He used to come home at this time.";
+	mes "I'm worried that something bad has happened to him.";
+	next;
+	mes "["+strcharinfo(0)+"]";
+	mes "You look anxious. I'd like to help you to find your son.";
+	next;
+	mes "[Gallina]";
+	mes "Did you say I'm anxious?";
+	mes "I'm just anxious for him to get home.";
+	mes "...So I can punish him for what he did.";
+	next;
+	mes "[Gallina]";
+	mes "But it's not good that I refuse your kindness";
+	mes "Will you find Mikhail for me?";
+	next;
+	if(select("I was not serious.:Yes, I will!") == 1) {
+		mes "[Gallina]";
+		mes "You meanie! I'm not in the mood for jokes.";
+		close;
+	}
+	mes "[Gallina]";
+	mes "Oh, God, You're so kind";
+	mes "Mikhail is such a timid boy. I guess he didn't leave this village.";
+	mes "Please bring him to me, then~";
+	set mos_swan,1;
+	close;
+}
+
+mosk_in,144,279,5	script	Gallina#mos	959,{
+	if (!mos_swan) {
+		callfunc("F_MOS_1");
+	} else if (mos_swan == 1) {
 		mes "[Gallina]";
 		mes "Mikhail, my timid son must still be in this village.";
 		mes "I'm sorry if he's shy and timid like his father.";
 		close;
-	}
-	else if (mos_swan > 1 && mos_swan < 25) {
+	} else if (mos_swan > 1 && mos_swan < 25) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Mikhail hasn't come yet?";
 		next;
 		mes "[Gallina]";
 		mes "No, where on earth is he?";
 		close;
-	}
-	else if (mos_swan == 25) {
+	} else if (mos_swan == 25) {
 		mes "[Gallina]";
 		mes "He came back with my Matrushka roughly pasted together and just left...";
 		next;
@@ -5269,248 +2776,168 @@ mosk_in,144,279,5	script	Gallina#mos	959,{
 		set mos_swan,100;
 		getexp 100000,0;
 		close;
-	}else{
-		mes "[Gallina]";
-		mes "I'm always trying to prepare a new dish.";
-		mes "What do you think of 'the most spicy chili hotcake in the world'?";
-		mes "I think that will be great!";
-		close;
 	}
+	mes "[Gallina]";
+	mes "I'm always trying to prepare a new dish.";
+	mes "What do you think of 'the most spicy chili hotcake in the world'?";
+	mes "I think that will be great!";
+	close;
 }
 
 //----------------------------------------------------------------------------
 // Anna - Sister
 //----------------------------------------------------------------------------
 mosk_in,148,274,1	script	Anna#mos	958,{
-	if (mos_swan == 0) {
-		mes "[Gallina]";
-		mes "Oh, where the heck is he?";
-		mes "I'll teach him a lesson.";
-		mes "He's timid like Dad.";
-		next;
-		mes "[Anna]";
-		mes "Mikhail, he's a coward, a crybaby.";
-		mes "Mikhail, he's a coward, a crybaby.";
-		next;
-		mes "[Gallina]";
-		mes "It's because you didn't look after your brother. So you clean the house, Anna?";
-		next;
-		emotion e_sob;
-		mes "[Anna]";
-		mes "Oh, my................";
-		next;
-		if(select("Talk to her.:Just pass by her") == 1) {
-			mes "["+strcharinfo(0)+"]";
-			mes "Hello, there?";
-			next;
-			mes "[Gallina]";
-			mes "Oh, God!";
-			mes "I didn't see you there. Sorry!";
-			mes "You want to buy a hotcake, don't you?";
-			mes "I'm sorry but we're not ready to open the store..";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "No, that's ok.";
-			mes "Is there something that I can help with? What's the matter?";
-			next;
-			mes "[Gallina]";
-			mes "Oh, well...";
-			mes "My son, Mikhail broke our Matrushka while I was away from home.";
-			mes "He's afraid that I would punish him. So he ran away.";
-			next;
-			mes "[Gallina]";
-			mes "How timid the boy is!";
-			mes "I doubt that he'd be able to be a great general in the future";
-			next;
-			mes "[Gallina]";
-			mes "He used to come home at this time.";
-			mes "I'm worried that something bad has happened to him.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "You look anxious. I'd like to help you to find your son.";
-			next;
-			mes "[Gallina]";
-			mes "Did you say I'm anxious?";
-			mes "I'm just anxious for him to get home.";
-			mes "...So I can punish him for what he did.";
-			next;
-			mes "[Gallina]";
-			mes "But it's not good that I refuse your kindness";
-			mes "Will you find Mikhail for me?";
-			next;
-			if(select("I was not serious.:Yes, I will!") == 1) {
-				mes "[Gallina]";
-				mes "You meanie! I'm not in the mood for jokes.";
-				close;
-			}
-			mes "[Gallina]";
-			mes "Oh, God, You're so kind";
-			mes "Mikhail is such a timid boy. I guess he didn't leave this village.";
-			mes "Please bring him to me, then~";
-			set mos_swan,1;
-			close;
-		}
-		mes "[Gallina]";
-		mes "I'm worried that he's making trouble somewhere...";
-		close;
-	}
-	else if (mos_swan == 1) {
+	if (!mos_swan) {
+		callfunc("F_MOS_1");
+	} else if (mos_swan == 1) {
 		mes "[Anna]";
 		mes "Mikhail, he's a coward, a crybaby.";
 		mes "Mikhail, he's a coward, a crybaby.";
 		close;
-	}
-	else if (mos_swan == 2) {
+	} else if (mos_swan == 2) {
 		mes "[Anna]";
 		mes "Why are you here?";
 		next;
 		while(1) {
 			switch(select("About where Mikhail might be hiding:About their relationship:About the situation:Ask her about other things:End the conversation")) {
-			case 1:
-				mes "["+strcharinfo(0)+"]";
-				mes "Where is Mikhail?";
-				mes "Do you know where he is?";
-				next;
-				emotion 39;
-				mes "[Anna]";
-				mes "If I had known that, I would have already found him, you fool.";
-				next;
-				emotion 4,1;
-				mes "["+strcharinfo(0)+"]";
-				mes "Hahaha, you're right.";
-				next;
-				break;
-			case 2:
-				mes "["+strcharinfo(0)+"]";
-				mes "How's your relationship with your brother?";
-				next;
-				mes "[Anna]";
-				mes "Mikhail always stays behind me and asks me to read books!";
-				mes "And he cries too much.";
-				mes "It annoys me.";
-				mes "And he only wants to play with me. That's why he has no friends.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "You seem very courageous.";
-				mes "I can understand why your mother worries about him.";
-				next;
-				break;
-			case 3:
-				mes "["+strcharinfo(0)+"]";
-				mes "What were you doing when Mikhail broke your mother's Matrushka?";
-				next;
-				mes "[Anna]";
-				mes "I was there.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Oh were you?";
-				next;
-				mes "[Anna]";
-				mes "When my parents were out, they asked me to take care of Mikhail.";
-				mes "I didn't want to do that but I'm his sister so I was reading a book next to him.";
-				next;
-				mes "[Anna]";
-				mes "He began to tease me to read a book for him and later, he annoyed me saying that he's hungry!";
-				next;
-				mes "[Anna]";
-				mes "I was so bothered with him and I pretended not to hear him and kept reading. I guess it made him mad and so he broke the Matrushka.";
-				next;
-				mes "[Anna]";
-				mes "He made trouble and began to cry!";
-				mes "He's such a timid boy...";
-				mes "(giggling)";
-				next;
-				mes "[Anna]";
-				mes "And then I told him that we should glue the pieces together before Mom came back, so Mikhail went to get ^3131FFpaste^000000 but he hasn't come back yet.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Where can you get it?";
-				mes "Why didn't you go with him?";
-				next;
-				mes "[Anna]";
-				mes "Do you think we kids know that?";
-				mes "He broke it and should get the thing by himself!";
-				mes "And Mom said that he should do his work for himself to become a great general.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Don't you have any idea of where he might be?";
-				next;
-				mes "[Anna]";
-				mes "No.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Is there anyone who is close to him?";
-				next;
-				emotion 32;
-				mes "[Anna]";
-				mes "(giggle) He's a fool and has no friends.";
-				mes "But among our villagers, the lady of ^3131FFInn 'Sticky Herb Tree'^000000 has held Mikhail dear.";
-				next;
-				mes "[Anna]";
-				mes "I have no idea anymore.";
-				next;
-				mes "- Anna sticks her tongue out. -";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "It's the only clue, I guess I'll go to ^3131FFInn 'Sticky Herb Tree'^000000?";
-				if (mos_swan == 2) {
-					set mos_swan,3;
-				}
-				next;
-				break;
-			case 4:
-				mes "["+strcharinfo(0)+"]";
-				mes "What am I going to ask her?";
-				next;
-				input .@AnnaInfo$;
-				mes "["+strcharinfo(0)+"]";
-				mes "Anna,";
-				mes ""+.@AnnaInfo$+"?";
-				mes "Do you know what this is?";
-				next;
-				if (.@AnnaInfo$ == "Gravity") {
+				case 1:
+					mes "["+strcharinfo(0)+"]";
+					mes "Where is Mikhail?";
+					mes "Do you know where he is?";
+					next;
+					emotion 39;
 					mes "[Anna]";
-					mes "I know that they have a game called RAGNAROK Online 2... and they like... what am I saying now... right?";
+					mes "If I had known that, I would have already found him, you fool.";
+					next;
+					emotion 4,1;
+					mes "["+strcharinfo(0)+"]";
+					mes "Hahaha, you're right.";
+					next;
+					break;
+				case 2:
+					mes "["+strcharinfo(0)+"]";
+					mes "How's your relationship with your brother?";
 					next;
-				}
-				else if (.@AnnaInfo$ == "Gallina") {
 					mes "[Anna]";
-					mes "Mom's hotcakes are so delicious! Oh, it's sweet flavor!";
-					mes "Everyone in this village likes Mom's hotcakes. Hehe.";
+					mes "Mikhail always stays behind me and asks me to read books!";
+					mes "And he cries too much.";
+					mes "It annoys me.";
+					mes "And he only wants to play with me. That's why he has no friends.";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "You seem very courageous.";
+					mes "I can understand why your mother worries about him.";
+					next;
+					break;
+				case 3:
+					mes "["+strcharinfo(0)+"]";
+					mes "What were you doing when Mikhail broke your mother's Matrushka?";
 					next;
-				}
-				else if (.@AnnaInfo$ == "Mikhail") {
 					mes "[Anna]";
-					mes "Mikhail is a timid fool!";
+					mes "I was there.";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "Oh were you?";
 					next;
-				}
-				else {
 					mes "[Anna]";
-					mes "I have no idea about that thing.";
+					mes "When my parents were out, they asked me to take care of Mikhail.";
+					mes "I didn't want to do that but I'm his sister so I was reading a book next to him.";
 					next;
-				}
-				break;
-			case 5:
-				mes "[Anna]";;
-				mes "Hmm ~ ~ ~ ~ ";
-				next;
-				mes "- Anna frowns at me and sticks out her tongue.";
-				mes "She doesn't want to talk to me -";
-				close;
+					mes "[Anna]";
+					mes "He began to tease me to read a book for him and later, he annoyed me saying that he's hungry!";
+					next;
+					mes "[Anna]";
+					mes "I was so bothered with him and I pretended not to hear him and kept reading. I guess it made him mad and so he broke the Matrushka.";
+					next;
+					mes "[Anna]";
+					mes "He made trouble and began to cry!";
+					mes "He's such a timid boy...";
+					mes "(giggling)";
+					next;
+					mes "[Anna]";
+					mes "And then I told him that we should glue the pieces together before Mom came back, so Mikhail went to get ^3131FFpaste^000000 but he hasn't come back yet.";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "Where can you get it?";
+					mes "Why didn't you go with him?";
+					next;
+					mes "[Anna]";
+					mes "Do you think we kids know that?";
+					mes "He broke it and should get the thing by himself!";
+					mes "And Mom said that he should do his work for himself to become a great general.";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "Don't you have any idea of where he might be?";
+					next;
+					mes "[Anna]";
+					mes "No.";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "Is there anyone who is close to him?";
+					next;
+					emotion 32;
+					mes "[Anna]";
+					mes "(giggle) He's a fool and has no friends.";
+					mes "But among our villagers, the lady of ^3131FFInn 'Sticky Herb Tree'^000000 has held Mikhail dear.";
+					next;
+					mes "[Anna]";
+					mes "I have no idea anymore.";
+					next;
+					mes "- Anna sticks her tongue out. -";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "It's the only clue, I guess I'll go to ^3131FFInn 'Sticky Herb Tree'^000000?";
+					if (mos_swan == 2) set mos_swan,3;
+					next;
+					break;
+				case 4:
+					mes "["+strcharinfo(0)+"]";
+					mes "What am I going to ask her?";
+					next;
+					input .@AnnaInfo$;
+					mes "["+strcharinfo(0)+"]";
+					mes "Anna,";
+					mes ""+.@AnnaInfo$+"?";
+					mes "Do you know what this is?";
+					next;
+					if (.@AnnaInfo$ == "Gravity") {
+						mes "[Anna]";
+						mes "I know that they have a game called RAGNAROK Online 2... and they like... what am I saying now... right?";
+						next;
+					} else if (.@AnnaInfo$ == "Gallina") {
+						mes "[Anna]";
+						mes "Mom's hotcakes are so delicious! Oh, it's sweet flavor!";
+						mes "Everyone in this village likes Mom's hotcakes. Hehe.";
+						next;
+					} else if (.@AnnaInfo$ == "Mikhail") {
+						mes "[Anna]";
+						mes "Mikhail is a timid fool!";
+						next;
+					} else {
+						mes "[Anna]";
+						mes "I have no idea about that thing.";
+						next;
+					}
+					break;
+				case 5:
+					mes "[Anna]";;
+					mes "Hmm ~ ~ ~ ~ ";
+					next;
+					mes "- Anna frowns at me and sticks out her tongue.";
+					mes "She doesn't want to talk to me -";
+					close;
 			}
 		}
-	}
-	else if (mos_swan == 3) {
+	} else if (mos_swan == 3) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Ok, I got a clue from Anna and one thing that I have to do is go to ^3131FFInn 'Sticky Herb Tree'^000000.";
 		close;
-	}
-	else if (mos_swan > 3 && mos_swan < 12) {
+	} else if (mos_swan > 3 && mos_swan < 12) {
 		mes "[Anna]";
 		mes "Mikhail is foolish, timid and a coward!";
 		close;
-	}
-	else if (mos_swan == 25) {
+	} else if (mos_swan == 25) {
 		mes "[Anna]";
 		mes "Mik..ha..il";
 		mes "He tattled on me to mom...";
@@ -5521,8 +2948,7 @@ mosk_in,148,274,1	script	Anna#mos	958,{
 		mes "[Anna]";
 		mes "....I'm sorry.";
 		close;
-	}
-	else if (mos_swan == 100) {
+	} else if (mos_swan == 100) {
 		mes "[Anna]";
 		mes "Mik..ha..il";
 		mes "He tattled on me to mom...";
@@ -5535,43 +2961,32 @@ mosk_in,148,274,1	script	Anna#mos	958,{
 		mes "....I'm sorry.";
 		close;
 	}
-	else {
-		mes "[Anna]";
-		mes "....I'm bored.";
-		close;
-	}
+	mes "[Anna]";
+	mes "....I'm bored.";
+	close;
 }
 
 //----------------------------------------------------------------------------
 // Bed
 //----------------------------------------------------------------------------
 mosk_in,136,279,3	script	Bed#mos1	111,{
-	if (mos_swan == 11) {
-		mes "- There are sheets and a pillow which seem so neat and soft that I'll probably fall asleep as soon as I lie down on them. -";
-		next;
-		if(select("Check other things:Look it over ") == 1) {
-			mes "- You'll examine the bed later -";
-			close;
-		}
-		mes "- You come near the bed to look it over. -";
-		next;
-		mes " .............. ";
-		mes " .............. ";
-		mes " .............. ";
-		mes " .............. ";
-		next;
-		mes " .............. ";
-		mes " .............. ";
-		mes " .............. ";
-		mes " .............. ";
-		mes " .............. ";
-		next;
-		mes "- You didn't find anything -";
-		close;
-	}else{
-		mes "- There are sheets and a pillow which seem so neat and soft that I'll probably fall asleep as soon as I lie down on them -";
+	mes "- There are sheets and a pillow which seem so neat and soft that I'll probably fall asleep as soon as I lie down on them. -";
+	if (mos_swan != 11) close;
+	next;
+	if(select("Check other things:Look it over ") == 1) {
+		mes "- You'll examine the bed later -";
 		close;
 	}
+	mes "- You come near the bed to look it over. -";
+	next;
+	while (.@c < 2) {
+		for (set .@i, 0; .@i < 4; set .@i, .@i + 1) 
+			mes " .............. ";
+		set .@c, .@c + 1;
+		next;
+	}
+	mes "- You didn't find anything -";
+	close;
 }
 
 mosk_in,161,279,3	duplicate(Bed#mos1)	Bed#mos2	111
@@ -5580,23 +2995,20 @@ mosk_in,161,279,3	duplicate(Bed#mos1)	Bed#mos2	111
 // Fire pot + Mikhail
 //----------------------------------------------------------------------------
 mosk_in,205,268,3	script	Fire pot#mos	111,{
-	if (mos_swan == 0) {
+	if (!mos_swan) {
 		mes "- It's a fire pot to heat the room or bake something -";
 		close;
-	}
-	else if (mos_swan == 1) {
+	} else if (mos_swan == 1) {
 		mes "- It's a fire pot that is used when Gallina bakes hotcakes.";
 		mes "It seems that this has not been used for a long time.";
 		mes "I think I should ask his family where he might have fun off to -";
 		set mos_swan,2;
 		close;
-	}
-	else if (mos_swan > 1 && mos_swan < 11) {
+	} else if (mos_swan > 1 && mos_swan < 11) {
 		mes "- It's a fire pot that is used when Gallina bakes hotcakes.";
 		mes "It seems that it was used a long time ago. -";
 		close;
-	}
-	else if (mos_swan == 11) {
+	} else if (mos_swan == 11) {
 		mes "- It's a fire pot that is used when Gallina bakes hotcakes.";
 		mes "It seems that it was used a long time ago. -";
 		next;
@@ -5606,122 +3018,115 @@ mosk_in,205,268,3	script	Fire pot#mos	111,{
 		}
 		mes "- You come near the pot to look it over. -";
 		next;
-		mes " .............. ";
-		mes " .............. ";
-		mes " .............. ";
-		mes " .............. ";
-		next;
-		mes " .............. ";
-		mes " .............. ";
-		mes " .............. ";
-		mes " .............. ";
-		mes " .............. ";
-		next;
+		while (.@c < 2) {
+			for (set .@i, 0; .@i < 4; set .@i, .@i + 1) 
+				mes " .............. ";
+			set .@c, .@c + 1;
+			next;
+		}
 		mes "- As you look it over very carefully, you find some pieces of bread on the floor around the fire pot! -";
 		next;
 		switch(select("Mikhail is in the fire pot.:Mikhail is around the fire pot.:There's nothing between pieces of bread and Mikhail.")) {
-		case 1:
-			mes "["+strcharinfo(0)+"]";
-			mes "I finally found him.";
-			next;
-			mes "- You put your arm into the hole of the fire pot. -";
-			next;
-			mes "- Something makes a rustling sound. -";
-			next;
-			mes "- You call Mikhail with a low voice. -";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Mik-ha-il-.";
-			next;
-			mes "- .......................... -";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Mikhail.";
-			mes "I know you're there, please come out.";
-			next;
-			mes "- .......................... -";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Your mom and sister are worried about you.";
-			next;
-			mes "[???]";
-			mes ".......hey.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "?????";
-			next;
-			mes "[Mikhail]";
-			mes ".......No, I can't............";
-			mes "I'll.... be punished........";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "No, you won't, Mikhail.";
-			mes "Your mom is worried about you so much.";
-			mes "Your sister, too.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "You broke your mom's Matrushka by mistake, didn't you?";
-			mes "I'll tell her about your mistake. Please come out.";
-			next;
-			mes "[Mikhail]";
-			mes "Oh.. ma.. matrushka..";
-			mes "I didn't break..it.. it..wasn't.. just me!";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "And?";
-			next;
-			mes "[Mikhail]";
-			mes "Anna pushed me and bumped me......";
-			mes "But she told Mom that it was just me who broke it....";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Oh, dear! You and Anna did that but she put all the blame on you?";
-			next;
-			mes "[Mikhail]";
-			mes "Yes.....";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "You should come out and tell your mom the truth! Let's go Mikhail.";
-			next;
-			mes "[Mikhail]";
-			mes "No! No, I can't!!";
-			next;
-			mes "- A small-white hand comes out of the fire pot and grabs your ankle -";
-			next;
-			mes "[Mikhail]";
-			mes "No...I'm afraid that Mom will punish me...";
-			mes "Because Grandma's Matrushka is broken......";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Oh, my. Please don't cry little boy.";
-			mes "There's no way. I'll get a paste to bond all the pieces together. And then you can bring it back to your mom and apologize to her.";
-			next;
-			mes "[Mikhail]";
-			mes "Can you... get... a paste?";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "You don't believe me?";
-			mes "Ok, stay here. I'll be right back with the paste.";
-			next;
-			mes "- I need to know what's required for the paste.";
-			mes "I'll ask that guy ^3131FFMr. Victor^000000 about them. -";
-			set mos_swan,12;
-			close;
-			break;
-		case 2:
-			mes "- I guess he's near the fire pot. Where can I find him? -";
-			close;
-			break;
-		case 3:
-			mes "- I guess pieces of bread have nothing to do with Mikhail. -";
-			close;
+			case 1:
+				mes "["+strcharinfo(0)+"]";
+				mes "I finally found him.";
+				next;
+				mes "- You put your arm into the hole of the fire pot. -";
+				next;
+				mes "- Something makes a rustling sound. -";
+				next;
+				mes "- You call Mikhail with a low voice. -";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Mik-ha-il-.";
+				next;
+				mes "- .......................... -";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Mikhail.";
+				mes "I know you're there, please come out.";
+				next;
+				mes "- .......................... -";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Your mom and sister are worried about you.";
+				next;
+				mes "[???]";
+				mes ".......hey.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "?????";
+				next;
+				mes "[Mikhail]";
+				mes ".......No, I can't............";
+				mes "I'll.... be punished........";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "No, you won't, Mikhail.";
+				mes "Your mom is worried about you so much.";
+				mes "Your sister, too.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "You broke your mom's Matrushka by mistake, didn't you?";
+				mes "I'll tell her about your mistake. Please come out.";
+				next;
+				mes "[Mikhail]";
+				mes "Oh.. ma.. matrushka..";
+				mes "I didn't break..it.. it..wasn't.. just me!";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "And?";
+				next;
+				mes "[Mikhail]";
+				mes "Anna pushed me and bumped me......";
+				mes "But she told Mom that it was just me who broke it....";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh, dear! You and Anna did that but she put all the blame on you?";
+				next;
+				mes "[Mikhail]";
+				mes "Yes.....";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "You should come out and tell your mom the truth! Let's go Mikhail.";
+				next;
+				mes "[Mikhail]";
+				mes "No! No, I can't!!";
+				next;
+				mes "- A small-white hand comes out of the fire pot and grabs your ankle -";
+				next;
+				mes "[Mikhail]";
+				mes "No...I'm afraid that Mom will punish me...";
+				mes "Because Grandma's Matrushka is broken......";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh, my. Please don't cry little boy.";
+				mes "There's no way. I'll get a paste to bond all the pieces together. And then you can bring it back to your mom and apologize to her.";
+				next;
+				mes "[Mikhail]";
+				mes "Can you... get... a paste?";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "You don't believe me?";
+				mes "Ok, stay here. I'll be right back with the paste.";
+				next;
+				mes "- I need to know what's required for the paste.";
+				mes "I'll ask that guy ^3131FFMr. Victor^000000 about them. -";
+				set mos_swan,12;
+				close;
+				break;
+			case 2:
+				mes "- I guess he's near the fire pot. Where can I find him? -";
+				close;
+				break;
+			case 3:
+				mes "- I guess pieces of bread have nothing to do with Mikhail. -";
+				close;
 		}
-	}
-	else if (mos_swan == 12) {
+	} else if (mos_swan == 12) {
 		mes "- Ok, what I have to do first is ask Mr.Victor what I need for the paste. -";
 		close;
-	}
-	else if (mos_swan == 24) {
+	} else if (mos_swan == 24) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Hey, Mikhail. I've got the paste!.";
 		next;
@@ -5766,20 +3171,15 @@ mosk_in,205,268,3	script	Fire pot#mos	111,{
 		delitem 7764,1;
 		close;
 	}
-	else{
-		mes "- It's a fire pot to heat the room or bake something -";
-		close;
-	}
+	mes "- It's a fire pot to heat the room or bake something -";
+	close;
 }
 
 mosk_in,202,269,5	script	Mikhail#mos	962,{
 	end;
 OnInit:
-	hideonnpc "Mikhail#mos";
-	end;
-	
 OnEnable:
-	hideoffnpc "Mikhail#mos";
+	hideonnpc "Mikhail#mos";
 	end;
 }
 
@@ -5793,77 +3193,65 @@ mosk_in,135,191,5	script	Landlord#mos	961,{
 	next;
 	if (mos_swan == 3) {
 		switch(select("Save:Stay the night - 5000z:Ask her about Mikhail.")) {
-		case 1:
-			mes "[Landlord]";
-			mes "Your respawn point has been saved.";
-			mes "Hope we can see you again next time hoho.";
-			savepoint "mosk_in",142,189;
-			close;
-			break;
-		case 2:
-			if (Zeny > 4999) {
+			case 1:
 				mes "[Landlord]";
-				mes "Ok, I'll bring you the best room.";
-				mes "Please have a rest, young adventurer.";
-				close2;
-				set Zeny,Zeny-5000;
-				percentheal 100,100;
-				warp "mosk_in",215,181;
-				end;
-			}else{
+				mes "Your respawn point has been saved.";
+				mes "Hope we can see you again next time hoho.";
+				savepoint "mosk_in",142,189;
+				close;
+			case 2:
+				if (Zeny > 4999) {
+					mes "[Landlord]";
+					mes "Ok, I'll bring you the best room.";
+					mes "Please have a rest, young adventurer.";
+					close2;
+					set Zeny,Zeny-5000;
+					percentheal 100,100;
+					warp "mosk_in",215,181;
+					end;
+				}
 				mes "[Landlord]";
 				mes "The service charge is 5000z.";
 				mes "Please make sure you have enough money for the service.";
 				close;
-			}
-			break;
-		case 3:
-			mes "[Landlord]";
-			emotion 3;
-			if (sex) {
-				mes "Oh~! You look great! Look at the solid muscle!";
+			case 3:
+				mes "[Landlord]";
+				emotion 3;
+				mes "Oh~! You look great! Look at the "+((sex)?"solid muscle":"fair skin")+"!";
 				mes "But you look tired. Is it because of a long journey?";
 				next;
 				mes "[Landlord]";
-				mes "We've got a room available just for you. It's the best in town. How about staying the night?";
-				mes "I'll charge you at reasonable price for you, handsome guy.";
-			}else{
-				mes "Oh, you look great! Look at your fair skin! ";
-				mes "But you look tired. Is it because of a long journey?";
+				mes "We've got a room available just for you. "+((sex)?"It's the best in town. How about staying the night?":"It's like a princess' room.");
+				mes (sex)?"I'll charge you at reasonable price for you, handsome guy.":"How about staying the night? I'll mark down the price for you, beautiful lady.";
 				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh, I'm sorry but I didn't come to stay here.";
+				mes "I'm looking for a kid and I've got something to ask you...";
+				next;
+				emotion e_omg;
 				mes "[Landlord]";
-				mes "We've got a room available just for you. It's like a princess' room.";
-				mes "How about staying the night? I'll mark down the price for you, beautiful lady.";
-			}
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Oh, I'm sorry but I didn't come to stay here.";
-			mes "I'm looking for a kid and I've got something to ask you...";
-			next;
-			emotion e_omg;
-			mes "[Landlord]";
-			mes "What!?!?";
-			next;
-			mes "[Landlord]";
-			mes "Hey~ You've heard about 'give and take'?";
-			mes "Haven't you?";
-			mes "If you're my customer, I could offer you what you want but you're not!";
-			next;
-			mes "[Landlord]";
-			mes "If you promise me to stay overnight, I'll tell you about what you want to know. Deal?";
-			next;
-			if(select("Refuse.:Stay overnight and get the info. - 5000z") == 1) {
-				emotion 7;
+				mes "What!?!?";
+				next;
 				mes "[Landlord]";
-				mes "Well, get the info by yourself then.";
-				close;
-			}
-			if (Zeny < 5000) {
+				mes "Hey~ You've heard about 'give and take'?";
+				mes "Haven't you?";
+				mes "If you're my customer, I could offer you what you want but you're not!";
+				next;
 				mes "[Landlord]";
-				mes "No way. You don't have enough money.";
-				mes "Go away! I can't offer you a room.";
-				close;
-			}else{
+				mes "If you promise me to stay overnight, I'll tell you about what you want to know. Deal?";
+				next;
+				if(select("Refuse.:Stay overnight and get the info. - 5000z") == 1) {
+					emotion 7;
+					mes "[Landlord]";
+					mes "Well, get the info by yourself then.";
+					close;
+				}
+				if (Zeny < 5000) {
+					mes "[Landlord]";
+					mes "No way. You don't have enough money.";
+					mes "Go away! I can't offer you a room.";
+					close;
+				}
 				mes "[Landlord]";
 				mes "Oh, God! You're as great as you look~";
 				mes "Ok, I'll bring you to the room in a bit!!";
@@ -5878,10 +3266,8 @@ mosk_in,135,191,5	script	Landlord#mos	961,{
 				percentheal 100,100;
 				warp "mosk_in",215,181;
 				end;
-			}
 		}
-	}
-	else if (mos_swan == 4 || mos_swan == 5) {
+	} else if (mos_swan == 4 || mos_swan == 5) {
 		mes "[Landlord]";
 		mes "You're up already?";
 		mes "Well since you're young you've probably already recovered all of your strength.";
@@ -5889,105 +3275,95 @@ mosk_in,135,191,5	script	Landlord#mos	961,{
 		next;
 		while(1) {
 			switch(select("Ask her about the inn:Ask her about Mikhail.:End the conversation")) {
-			case 1:
-				mes "[Landlord]";
-				mes "The name of our inn came from a big apple tree which is outside of the village.";
-				mes "I hope our inn will be the most famous place in Moscovia like the apple tree that distinguishes itself in the thick wood.";
-				next;
-				break;
-			case 2:
-				mes "[Landlord]";
-				mes "Mikhail?";
-				mes "Ah! You're talking about a cute boy, Mr. Ibanoff's son?";
-				mes "Yes I saw him. He was here a few hours ago.";
-				next;
-				mes "[Landlord]";
-				mes "He looked pale and asked me for a high-strength adhesive. He might've broken something important.";
-				next;
-				mes "[Landlord]";
-				mes "I felt sorry for him because he was so tense. He's such a sweet boy. I'd like to make him my son.";
-				mes "Hohoho";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "So what happened?";
-				mes "Did Mikhail get it?";
-				next;
-				mes "[Landlord]";
-				mes "Hoho, I don't really know. Maybe my husband does...";
-				mes "He's not much to look at, but he's good at repairing and making stuff! hoho";
-				next;
-				mes "[Landlord]";
-				mes "But it's been a long time since he was out of Moscovia so I can't ask him how to make adhesives now...";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "......And then?";
-				next;
-				mes "[Landlord]";
-				mes "I told him to go to the pub over there.";
-				mes "I also told him not to drink what those guys offer to him!";
-				mes "Cause he's such a cute boy!";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "So, did he go there?";
-				next;
-				mes "[Landlord]";
-				mes "Yes he did-.";
-				mes "As he's a good boy, he would go there.";
-				mes "He's really gentle.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "OK. Thank you for your answers!";
-				next;
-				mes "[Landlord]";
-				mes "I was unkind to make you stay here but wasn't it easier for you? hoho.";
-				mes "When it gets dark, promise me to come here again. Hoho";
-				set mos_swan,7;
-				close;
-				break;
-			case 3:
-				mes "[Landlord]";
-				mes "When you need to take a rest, where will you go?";
-				next;
-				mes "[Landlord]";
-				mes "You should come back here to Inn 'Sticky Herb Tree'. Ok?";
-				mes "I'll offer you better service next time.";
-				close;
+				case 1:
+					mes "[Landlord]";
+					mes "The name of our inn came from a big apple tree which is outside of the village.";
+					mes "I hope our inn will be the most famous place in Moscovia like the apple tree that distinguishes itself in the thick wood.";
+					next;
+					break;
+				case 2:
+					mes "[Landlord]";
+					mes "Mikhail?";
+					mes "Ah! You're talking about a cute boy, Mr. Ibanoff's son?";
+					mes "Yes I saw him. He was here a few hours ago.";
+					next;
+					mes "[Landlord]";
+					mes "He looked pale and asked me for a high-strength adhesive. He might've broken something important.";
+					next;
+					mes "[Landlord]";
+					mes "I felt sorry for him because he was so tense. He's such a sweet boy. I'd like to make him my son.";
+					mes "Hohoho";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "So what happened?";
+					mes "Did Mikhail get it?";
+					next;
+					mes "[Landlord]";
+					mes "Hoho, I don't really know. Maybe my husband does...";
+					mes "He's not much to look at, but he's good at repairing and making stuff! hoho";
+					next;
+					mes "[Landlord]";
+					mes "But it's been a long time since he was out of Moscovia so I can't ask him how to make adhesives now...";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "......And then?";
+					next;
+					mes "[Landlord]";
+					mes "I told him to go to the pub over there.";
+					mes "I also told him not to drink what those guys offer to him!";
+					mes "Cause he's such a cute boy!";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "So, did he go there?";
+					next;
+					mes "[Landlord]";
+					mes "Yes he did-.";
+					mes "As he's a good boy, he would go there.";
+					mes "He's really gentle.";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "OK. Thank you for your answers!";
+					next;
+					mes "[Landlord]";
+					mes "I was unkind to make you stay here but wasn't it easier for you? hoho.";
+					mes "When it gets dark, promise me to come here again. Hoho";
+					set mos_swan,7;
+					close;
+					break;
+				case 3:
+					mes "[Landlord]";
+					mes "When you need to take a rest, where will you go?";
+					next;
+					mes "[Landlord]";
+					mes "You should come back here to Inn 'Sticky Herb Tree'. Ok?";
+					mes "I'll offer you better service next time.";
+					close;
 			}
 		}
 	}
-	else{
-		if(select("Save:Stay the night - 5000z") == 1) {
-			mes "[Landlord]";
-			mes "Your respawn point has been saved.";
-			mes "Hope we can see you again next time hoho.";
-			savepoint "mosk_in",142,189;
-			close;
-		}
-		if (Zeny> 4999) {
-			mes "[Landlord]";
-			mes "Please be comfortable.";
-			close2;
-			set Zeny,Zeny-5000;
-			percentheal 100,100;
-			warp "mosk_in",215,181;
-			end;
-		}else{
-			mes "[Landlord]";
-			mes "The service charge is 5000z.";
-			mes "Please make sure you have enough money for the service.";
-			close;
-		}
+	if(select("Save:Stay the night - 5000z") == 1) {
+		mes "[Landlord]";
+		mes "Your respawn point has been saved.";
+		mes "Hope we can see you again next time hoho.";
+		savepoint "mosk_in",142,189;
+		close;
+	}
+	if (Zeny> 4999) {
+		mes "[Landlord]";
+		mes "Please be comfortable.";
+		close2;
+		set Zeny,Zeny-5000;
+		percentheal 100,100;
+		warp "mosk_in",215,181;
+		end;
 	}
+	mes "[Landlord]";
+	mes "The service charge is 5000z.";
+	mes "Please make sure you have enough money for the service.";
+	close;
 }
 
 mosk_in,141,212,3	script	Pub Owner#mos	964,{
-	if (checkweight(1201,1) == 0 ) {
-		mes "- Please stop here !! -";
-		mes "- You're carrying too many items -";
-		mes "- Please try again -";
-		mes "- after using the kafra service -";
-		close;
-	}
 	if ((MaxWeight-Weight) < 2000) {
 		mes "- Please stop here!! -";
 		mes "- You're carrying too many items -";
@@ -6036,116 +3412,61 @@ mosk_in,141,212,3	script	Pub Owner#mos	964,{
 		mes "Although you may be an experienced adventurer, you look so young.";
 		mes "I recommend you these drinks. Which one will you take?";
 		next;
-		switch(select("Milk - 1000z:Sticky_Herb juice - 1000z:They are all expensive!")) {
-		case 1:
-			if (Zeny > 999) {
-				set Zeny,Zeny-1000;
-				set mos_swan,9;
-				getitem 519,1;
-				mes "[Pub Owner]";
-				mes "Here you are. This is what you ordered.";
-				mes "How do you like Moscovia?";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Yes, it's beautiful and gorgeous.";
-				mes "Sasha, most of all, can you answer one question?";
-				next;
-				mes "[Pub Owner]";
-				mes "About what?";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Has Mikhail come here?";
-				next;
-				mes "[Pub Owner]";
-				mes "Yes he has.";
-				mes "He looked pale and needed a high-strength adhesive.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "So what happened?";
-				next;
-				mes "[Pub Owner]";
-				mes "I don't know much about adhesives.";
-				mes "But, I know a person who may know about them so I introduced Mikhail to him.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Who's this person?";
-				next;
-				mes "[Pub Owner]";
-				mes "It's Victor over there.";
-				mes "He's very careful about details so we call him ^3131FF'Hedgehog Victor'^000000.";
-				mes "No one knows adhesives as well as he does.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Sasha, thanks a lot!";
-				next;
-				mes "[Pub Owner]";
-				mes "You're welcome.";
-				close;
-			}else{
-				mes "[Pub Owner]";
-				mes "You'll need a lot of money while you're traveling.";
-				mes "If you don't have enough money, I'll offer you a glass of water.";
-				close;
-			}
-			break;
-		case 2:
-			if (Zeny > 999) {
-				set Zeny,Zeny-1000;
-				set mos_swan,9;
-				getitem 531,1;
-				mes "[Pub Owner]";
-				mes "Here you are. This is what you ordered.";
-				mes "How do you like Moscovia?";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Yes, it's beautiful and gorgeous.";
-				mes "Sasha, most of all, can you answer one question?";
-				next;
-				mes "[Pub Owner]";
-				mes "About what?";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Has Mikhail come here?";
-				next;
-				mes "[Pub Owner]";
-				mes "Yes he has.";
-				mes "He looked pale and needed a high-strength adhesive.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "So what happened?";
-				next;
-				mes "[Pub Owner]";
-				mes "I don't know much about adhesives.";
-				mes "But, I know a person who may know about them so I introduced Mikhail to him.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Who's this person?";
-				next;
-				mes "[Pub Owner]";
-				mes "It's Victor over there.";
-				mes "He's very careful about details so we call him ^3131FF'Hedgehog Victor'^000000.";
-				mes "No one knows adhesives as well as he does.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Sasha, thanks a lot!";
-				next;
-				mes "[Pub Owner]";
-				mes "You're welcome.";
-				close;
-			}else{
-				mes "[Pub Owner]";
-				mes "You'll need a lot of money while you're traveling.";
-				mes "If you don't have enough money, I'll offer you a glass of water.";
-				close;
-			}
-			break;
-		case 3:
+		set .@j, select("Milk - 1000z:Sticky_Herb juice - 1000z:They are all expensive!") - 1;
+		if (.@j == 2) {
 			mes "[Pub Owner]";
 			mes "Hahaha, too much for you eh cheapskate.";
 			close;
 		}
-	}
-	else if (mos_swan == 8) {
+		if (Zeny > 999) {
+			set Zeny,Zeny-1000;
+			set mos_swan,9;
+			if (!.@j) getitem 519,1; else getitem 531,1;
+			mes "[Pub Owner]";
+			mes "Here you are. This is what you ordered.";
+			mes "How do you like Moscovia?";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Yes, it's beautiful and gorgeous.";
+			mes "Sasha, most of all, can you answer one question?";
+			next;
+			mes "[Pub Owner]";
+			mes "About what?";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Has Mikhail come here?";
+			next;
+			mes "[Pub Owner]";
+			mes "Yes he has.";
+			mes "He looked pale and needed a high-strength adhesive.";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "So what happened?";
+			next;
+			mes "[Pub Owner]";
+			mes "I don't know much about adhesives.";
+			mes "But, I know a person who may know about them so I introduced Mikhail to him.";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Who's this person?";
+			next;
+			mes "[Pub Owner]";
+			mes "It's Victor over there.";
+			mes "He's very careful about details so we call him ^3131FF'Hedgehog Victor'^000000.";
+			mes "No one knows adhesives as well as he does.";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Sasha, thanks a lot!";
+			next;
+			mes "[Pub Owner]";
+			mes "You're welcome.";
+			close;
+		}
+		mes "[Pub Owner]";
+		mes "You'll need a lot of money while you're traveling.";
+		mes "If you don't have enough money, I'll offer you a glass of water.";
+		close;
+	} else if (mos_swan == 8) {
 		mes "[Pub Owner]";
 		mes "While I work in this pub, I can hear stories from all around the world.";
 		mes "They are all heroes of their life.";
@@ -6159,66 +3480,52 @@ mosk_in,141,212,3	script	Pub Owner#mos	964,{
 		mes "I recommend you those drinks.";
 		next;
 		switch(select("Milk - 1000z:Apple juice - 1000z:They are all expensive!")) {
-		case 1:
-			if (Zeny > 999) {
-				set Zeny,Zeny-1000;
-				set mos_swan,9;
-				getitem 519,1;
-				mes "[Pub Owner]";
-				mes "Here you are. This is what you ordered.";
-				mes "Enjoy yourself.";
-				close;
-			}else{
+			case 1:
+				if (Zeny > 999) {
+					set Zeny,Zeny-1000;
+					set mos_swan,9;
+					getitem 519,1;
+					mes "[Pub Owner]";
+					mes "Here you are. This is what you ordered.";
+					mes "Enjoy yourself.";
+					close;
+				}
 				mes "[Pub Owner]";
 				mes "You'll need a lot of money while you're traveling.";
 				mes "If you don't have enough money, I'll offer you a glass of water.";
 				close;
-			}
-			break;
-		case 2:
-			if (Zeny > 999) {
-				set Zeny,Zeny-1000;
-				set mos_swan,9;
-				getitem 531,1;
-				mes "[Pub Owner]";
-				mes "Here you are. This is what you ordered.";
-				mes "Enjoy yourself.";
-				close;
-			}else{
+			case 2:
+				if (Zeny > 999) {
+					set Zeny,Zeny-1000;
+					set mos_swan,9;
+					getitem 531,1;
+					mes "[Pub Owner]";
+					mes "Here you are. This is what you ordered.";
+					mes "Enjoy yourself.";
+					close;
+				}
 				mes "[Pub Owner]";
 				mes "You'll need a lot of money while you're traveling.";
 				mes "If you don't have enough money, I'll offer you a glass of water.";
 				close;
-			}
-			break;
-		case 3:
-			mes "[Pub Owner]";
-			mes "Hahaha, Here is the sightseeing place.";
-			close;
+			case 3:
+				mes "[Pub Owner]";
+				mes "Hahaha, Here is the sightseeing place.";
+				close;
 		}
-	}
-	else if (mos_swan == 9) {
+	} else if (mos_swan == 9) {
 		mes "[Pub Owner]";
 		mes "Have you spoken to Victor?";
 		close;
 	}
-	else {
-		mes "[Pub Owner]";
-		mes "Welcome to our pub.";
-		mes "I'm Alexandre of ^3131FF'Stream Pub'^000000. But, everyone calls me 'Sasha'.";
-		mes "It's a fine day today. I feel like going out.";
-		close;
-	}
+	mes "[Pub Owner]";
+	mes "Welcome to our pub.";
+	mes "I'm Alexandre of ^3131FF'Stream Pub'^000000. But, everyone calls me 'Sasha'.";
+	mes "It's a fine day today. I feel like going out.";
+	close;
 }
 
 mosk_in,147,202,3	script	Victor#mos	968,{
-	if (checkweight(1201,1) == 0 ) {
-		mes "- Please stop here !! -";
-		mes "- You're carrying too many items -";
-		mes "- Please try again -";
-		mes "- after using the kafra service -";
-		close;
-	}
 	if ((MaxWeight-Weight) < 2000) {
 		mes "- Please stop here!! -";
 		mes "- You're carrying too many items -";
@@ -6236,8 +3543,7 @@ mosk_in,147,202,3	script	Victor#mos	968,{
 		mes "What gives you the right to say such a thing?";
 		mes "I'm busy appreciating wine in this glass.";
 		close;
-	}
-	else if (mos_swan == 9) {
+	} else if (mos_swan == 9) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me.";
 		mes "Could you spare a few minutes for me?";
@@ -6317,8 +3623,7 @@ mosk_in,147,202,3	script	Victor#mos	968,{
 		mes "He might've just hidden himself somewhere, haha!";
 		set mos_swan,10;
 		close;
-	}
-	else if (mos_swan == 10 || mos_swan == 11) {
+	} else if (mos_swan == 10 || mos_swan == 11) {
 		mes "[Victor]";
 		mes "There's a large island near Moscovia. It takes so much time to reach there by a boat. So nobody wants to go there. ";
 		next;
@@ -6328,8 +3633,7 @@ mosk_in,147,202,3	script	Victor#mos	968,{
 		mes "[Victor]";
 		mes "The way to go there is full of danger. Do think that a timid boy like Mikhail can go there?";
 		close;
-	}
-	else if (mos_swan == 12) {
+	} else if (mos_swan == 12) {
 		mes "[Victor]";
 		mes "You came back. Hmm, are you about to make me responsible that he's gone?";
 		next;
@@ -6356,33 +3660,28 @@ mosk_in,147,202,3	script	Victor#mos	968,{
 		mes "You should bring ^3131FF'10 sticky herbs'^000000 and ^3131FF 1 medicine bowl^000000 to me.";
 		set mos_swan,13;
 		close;
-	}
-	else if (mos_swan > 12 && mos_swan < 23) {
+	} else if (mos_swan > 12 && mos_swan < 23) {
 		mes "[Victor]";
 		mes "If you want to make adhesives";
 		mes "get 10 sticky herbs and";
 		mes "1 medicine bowl for me.";
 		mes "Those sticky herbs are growing in the swamp. It may be dangerous but that shouldn't be a problem for you?";
 		close;
-	}
-	else if (mos_swan == 23) {
+	} else if (mos_swan == 23) {
 		mes "[Victor]";
 		mes "What do you want with me this time??";
 		mes "Oh, you said you wanted an adhesive...";
 		mes "You're bothering me so much!";
 		next;
-		if (countitem(7763) > 9 && countitem(7134) > 0) {
+		if (countitem(7763) > 9 && countitem(7134)) {
 			mes "[Victor]";
 			mes "Give me the stuff! I'll make it quickly. You're annoying me!";
 			next;
-			mes "- He's making adhesive with a crunching sound -";
-			mes "- He's making adhesive with a crunching sound -";
-			mes "- He's making adhesive with a crunching sound -";
+			for (set .@i, 0; .@i < 3; set .@i, .@i + 1)
+				mes "- He's making adhesive with a crunching sound -";
 			next;
-			mes "- And he may be rubbing something -";
-			mes "- And he may be rubbing something -";
-			mes "- And he may be rubbing something -";
-			mes "- And he may be rubbing something -";
+			for (set .@i, 0; .@i < 4; set .@i, .@i + 1)
+				mes "- And he may be rubbing something -";
 			next;
 			mes "[Victor]";
 			mes "Ok, done!";
@@ -6393,35 +3692,31 @@ mosk_in,147,202,3	script	Victor#mos	968,{
 			set mos_swan,24;
 			getitem 7764,1;
 			close;
-		}else{
-			mes "[Victor]";
-			mes "He's annoying me so much. Give me the materials!";
-			mes "Oh dear? What are those things? I said 10 sticky herbs and 1 medicine bowl!!";
-			next;
-			mes "[Victor]";
-			mes "Even though I'm always in the pub, I have my own business... !";
-			next;
-			mes "[Victor]";
-			mes ".............!!!!";
-			next;
-			mes "[Victor]";
-			mes "..................";
-			mes "What are you staring at? Bring them to me right now!";
-			close;
 		}
-	}
-	else{
 		mes "[Victor]";
-		mes "What did you say? I just want to drink peacefully!";
+		mes "He's annoying me so much. Give me the materials!";
+		mes "Oh dear? What are those things? I said 10 sticky herbs and 1 medicine bowl!!";
+		next;
+		mes "[Victor]";
+		mes "Even though I'm always in the pub, I have my own business... !";
+		next;
+		mes "[Victor]";
+		mes ".............!!!!";
+		next;
+		mes "[Victor]";
+		mes "..................";
+		mes "What are you staring at? Bring them to me right now!";
 		close;
 	}
+	mes "[Victor]";
+	mes "What did you say? I just want to drink peacefully!";
+	close;
 }
 
 mosk_in,215,181,0	script	#swan_inn	-1,1,1,{
 	end;
-	
 OnTouch:
-	if (mos_swan == 4) {
+	if (mos_swan != 4) end;
 		mes "..................";
 		mes "..................";
 		next;
@@ -6445,19 +3740,12 @@ OnTouch:
 		mes "Ok, I guess I will go to the landlord to get some info.";
 		set mos_swan,5;
 		close;
-	}else{
-		end;
-	}
 }
 
 //----------------------------------------------------------------------------
 // Swamp
 //----------------------------------------------------------------------------
 mosk_dun03,153,90,3	script	Bubbling Swamp#mos1	844,{
-	if (checkweight(1201,1) == 0) {
-		mes "- Your bag is very heavy today -";
-		close;
-	}
 	if ((MaxWeight-Weight) < 2000) {
 		mes "- Your bag is very heavy today -";
 		close;
@@ -6471,57 +3759,43 @@ mosk_dun03,153,90,3	script	Bubbling Swamp#mos1	844,{
 		mes "I don't see any traces of Mikhail. I think I should go back and check his house one more time.";
 		set mos_swan,11;
 		close;
-	}
-	else if (mos_swan == 11 && mos_swan == 12) {
+	} else if (mos_swan == 11 && mos_swan == 12) {
 		mes "- You can see a small muddy swamp -";
 		next;
 		mes "- Gas bubbles are rising. The atmosphere here is pretty scary -";
 		close;
-	}
-	else if (mos_swan > 12 && mos_swan < 23) {
+	} else if (mos_swan > 12 && mos_swan < 23) {
 		mes "- You feel sticky just looking at the swamp. -";
 		next;
 		mes "- Gas bubbles are rising. The atmosphere here is pretty scary -";
 		next;
 		mes "- You stretch out to find sticky herbs. -";
 		next;
-		set .@leaf_mos,rand(1,10);
-		if (.@leaf_mos < 6) {
+		if (rand(1,10) < 6) {
 			mes "- You have pricked your finger on a Sticky Herb. -";
 			if (mos_swan == 22) {
 				getitem 7763,1;
 				set mos_swan,23;
 				close;
-			}else{
-				getitem 7763,1;
-				set mos_swan,mos_swan+1;
-				close;
 			}
-		}else{
-			mes "- You have pricked your finger on a Green Herb. -";
-			getitem 511,1;
+			getitem 7763,1;
+			set mos_swan,mos_swan+1;
 			close;
 		}
-	}
-	else {
-		mes "- You can see a small swamp which seems very muddy. -";
-		next;
-		mes "- Gas bubbles are rising. The atmosphere here is pretty scary -";
+		mes "- You have pricked your finger on a Green Herb. -";
+		getitem 511,1;
 		close;
 	}
+	mes "- You can see a small swamp which seems very muddy. -";
+	next;
+	mes "- Gas bubbles are rising. The atmosphere here is pretty scary -";
+	close;
 }
 
 //----------------------------------------------------------------------------
 // Larissa - Hotcake Quests
 //----------------------------------------------------------------------------
 mosk_in,211,259,5	script	Larissa#mos_01	960,{
-	if (checkweight(1201,1) == 0) {
-		mes "- Please stop here !! -";
-		mes "- You're carrying too many items -";
-		mes "- Please try again -";
-		mes "- after using the kafra service -";
-		close;
-	}
 	if ((MaxWeight-Weight) < 2000) {
 		mes "- Please stop here !! -";
 		mes "- You're carrying too many items -";
@@ -6546,14 +3820,13 @@ mosk_in,211,259,5	script	Larissa#mos_01	960,{
 		mes "Whenever you'd like to eat these pancake, you come on by.";
 		mes "I'll bake you the most delicious one.";
 		close;
-	}
-	else if (mos_swan > 100) {
+	} else if (mos_swan > 100) {
 		mes "[Larissa]";
 		mes "Did the pancake taste good?";
 		mes "Would you like another pancake?";
 		next;
 		if(select("Yes:No") == 1) {
-			if (countitem(7031) > 0 && countitem(519) > 1 && countitem(504) > 1 && countitem(548) > 0 && countitem(1019) > 0 && countitem(518) > 0) {
+			if (countitem(7031) && countitem(519) > 1 && countitem(504) > 1 && countitem(548) && countitem(1019) && countitem(518)) {
 				mes "[Larissa]";
 				mes "Let me check if you have all the ingredients.";
 				mes "A frying pan, milk... potion that softens the dough, cheese..honey..and firewood.";
@@ -6568,22 +3841,23 @@ mosk_in,211,259,5	script	Larissa#mos_01	960,{
 				mes "What should I do with the wheat flour?";
 				next;
 				switch(select("Turn it down.:Pass it through a sieve.:Press it with your fist.")) {
-				case 1:
-					mes "[Larissa]";
-					mes "Oh, my! What are you doing now?";
-					mes "I'm going to do that from the beginning.";
-					mes "Look, pass it through a sieve.";
-					next;
-					break;
-				case 2:
-					mes "[Larissa]";
-					mes "There you go. Just do it slowly while tapping the sides, sifting the sugar and baking powder through the sieve together.";
-					next;
-					break;
-				case 3:
-					mes "[Larissa]";
-					mes "If we don't have the sieve, we can use our fist but we've got one. So we might as well use it right?";
-					next;
+					case 1:
+						mes "[Larissa]";
+						mes "Oh, my! What are you doing now?";
+						mes "I'm going to do that from the beginning.";
+						mes "Look, pass it through a sieve.";
+						next;
+						break;
+					case 2:
+						mes "[Larissa]";
+						mes "There you go. Just do it slowly while tapping the sides, sifting the sugar and baking powder through the sieve together.";
+						next;
+						break;
+					case 3:
+						mes "[Larissa]";
+						mes "If we don't have the sieve, we can use our fist but we've got one. So we might as well use it right?";
+						next;
+						break;
 				}
 				mes "[Larissa]";
 				mes "That way, it will mix well.";
@@ -6594,7 +3868,7 @@ mosk_in,211,259,5	script	Larissa#mos_01	960,{
 					mes "[Larissa]";
 					mes "No, you don't have to do that way. It won't rise properly if you stir it too fast.";
 					next;
-				}else{
+				} else {
 					mes "[Larissa]";
 					mes "You're very good at this!";
 					next;
@@ -6613,7 +3887,7 @@ mosk_in,211,259,5	script	Larissa#mos_01	960,{
 					mes "You'll burn it up.";
 					mes "Wait for a while.";
 					next;
-				}else{
+				} else {
 					mes "[Larissa]";
 					mes "Hmm let's see. It's good.";
 					mes "You were good at it.";
@@ -6624,96 +3898,64 @@ mosk_in,211,259,5	script	Larissa#mos_01	960,{
 				mes "What should I top it with? First I put some cheese but the rest is up to you...";
 				next;
 				switch(select("Caviar:Mushrooms:Honey:Strawberry jam:Sour cream")) {
-				case 1:
-					mes "[Larissa]";
-					mes "Ok. you want caviar. Fortunately, I still have a little left.";
-					mes "Hoohoo, this'll be luxurious..";
-					mes "Here we go. It's all done!";
-					delitem 7031,1;
-					delitem 519,2;
-					delitem 504,2;
-					delitem 548,1;
-					delitem 1019,1;
-					delitem 518,1;
-					getitem 591,1;
-					close;
-					break;
-				case 2:
-					mes "[Larissa]";
-					mes "Ok. you want mushrooms.. It has an earthly flavor.";
-					mes "Here we go. It's all done!";
-					delitem 7031,1;
-					delitem 519,2;
-					delitem 504,2;
-					delitem 548,1;
-					delitem 1019,1;
-					delitem 518,1;
-					getitem 595,1;
-					close;
-					break;
-				case 3:
-					mes "[Larissa]";
-					mes "Ok, honey syrup goes perfectly with pancakes.";
-					mes "Here we go. It's all done!";
-					delitem 7031,1;
-					delitem 519,2;
-					delitem 504,2;
-					delitem 548,1;
-					delitem 1019,1;
-					delitem 518,1;
-					getitem 593,1;
-					close;
-					break;
-				case 4:
-					mes "[Larissa]";
-					mes "Who could get sick of pancakes with strawberry jam?";
-					mes "Hoohoo it tastes sweet too.";
-					mes "Here we go. It's all done!";
-					delitem 7031,1;
-					delitem 519,2;
-					delitem 504,2;
-					delitem 548,1;
-					delitem 1019,1;
-					delitem 518,1;
-					getitem 592,1;
-					close;
-					break;
-				case 5:
-					mes "[Larissa]";
-					mes "You want sour cream.. you will feel as if you fly in the sky.";
-					mes "It can help reduce stress.";
-					mes "Here we go. It's all done!";
-					delitem 7031,1;
-					delitem 519,2;
-					delitem 504,2;
-					delitem 548,1;
-					delitem 1019,1;
-					delitem 518,1;
-					getitem 594,1;
-					close;
+					case 1:
+						mes "[Larissa]";
+						mes "Ok. you want caviar. Fortunately, I still have a little left.";
+						mes "Hoohoo, this'll be luxurious..";
+						mes "Here we go. It's all done!";
+						setarray .@n, 591,1;
+						break;
+					case 2:
+						mes "[Larissa]";
+						mes "Ok. you want mushrooms.. It has an earthly flavor.";
+						mes "Here we go. It's all done!";
+						setarray .@n, 595,1;
+						break;
+					case 3:
+						mes "[Larissa]";
+						mes "Ok, honey syrup goes perfectly with pancakes.";
+						mes "Here we go. It's all done!";
+						setarray .@n, 593,1;
+						break;
+					case 4:
+						mes "[Larissa]";
+						mes "Who could get sick of pancakes with strawberry jam?";
+						mes "Hoohoo it tastes sweet too.";
+						mes "Here we go. It's all done!";
+						setarray .@n, 592,1;
+						break;
+					case 5:
+						mes "[Larissa]";
+						mes "You want sour cream.. you will feel as if you fly in the sky.";
+						mes "It can help reduce stress.";
+						mes "Here we go. It's all done!";
+						setarray .@n, 594,1;
+						break;
 				}
-			}else{
-				mes "[Larissa]";
-				mes "That's good. I have ingredients and several toppings but...";
-				mes "It's still not enough. You need to get all of the things that we don't have now.";
-				next;
-				mes "[Larissa]";
-				mes "I need ^4d4dff1 old frying pan , 2 bottles of milk , 2 white potion, 1 cheese, 1 Trunk, 1 Honey ^000000.";
-				mes "We can bake our pancake when we get all of those.";
+				setarray .@di,7031,1,519,2,504,2,548,1,1019,1,518,1;
+				for (set .@i, 0; .@i < getarraysize(.@di); set .@i, .@i + 2)
+					delitem .@n[.@i],.@n[.@i+1];
+				getitem .@n,.@n[1];
 				close;
 			}
+			mes "[Larissa]";
+			mes "That's good. I have ingredients and several toppings but...";
+			mes "It's still not enough. You need to get all of the things that we don't have now.";
+			next;
+			mes "[Larissa]";
+			mes "I need ^4d4dff1 old frying pan , 2 bottles of milk , 2 white potion, 1 cheese, 1 Trunk, 1 Honey ^000000.";
+			mes "We can bake our pancake when we get all of those.";
+			close;
 		}
 		mes "[Larissa]";
 		mes "Ok we can bake it next time.";
 		mes "I'm always available.";
 		close;
 	}
-	else{
-		mes "[Larissa]";
-		mes "Young lady is a practical joker and her brother is tenderhearted.";
-		mes "By the way, I haven't seen him for quite some time.";
-		close;
-	}
+	mes "[Larissa]";
+	mes "Young lady is a practical joker and her brother is tenderhearted.";
+	mes "By the way, I haven't seen him for quite some time.";
+	close;
 }
 
 //============================================================================
@@ -6774,349 +4016,21 @@ moscovia,208,182,7	script	Acorn Dealer#mos	967,{
 		mes "Hello? You've turned pale! Are you ok??";
 		mes "Do you have enough money?";
 		close;
-	}else{
-		mes "[Acorn Dealer]";
-		mes "Oh, thank you...";
-		mes "What do you think of them? They're fresh, aren't they?";
-		set Zeny,Zeny - .@price;
-		getitem 1026,.@input;
-		close;
 	}
+	mes "[Acorn Dealer]";
+	mes "Oh, thank you...";
+	mes "What do you think of them? They're fresh, aren't they?";
+	set Zeny,Zeny - .@price;
+	getitem 1026,.@input;
+	close;
 }
 
 //----------------------------------------------------------------------------
 // Big Squirrel - Trade Acorns for Gems
 //----------------------------------------------------------------------------
-mosk_fild01,113,108,3	script	Big Squirrel#mos	111,{
-	if (checkweight(1201,1) == 0 ) {
-		mes "- Please stop here !! -";
-		mes "- You're carrying too many items -";
-		mes "- Please try again -";
-		mes "- after using the kafra service -";
-		close;
-	}
-	if ((MaxWeight-Weight) < 2000) {
-		mes "- Please stop here!! -";
-		mes "- You're carrying too many items -";
-		mes "- Please try again -";
-		mes "- after using the kafra service -";
-		close;
-	}
-	mes "- It's an extraordinary big squirrel. -";
-	next;
-	mes "- When the animal comes across you, it starts to sniffle and purse up its lips. -";
-	next;
-	if (countitem(1026) > 19) {
-		switch(select("Give acorns to it.:Ignore it.:Ask about the squirrel.")) {
-		case 1:
-			mes "- You take one of acorns out and hold it out to the squirrel. -";
-			next;
-			mes "- It cocked it's ears up and begins to nibble the acorn quickly. -";
-			next;
-			mes "- It makes a crunching sound -";
-			mes "- It makes a crunching sound -";
-			mes "- It makes a crunching sound -";
-			next;
-			mes "- After eating the acorn up, the squirrel dances around wildly. Suddenly it curls its body and throws something up with a spit-spit sound -";
-			delitem 1026,20;
-			set .@cyworld,rand(1,1000);
-			set .@stworld,rand(1,150);
-			if (.@cyworld > 0 && .@cyworld < 100) {
-				getitem 733,1;
-			}
-			else if (.@cyworld == 100) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 730,1;
-				else
-					getitem 7289,1;
-			}
-			else if (.@cyworld > 100 && .@cyworld < 200) {
-				getitem 733,1;
-			}
-			else if (.@cyworld == 200) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 731,1;
-				else
-					set .@stonez1,rand(1,10);
-					if (.@stonez1 < 6)
-						getitem 7290,1;
-					else if (.@stonez1 > 5 && .@stonez1 < 8)
-						getitem 7297,1;
-					else
-						getitem 7292,1;
-			}
-			else if (.@cyworld > 200 && .@cyworld < 300) {
-				getitem 733,1;
-			}
-			else if (.@cyworld == 300) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 732,1;
-				else
-					set .@stonez2,rand(1,10);
-					if (.@stonez2 < 6)
-						getitem 7291,1;
-					else
-						getitem 7294,1;
-			}
-			else if (.@cyworld > 300 && .@cyworld < 400) {
-				getitem 733,1;
-			}
-			else if (.@cyworld == 400) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 730,1;
-				else
-					getitem 7295,1;
-			}
-			else if (.@cyworld > 400 && .@cyworld < 500) {
-				getitem 733,1;
-			}
-			else if (.@cyworld == 500) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 731,1;
-				else
-					getitem 7293,1;
-			}
-			else if (.@cyworld > 500 && .@cyworld < 600) {
-				getitem 724,1;
-			}
-			else if (.@cyworld == 600) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 732,1;
-				else
-					getitem 7292,1;
-			}
-			else if (.@cyworld > 600 && .@cyworld < 700) {
-				getitem 724,1;
-			}
-			else if (.@cyworld == 700) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 730,1;
-				else
-					getitem 7290,1;
-			}
-			else if (.@cyworld > 700 && .@cyworld < 800) {
-				getitem 724,1;
-			}
-			else if (.@cyworld == 800) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 731,1;
-				else
-					getitem 7296,1;
-			}
-			else if (.@cyworld > 800 && .@cyworld < 900) {
-				getitem 724,1;
-			}
-			else if (.@cyworld == 900) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 732,1;
-				else
-					getitem 7297,1;
-			}
-			else if (.@cyworld == 1000) {
-				getitem 727,1;
-			}
-			else {
-				getitem 724,1;
-			}
-			close;
-			break;
-		case 2:
-			mes "["+strcharinfo(0)+"]";
-			mes "It's so cute.";
-			close;
-			break;
-		case 3:
-			mes "[Aged Man]";
-			mes "Is it bigger than an ordinary one?";
-			mes "I found it one day and was barely able to save it...";
-			next;
-			mes "[Aged Man]";
-			mes "I felt that heaven had sent me a friend so that my life wouldn't be so lonely.";
-			next;
-			mes "[Aged Man]";
-			mes "But I didn't know that it eats so much, it won't give me any attention if I give anything ^3131FFbelow 20 acorns^000000.";
-			mes "That's why it's bigger than ordinary ones hahaha.";
-			close;
-		}
-	}else{
-		mes "- The squirrel looks at the acorn which you held for a while but it turned its head with indifference. -";
-		close;
-	}
-}
-
-mosk_fild01,113,108,5	script	#mos_sq	1104,2,2,{
-	end;
-	
+-	script	Squirrel#mos_main	-1,{
+	if (compare(strnpcinfo(0),"mos_sq")) end;
 OnTouch:
-	if (checkweight(1201,1) == 0 ) {
-		mes "- Please stop here !! -";
-		mes "- You're carrying too many items -";
-		mes "- Please try again -";
-		mes "- after using the kafra service -";
-		close;
-	}
 	if ((MaxWeight-Weight) < 2000) {
 		mes "- Please stop here!! -";
 		mes "- You're carrying too many items -";
@@ -7130,303 +4044,102 @@ OnTouch:
 	next;
 	if (countitem(1026) > 19) {
 		switch(select("Give acorns to it.:Ignore it.:Ask about the squirrel.")) {
-		case 1:
-			mes "- You take one of acorns out and hold it out to the squirrel. -";
-			next;
-			mes "- It cocked it's ears up and begins to nibble the acorn quickly. -";
-			next;
-			mes "- It makes a crunching sound -";
-			mes "- It makes a crunching sound -";
-			mes "- It makes a crunching sound -";
-			next;
-			mes "- After eating the acorn up, the squirrel dances around wildly. Suddenly it curls its body and throws something up with a spit-spit sound -";
-			delitem 1026,20;
-			set .@cyworld,rand(1,1000);
-			set .@stworld,rand(1,150);
-			if (.@cyworld > 0 && .@cyworld < 100) {
-				getitem 733,1;
-			}
-			else if (.@cyworld == 100) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 730,1;
-				else
-					getitem 7289,1;
-			}
-			else if (.@cyworld > 100 && .@cyworld < 200) {
-				getitem 733,1;
-			}
-			else if (.@cyworld == 200) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 731,1;
-				else
-					set .@stonez1,rand(1,10);
-					if (.@stonez1 < 6)
-						getitem 7290,1;
-					else if (.@stonez1 > 5 && .@stonez1 < 8)
-						getitem 7297,1;
-					else
-						getitem 7292,1;
-			}
-			else if (.@cyworld > 200 && .@cyworld < 300) {
-				getitem 733,1;
-			}
-			else if (.@cyworld == 300) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 732,1;
-				else
-					set .@stonez2,rand(1,10);
-					if (.@stonez2 < 6)
-						getitem 7291,1;
-					else
-						getitem 7294,1;
-			}
-			else if (.@cyworld > 300 && .@cyworld < 400) {
-				getitem 733,1;
-			}
-			else if (.@cyworld == 400) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 730,1;
-				else
-					getitem 7295,1;
-			}
-			else if (.@cyworld > 400 && .@cyworld < 500) {
-				getitem 733,1;
-			}
-			else if (.@cyworld == 500) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 731,1;
-				else
-					getitem 7293,1;
-			}
-			else if (.@cyworld > 500 && .@cyworld < 600) {
-				getitem 724,1;
-			}
-			else if (.@cyworld == 600) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 732,1;
-				else
-					getitem 7292,1;
-			}
-			else if (.@cyworld > 600 && .@cyworld < 700) {
-				getitem 724,1;
-			}
-			else if (.@cyworld == 700) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 730,1;
-				else
-					getitem 7290,1;
-			}
-			else if (.@cyworld > 700 && .@cyworld < 800) {
-				getitem 724,1;
-			}
-			else if (.@cyworld == 800) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 731,1;
-				else
-					getitem 7296,1;
-			}
-			else if (.@cyworld > 800 && .@cyworld < 900) {
-				getitem 724,1;
-			}
-			else if (.@cyworld == 900) {
-				if (.@stworld > 0 && .@stworld < 10)
-					getitem 718,1;
-				else if (.@stworld > 9 && .@stworld < 20)
-					getitem 719,1;
-				else if (.@stworld > 19 && .@stworld < 30)
-					getitem 720,1;
-				else if (.@stworld > 29 && .@stworld < 40)
-					getitem 721,1;
-				else if (.@stworld > 39 && .@stworld < 50)
-					getitem 722,1;
-				else if (.@stworld > 49 && .@stworld < 60)
-					getitem 723,1;
-				else if (.@stworld > 59 && .@stworld < 70)
-					getitem 725,1;
-				else if (.@stworld > 69 && .@stworld < 80)
-					getitem 728,1;
-				else if (.@stworld > 79 && .@stworld < 90)
-					getitem 729,1;
-				else if (.@stworld > 89 && .@stworld < 100)
-					getitem 732,1;
-				else
-					getitem 7297,1;
-			}
-			else if (.@cyworld == 1000) {
-				getitem 727,1;
-			}
-			else {
-				getitem 724,1;
-			}
-			close;
-			break;
-		case 2:
-			mes "["+strcharinfo(0)+"]";
-			mes "It's so cute.";
-			close;
-			break;
-		case 3:
-			mes "[Aged Man]";
-			mes "Is it bigger than an ordinary one?";
-			mes "I found it one day and was barely able to save it...";
-			next;
-			mes "[Aged Man]";
-			mes "I felt that heaven had sent me a friend so that my life wouldn't be so lonely.";
-			next;
-			mes "[Aged Man]";
-			mes "But I didn't know that it eats so much, it won't give me any attention if I give anything ^3131FFbelow 20 acorns^000000.";
-			mes "That's why it's bigger than ordinary ones hahaha.";
-			close;
+			case 1:
+				mes "- You take one of acorns out and hold it out to the squirrel. -";
+				next;
+				mes "- It cocked it's ears up and begins to nibble the acorn quickly. -";
+				next;
+				mes "- It makes a crunching sound -";
+				mes "- It makes a crunching sound -";
+				mes "- It makes a crunching sound -";
+				next;
+				mes "- After eating the acorn up, the squirrel dances around wildly. Suddenly it curls its body and throws something up with a spit-spit sound -";
+				delitem 1026,20;
+				set .@cyworld,rand(1,1000);
+				set .@stworld,rand(1,150);
+				if (.@cyworld > 0 && .@cyworld < 100) getitem 733,1;
+				else if (.@cyworld == 100) {
+					if (.@stworld > 0 && .@stworld < 90) callsub S_BS_1,.@stworld;
+					else if (.@stworld > 89 && .@stworld < 100) getitem 730,1;
+					else getitem 7289,1;
+				} else if (.@cyworld == 200) {
+					if (.@stworld > 0 && .@stworld < 90) callsub S_BS_1,.@stworld;
+					else if (.@stworld > 89 && .@stworld < 100) getitem 731,1;
+					else set .@stonez1,rand(1,10);
+						if (.@stonez1 < 6) getitem 7290,1;
+						else if (.@stonez1 > 5 && .@stonez1 < 8) getitem 7297,1;
+						else getitem 7292,1;
+				} else if (.@cyworld == 300) {
+					if (.@stworld > 0 && .@stworld < 90) callsub S_BS_1,.@stworld;
+					else if (.@stworld > 89 && .@stworld < 100) getitem 732,1;
+					else set .@stonez2,rand(1,10);
+						if (.@stonez2 < 6) getitem 7291,1;
+						else getitem 7294,1;
+				} else if (.@cyworld == 400) {
+					if (.@stworld > 0 && .@stworld < 90) callsub S_BS_1,.@stworld;
+					else if (.@stworld > 89 && .@stworld < 100) getitem 730,1;
+					else getitem 7295,1;
+				} else if (.@cyworld == 500) {
+					if (.@stworld > 0 && .@stworld < 90) callsub S_BS_1,.@stworld;
+					else if (.@stworld > 89 && .@stworld < 100) getitem 731,1;
+					else getitem 7293,1;
+				} else if (.@cyworld == 600) {
+					if (.@stworld > 0 && .@stworld < 90) callsub S_BS_1,.@stworld;
+					else if (.@stworld > 89 && .@stworld < 100) getitem 732,1;
+					else getitem 7292,1;
+				} else if (.@cyworld == 700) {
+					if (.@stworld > 0 && .@stworld < 90) callsub S_BS_1,.@stworld;
+					else if (.@stworld > 89 && .@stworld < 100) getitem 730,1;
+					else getitem 7290,1;
+				} else if (.@cyworld == 800) {
+					if (.@stworld > 0 && .@stworld < 90) callsub S_BS_1,.@stworld;
+					else if (.@stworld > 89 && .@stworld < 100) getitem 731,1;
+					else getitem 7296,1;
+				} else if (.@cyworld == 900) {
+					if (.@stworld > 0 && .@stworld < 90) callsub S_BS_1,.@stworld;
+					else if (.@stworld > 89 && .@stworld < 100) getitem 732,1;
+					else getitem 7297,1;
+				} else if (.@cyworld == 1000) getitem 727,1;	
+				else if (.@cyworld > 100 && .@cyworld < 500) getitem 733,1;
+				else if (.@cyworld > 500 && .@cyworld < 900) getitem 724,1;					
+				else getitem 724,1;
+				close;
+			case 2:
+				mes "["+strcharinfo(0)+"]";
+				mes "It's so cute.";
+				close;
+			case 3:
+				mes "[Aged Man]";
+				mes "Is it bigger than an ordinary one?";
+				mes "I found it one day and was barely able to save it...";
+				next;
+				mes "[Aged Man]";
+				mes "I felt that heaven had sent me a friend so that my life wouldn't be so lonely.";
+				next;
+				mes "[Aged Man]";
+				mes "But I didn't know that it eats so much, it won't give me any attention if I give anything ^3131FFbelow 20 acorns^000000.";
+				mes "That's why it's bigger than ordinary ones hahaha.";
+				close;
 		}
-	}else{
-		mes "- The squirrel looks at the acorn which you held for a while but it turned its head with indifference. -";
-		close;
 	}
+	mes "- The squirrel looks at the acorn which you held for a while but it turned its head with indifference. -";
+	close;
+	
+S_BS_1:
+	set .@stworld, getarg(0);
+	if (.@stworld < 10) getitem 718,1;
+	else if (.@stworld < 20) getitem 719,1;
+	else if (.@stworld < 30) getitem 720,1;
+	else if (.@stworld < 40) getitem 721,1;
+	else if (.@stworld < 50) getitem 722,1;
+	else if (.@stworld < 60) getitem 723,1;
+	else if (.@stworld < 70) getitem 725,1;
+	else if (.@stworld < 80) getitem 728,1;
+	else if (.@stworld < 90) getitem 729,1;
+	return;
 }
+mosk_fild01,113,108,3	duplicate(Squirrel#mos_main)	Big Squirrel#mos	111
+mosk_fild01,113,108,5	duplicate(Squirrel#mos_main)	#mos_sq	1104,2,2
 
 //============================================================================
 // Banish Winter
@@ -7437,9 +4150,8 @@ OnTouch:
 //----------------------------------------------------------------------------
 mosk_in,215,46,5	script	#babayaga	-1,7,7,{
 	end;
-	
 OnTouch:
-	if (mos_nowinter == 0) {
+	if (!mos_nowinter) {
 		if (countitem(7762) > 39 && BaseLevel > 59) {
 			set mos_nowinter,2;
 			mes "[Baba Yaga, the Horrible]";
@@ -7456,8 +4168,7 @@ OnTouch:
 			mes "[Baba Yaga, the Horrible]";
 			mes "Who, who are you?";
 			close;
-		}
-		else if (countitem(7762) > 39 && BaseLevel < 60) {
+		} else if (countitem(7762) > 39 && BaseLevel < 60) {
 			mes "[Baba Yaga, the Horrible]";
 			mes "Hohoho~";
 			mes "You cannot beat my friends!";
@@ -7471,17 +4182,14 @@ OnTouch:
 			warp "mosk_dun02",53,217;
 			end;
 		}
-		else{
-			mes "[Baba Yaga, the Horrible]";
-			mes "Who the hell are you?";
-			mes "You want me to kick your ass!";
-			set mos_nowinter,1;
-			close2;
-			warp "mosk_dun02",53,217;
-			end;
-		}
-	}
-	else if (mos_nowinter == 1) {
+		mes "[Baba Yaga, the Horrible]";
+		mes "Who the hell are you?";
+		mes "You want me to kick your ass!";
+		set mos_nowinter,1;
+		close2;
+		warp "mosk_dun02",53,217;
+		end;
+	} else if (mos_nowinter == 1) {
 		if (countitem(7762) > 39 && BaseLevel > 59) {
 			set mos_nowinter,2;
 			mes "[Baba Yaga, the Horrible]";
@@ -7498,8 +4206,7 @@ OnTouch:
 			mes "[Baba Yaga, the Horrible]";
 			mes "Who, who are you?";
 			close;
-		}
-		else if (countitem(7762) > 39 && BaseLevel < 60) {
+		} else if (countitem(7762) > 39 && BaseLevel < 60) {
 			mes "[Baba Yaga, the Horrible]";
 			mes "You, chicken,";
 			mes "I need to kick your ass more.";
@@ -7509,7 +4216,7 @@ OnTouch:
 				mes "I will bewitch";
 				mes "and enslave you.";
 				mes "Come here, Heeee!";
-			}else{
+			} else {
 				mes "[Baba Yaga, the Horrible]";
 				mes "Recently, I have no appetite.";
 				mes "But you will be";
@@ -7520,21 +4227,20 @@ OnTouch:
 			warp "mosk_dun02",53,217;
 			end;
 		}
-		else {
-			mes "[Baba Yaga, the Horrible]";
-			mes "I need to kick your ass more.";
-			mes "Come here";
-			mes "to play a game";
-			mes "Heeeeeeeeeeee";
-			close2;
-			warp "mosk_dun02",53,217;
-			end;
-		}
+		mes "[Baba Yaga, the Horrible]";
+		mes "I need to kick your ass more.";
+		mes "Come here";
+		mes "to play a game";
+		mes "Heeeeeeeeeeee";
+		close2;
+		warp "mosk_dun02",53,217;
+		end;
 	}
+	end;
 }
 
 mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
-	if (mos_nowinter == 0 || mos_nowinter == 1) {
+	if (!mos_nowinter || mos_nowinter == 1) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "Hohoho";
 		mes "I need to kick your ass more.";
@@ -7544,8 +4250,7 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		close2;
 		warp "mosk_dun02",53,217;
 		end;
-	}
-	else if (mos_nowinter == 2) {
+	} else if (mos_nowinter == 2) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "Let me live, leave me alone, and don't come near me.";
 		mes "Stop, I am hungry and scared.";
@@ -7611,48 +4316,25 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 			mes "I can use the magic that";
 			mes "stops winter from returning. Will you help me?";
 			next;
-			if(select("Ok, I will.:No. I don't like it.") == 1) {
-				mes "[Baba Yaga, the Horrible]";
-				mes "Ah, do you accept?";
-				mes "Thank you.";
-				next;
-				mes "[Baba Yaga, the Horrible]";
-				mes "Well, I thank you for your kindness.";
-				mes "Let's cooperate and";
-				mes "make my Secret Medicine.";
-				next;
-				mes "[Baba Yaga, the Horrible]";
-				mes "Let me see... Ah...";
-				next;
-				mes "[Baba Yaga, the Horrible]";
-				mes "It is not used often.";
-				mes "I don't remember";
-				mes "where it is.";
-				mes "Could you please come back later?";
-				set mos_nowinter,5;
-				close;
-			}else{
-				mes "[Baba Yaga, the Horrible]";
-				mes "Heeeek,";
-				mes "Just, just I need a little help.. It is really little.";
-				next;
-				mes "[Baba Yaga, the Horrible]";
-				mes "Please, don't kill me...";
-				next;
-				mes "'Hmmm, what should I do...'";
-				set mos_nowinter,4;
-				close;
-			}
-		}else{
+			if(select("Ok, I will.:No. I don't like it.") == 1) callsub S_BY_1;
 			mes "[Baba Yaga, the Horrible]";
-			mes "Akkk... What on earth did you do to me...";
+			mes "Heeeek,";
+			mes "Just, just I need a little help.. It is really little.";
 			next;
-			mes "Hmm... What do you want...";
-			set mos_nowinter,3;
+			mes "[Baba Yaga, the Horrible]";
+			mes "Please, don't kill me...";
+			next;
+			mes "'Hmmm, what should I do...'";
+			set mos_nowinter,4;
 			close;
 		}
-	}
-	else if (mos_nowinter == 3) {
+		mes "[Baba Yaga, the Horrible]";
+		mes "Akkk... What on earth did you do to me...";
+		next;
+		mes "Hmm... What do you want...";
+		set mos_nowinter,3;
+		close;
+	} else if (mos_nowinter == 3) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "Akkkk!";
 		mes "You came back..";
@@ -7686,45 +4368,23 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 			mes "I can use the magic that";
 			mes "stops winter from returning. Will you help me?";
 			next;
-			if(select("Ok, I will.:No. I don't like it.") == 1) {
-				mes "[Baba Yaga, the Horrible]";
-				mes "Ah, do you accept?";
-				mes "Thank you.";
-				next;
-				mes "[Baba Yaga, the Horrible]";
-				mes "Well, I thank you for your kindness.";
-				mes "Let's cooperate and";
-				mes "make my Secret Medicine.";
-				next;
-				mes "[Baba Yaga, the Horrible]";
-				mes "Let me see... Ah...";
-				next;
-				mes "[Baba Yaga, the Horrible]";
-				mes "It is not used often.";
-				mes "I don't remember";
-				mes "where it is.";
-				mes "Could you please come back later?";
-				set mos_nowinter,5;
-				close;
-			}else{
-				mes "[Baba Yaga, the Horrible]";
-				mes "Heeeeek,";
-				mes "Just, just I need a little help.. It is really little.";
-				next;
-				mes "[Baba Yaga, the Horrible]";
-				mes "Please, don't kill me...";
-				next;
-				mes "'Hmm... what should I do...'";
-				set mos_nowinter,4;
-				close;
-			}
+			if(select("Ok, I will.:No. I don't like it.") == 1) callsub S_BY_1;
+			mes "[Baba Yaga, the Horrible]";
+			mes "Heeeeek,";
+			mes "Just, just I need a little help.. It is really little.";
+			next;
+			mes "[Baba Yaga, the Horrible]";
+			mes "Please, don't kill me...";
+			next;
+			mes "'Hmm... what should I do...'";
+			set mos_nowinter,4;
+			close;
 		}
 		mes "[Baba Yaga, the Horrible]";
 		mes "You think more...";
 		mes "What do you want from me...";
 		close;
-	}
-	else if (mos_nowinter == 4) {
+	} else if (mos_nowinter == 4) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "You just need to help little,";
 		mes "really little...";
@@ -7732,33 +4392,12 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		mes "[Baba Yaga, the Horrible]";
 		mes "Well, did you change your mind?";
 		next;
-		if(select("Ok, let's try.:Let me think more...") == 1) {
-			mes "[Baba Yaga, the Horrible]";
-			mes "Ah, do you accept?";
-			mes "Thank you.";
-			next;
-			mes "[Baba Yaga, the Horrible]";
-			mes "Well, I thank you for your kindness.";
-			mes "Let's cooperate and";
-			mes "make my Secret Medicine.";
-			next;
-			mes "[Baba Yaga, the Horrible]";
-			mes "Let me see... Ah...";
-			next;
-			mes "[Baba Yaga, the Horrible]";
-			mes "It is not used often.";
-			mes "I don't remember";
-			mes "where it is.";
-			mes "Could you please come back later?";
-			set mos_nowinter,5;
-			close;
-		}
+		if(select("Ok, let's try.:Let me think more...") == 1) callsub S_BY_1;
 		mes "[Baba Yaga, the Horrible]";
 		mes "You think more...";
 		mes "What do you want from me...";
 		close;
-	}
-	else if (mos_nowinter == 5) {
+	} else if (mos_nowinter == 5) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "Let me see...where the season spell...";
 		next;
@@ -7806,7 +4445,7 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 			mes "you write them down.";
 			set .@plus1,1;
 			next;
-		}else{
+		} else {
 			mes "[Baba Yaga, the Horrible]";
 			mes "No, It just...";
 			next;
@@ -7864,7 +4503,7 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 			mes "^ff00001 Diamond^000000.";
 			set mos_nowinter,6;
 			next;
-		}else{
+		} else {
 			mes "[Baba Yaga, the Horrible]";
 			mes "Ok, I am repeating the items.";
 			mes "Eh, they are...";
@@ -7889,8 +4528,7 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		mes "I am preparing to make it,";
 		mes "you should get me them quickly. Cough, cough!";
 		close;
-	}
-	else if (mos_nowinter == 6) {
+	} else if (mos_nowinter == 6) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "Ehhh... You came back early.";
 		next;
@@ -7899,25 +4537,19 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		mes "Did you get";
 		mes "all of the items?";
 		next;
-		if (countitem(940) > 19 && countitem(908) > 4 && countitem(7006) > 19 && countitem(1061) > 9 && countitem(7041) > 9 && countitem(1051) > 0 && countitem(990) > 4 && countitem(938) > 9 && countitem(7097) > 9 && (countitem(730) > 0 || countitem(731) > 0 || countitem(732) > 0)) {
-			delitem 940,20;
-			delitem 908,5;
-			delitem 7006,20;
-			delitem 1061,10;
-			delitem 7041,10;
-			delitem 938,10;
-			delitem 1051,1;
-			delitem 990,5;
-			delitem 7097,10;
-			if (countitem(730) > 0) {
-				delitem 730,1;
-			}else{
-				if (countitem(731) > 0) {
-					delitem 731,1;
-				}else{
-					delitem 732,1;
-				}
+		setarray .@n, 940,20,908,5,7006,20,1061,10,7041,10,938,10,1051,1,990,5,7097,10;
+		for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2) {
+			if (countitem(.@n[.@i]) < .@n[.@i+1]) {
+				set .@f, 1;
+				break;
 			}
+		}	
+		if (!.@f && (countitem(730) || countitem(731) || countitem(732))) {
+			for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
+				delitem .@n[.@i],.@n[.@i+1];
+			if (countitem(730)) delitem 730,1;
+			else if (countitem(731)) delitem 731,1;
+			else if (countitem(732)) delitem 732,1;
 			set mos_nowinter,8;
 			mes "[Baba Yaga, the Horrible]";
 			mes "Right, you got them all.";
@@ -7960,40 +4592,38 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 			mes "I want to do something,";
 			mes "...but, my life is the priority. Yes, it is... Cough, cough!";
 			close;
-		}else{
-			mes "[Baba Yaga, the Horrible]";
-			mes "I think";
-			mes "I need more, cough, cough!";
-			next;
-			mes "[Baba Yaga, the Horrible]";
-			mes "I am not able to do";
-			mes "anything without them.";
-			mes "I am repeating the items in the list,";
-			mes "you should get them all, kaaaaak!";
-			next;
-			mes "[Baba Yaga, the Horrible]";
-			mes "^ff000020 Grasshopper's Legs,";
-			mes "5 Spawn,";
-			mes "20 Wings Of Red Bat";
-			mes "10 Sticky Mucus,";
-			mes "10 Witch Starsand^000000...";
-			next;
-			mes "[Baba Yaga, the Horrible]";
-			mes "^ff000010 Fine Grit,";
-			mes "1 Detonator,";
-			mes "5 Red Blood";
-			mes "10 Burning Hearts^000000 and";
-			mes "a 1, 2, or 3 carat";
-			mes "^ff0000Diamond^000000.";
-			next;
-			mes "[Baba Yaga, the Horrible]";
-			mes "Cough, cough.";
-			mes "Hu, I talked so much";
-			mes "that it hurts me, Kaaaak~";
-			close;
 		}
-	}
-	else if (mos_nowinter == 7) {
+		mes "[Baba Yaga, the Horrible]";
+		mes "I think";
+		mes "I need more, cough, cough!";
+		next;
+		mes "[Baba Yaga, the Horrible]";
+		mes "I am not able to do";
+		mes "anything without them.";
+		mes "I am repeating the items in the list,";
+		mes "you should get them all, kaaaaak!";
+		next;
+		mes "[Baba Yaga, the Horrible]";
+		mes "^ff000020 Grasshopper's Legs,";
+		mes "5 Spawn,";
+		mes "20 Wings Of Red Bat";
+		mes "10 Sticky Mucus,";
+		mes "10 Witch Starsand^000000...";
+		next;
+		mes "[Baba Yaga, the Horrible]";
+		mes "^ff000010 Fine Grit,";
+		mes "1 Detonator,";
+		mes "5 Red Blood";
+		mes "10 Burning Hearts^000000 and";
+		mes "a 1, 2, or 3 carat";
+		mes "^ff0000Diamond^000000.";
+		next;
+		mes "[Baba Yaga, the Horrible]";
+		mes "Cough, cough.";
+		mes "Hu, I talked so much";
+		mes "that it hurts me, Kaaaak~";
+		close;
+	} else if (mos_nowinter == 7) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "Ehhh... You came back earlier.";
 		next;
@@ -8002,24 +4632,19 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		mes "Did you get";
 		mes "all of them?";
 		next;
-		if (countitem(940) > 19 && countitem(908) > 4 && countitem(7006) > 19 && countitem(1061) > 9 && countitem(7041) > 9 && countitem(1051) > 0 && countitem(990) > 4 && countitem(7097) > 9 && (countitem(730) > 0 || countitem(731) > 0 || countitem(732) > 0)) {
-			delitem 940,20;
-			delitem 908,5;
-			delitem 7006,20;
-			delitem 1061,10;
-			delitem 7041,10;
-			delitem 1051,1;
-			delitem 990,5;
-			delitem 7097,10;
-			if (countitem(730) > 0) {
-				delitem 730,1;
-			}else{
-				if (countitem(731) > 0) {
-					delitem 731,1;
-				}else{
-					delitem 732,1;
-				}
+		setarray .@n, 940,20,908,5,7006,20,1061,10,7041,10,1051,1,990,5,7097,10;
+		for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2) {
+			if (countitem(.@n[.@i]) < .@n[.@i+1]) {
+				set .@f, 1;
+				break;
 			}
+		}
+		if (!.@f && (countitem(730) || countitem(731) || countitem(732))) {
+			for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2)
+				delitem .@n[.@i],.@n[.@i+1];
+			if (countitem(730)) delitem 730,1;
+			else if (countitem(731)) delitem 731,1;
+			else if (countitem(732)) delitem 732,1;
 			set mos_nowinter,8;
 			mes "[Baba Yaga, the Horrible]";
 			mes "Right, you got them all.";
@@ -8062,39 +4687,37 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 			mes "I want to do something,";
 			mes "...but, my life is the priority. Yes, it is... Cough, cough!";
 			close;
-		}else{
-			mes "[Baba Yaga, the Horrible]";
-			mes "I think";
-			mes "I need more, cough, cough!";
-			next;
-			mes "[Baba Yaga, the Horrible]";
-			mes "I am not able to do";
-			mes "anything without them.";
-			mes "I am repeating the items in the list,";
-			mes "you should get them all, kaaaaak!";
-			next;
-			mes "[Baba Yaga, the Horrible]";
-			mes "^ff000020 Grasshopper's Legs,";
-			mes "5 Spawn,";
-			mes "20 Wings Of Red Bat,";
-			mes "10 Witch Starsand^000000...";
-			next;
-			mes "[Baba Yaga, the Horrible]";
-			mes "^ff000010 Fine Grit,";
-			mes "1 Detonator,";
-			mes "5 Red Blood,";
-			mes "10 Burning Hearts^000000 and";
-			mes "a 1, 2, or 3 carat";
-			mes "^ff0000Diamond^000000.";
-			next;
-			mes "[Baba Yaga, the Horrible]";
-			mes "Cough, cough.";
-			mes "Hu, I talked so much";
-			mes "that it hurts me, Kaaaak~";
-			close;
 		}
-	}
-	else if (mos_nowinter == 8) {
+		mes "[Baba Yaga, the Horrible]";
+		mes "I think";
+		mes "I need more, cough, cough!";
+		next;
+		mes "[Baba Yaga, the Horrible]";
+		mes "I am not able to do";
+		mes "anything without them.";
+		mes "I am repeating the items in the list,";
+		mes "you should get them all, kaaaaak!";
+		next;
+		mes "[Baba Yaga, the Horrible]";
+		mes "^ff000020 Grasshopper's Legs,";
+		mes "5 Spawn,";
+		mes "20 Wings Of Red Bat,";
+		mes "10 Witch Starsand^000000...";
+		next;
+		mes "[Baba Yaga, the Horrible]";
+		mes "^ff000010 Fine Grit,";
+		mes "1 Detonator,";
+		mes "5 Red Blood,";
+		mes "10 Burning Hearts^000000 and";
+		mes "a 1, 2, or 3 carat";
+		mes "^ff0000Diamond^000000.";
+		next;
+		mes "[Baba Yaga, the Horrible]";
+		mes "Cough, cough.";
+		mes "Hu, I talked so much";
+		mes "that it hurts me, Kaaaak~";
+		close;
+	} else if (mos_nowinter == 8) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "It is very, very hard to return alive";
 		mes "from a lair of a dragon";
@@ -8105,9 +4728,8 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		mes "you'd better forget";
 		mes "the magic gourd bottle, cough!";
 		close;
-	}
-	else if (mos_nowinter == 9) {
-		if (countitem(7761) > 0) {
+	} else if (mos_nowinter == 9) {
+		if (countitem(7761)) {
 			mes "[Baba Yaga, the Horrible]";
 			mes "Akkkk?";
 			mes "Did you really bring it";
@@ -8162,20 +4784,18 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 			mes "Take care of yourself, cough, cough.";
 			set mos_nowinter,10;
 			close;
-		}else{
-			mes "[Baba Yaga, the Horrible]";
-			mes "It is very, very hard to return alive";
-			mes "from a lair of a dragon";
-			mes "without strength and courage.";
-			next;
-			mes "[Baba Yaga, the Horrible]";
-			mes "Unless you want to be killed";
-			mes "you'd better forget";
-			mes "the magic gourd bottle, cough!";
-			close;
 		}
-	}
-	else if (mos_nowinter == 10) {
+		mes "[Baba Yaga, the Horrible]";
+		mes "It is very, very hard to return alive";
+		mes "from a lair of a dragon";
+		mes "without strength and courage.";
+		next;
+		mes "[Baba Yaga, the Horrible]";
+		mes "Unless you want to be killed";
+		mes "you'd better forget";
+		mes "the magic gourd bottle, cough!";
+		close;
+	} else if (mos_nowinter == 10) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "To make the magic,";
 		mes "I need you to contain";
@@ -8195,8 +4815,7 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		mes "Well, take care of yourself.";
 		mes "Cough, cough, cough!";
 		close;
-	}
-	else if (mos_nowinter > 10 && mos_nowinter < 14) {
+	} else if (mos_nowinter > 10 && mos_nowinter < 14) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "My place has been revealed, cough, cough.";
 		mes "because of you!";
@@ -8207,27 +4826,25 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		mes "surrounding here so that";
 		mes "I cannot go out.";
 		close;
-	}
-	else if (mos_nowinter == 14) {
+	} else if (mos_nowinter == 14) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "Did you do";
 		mes "what I told";
 		mes "you to do?";
 		next;
-		if (countitem(7761) > 0) {
-			delitem 7761,1;
-			mes "[Baba Yaga, the Horrible]";
-			mes "Anyway, give me the bottle and";
-			mes "think about";
-			mes "what to do, cough!";
-			next;
-		}else{
+		if (!countitem(7761)) {
 			mes "[Baba Yaga, the Horrible]";
 			mes "Where is the Gourd Bottle?";
 			mes "I can't do anything without it.";
 			mes "Cough, cough!";
 			close;
 		}
+		delitem 7761,1;
+		mes "[Baba Yaga, the Horrible]";
+		mes "Anyway, give me the bottle and";
+		mes "think about";
+		mes "what to do, cough!";
+		next;
 		mes "[Baba Yaga, the Horrible]";
 		mes "This bottle will be";
 		mes "used later and now,";
@@ -8265,8 +4882,7 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		mes "Cough!";
 		set mos_nowinter,15;
 		close;
-	}
-	else if (mos_nowinter == 15 || mos_nowinter == 16) {
+	} else if (mos_nowinter == 15 || mos_nowinter == 16) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "Magic does not come from";
 		mes "something mysterious.";
@@ -8283,8 +4899,7 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		mes "put the materials in the pot and";
 		mes "boil them for some time.";
 		close;
-	}
-	else if (mos_nowinter == 17) {
+	} else if (mos_nowinter == 17) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "Ehmmm...";
 		mes "Don't you think that";
@@ -8295,8 +4910,7 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		mes "We still have enough materials.";
 		set mos_nowinter,16;
 		close;
-	}
-	else if (mos_nowinter == 18) {
+	} else if (mos_nowinter == 18) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "Let me see, hmm!";
 		next;
@@ -8318,8 +4932,7 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		getitem 7765,1;
 		set mos_nowinter,19;
 		close;
-	}
-	else if (mos_nowinter == 19) {
+	} else if (mos_nowinter == 19) {
 		mes "[Baba Yaga, the Horrible]";
 		mes "You just drop the bottle";
 		mes "in the middle of the village";
@@ -8335,16 +4948,35 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		mes "But, don't come back to me, cough, cough.";
 		close;
 	}
-	else {
-		mes "[Baba Yaga, the Horrible]";
-		mes "Hey,";
-		mes "I told you";
-		mes "to never come back, cough.";
-		next;
-		mes "[Baba Yaga, the Horrible]";
-		mes "Stop disturbing me.";
-		close;
-	}
+	mes "[Baba Yaga, the Horrible]";
+	mes "Hey,";
+	mes "I told you";
+	mes "to never come back, cough.";
+	next;
+	mes "[Baba Yaga, the Horrible]";
+	mes "Stop disturbing me.";
+	close;
+
+S_BY_1:
+	mes "[Baba Yaga, the Horrible]";
+	mes "Ah, do you accept?";
+	mes "Thank you.";
+	next;
+	mes "[Baba Yaga, the Horrible]";
+	mes "Well, I thank you for your kindness.";
+	mes "Let's cooperate and";
+	mes "make my Secret Medicine.";
+	next;
+	mes "[Baba Yaga, the Horrible]";
+	mes "Let me see... Ah...";
+	next;
+	mes "[Baba Yaga, the Horrible]";
+	mes "It is not used often.";
+	mes "I don't remember";
+	mes "where it is.";
+	mes "Could you please come back later?";
+	set mos_nowinter,5;
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -8459,8 +5091,7 @@ mosk_in,217,45,0	script	#book_russia	111,{
 		mes "I'll mark this page so that I";
 		mes "know where to read next time.";
 		close;
-	}
-	else if (mos_nowinter == 16) {
+	} else if (mos_nowinter == 16) {
 		if(select("Read from the preface.:Read from the marked page.") == 1) {
 			mes "...Therefore, this spell is";
 			mes "particularly good among our mighty ones.";
@@ -8585,100 +5216,48 @@ mosk_in,217,45,0	script	#book_russia	111,{
 		mes "the place where you want to affect,";
 		mes "the changing of the seasons.";
 		close;
-	}
-	else if (mos_nowinter > 14) {
+	} else if (mos_nowinter > 14) {
 		mes "-This book is the magic book that";
 		mes "helped me make the medicine, but,";
 		mes "I never want to read it again.-";
 		close;
 	}
-	else {
-		mes "-It's an unusually large book laid down, open.-";
-		close;
-	}
+	mes "-It's an unusually large book laid down, open.-";
+	close;
 }
 
 //----------------------------------------------------------------------------
 // Mixing Pot
 //----------------------------------------------------------------------------
 mosk_in,221,43,0	script	#bowl	111,{
-	if (mos_nowinter == 16) {
-		mes "-It is a very dirty pot.";
-		mes "Something is boiling";
-		mes "Baba Yaga might have done something";
-		mes "with it.";
-		mes "Well, let's get it started.-";
+	if (mos_nowinter != 16) end;
+	mes "-It is a very dirty pot.";
+	mes "Something is boiling";
+	mes "Baba Yaga might have done something";
+	mes "with it.";
+	mes "Well, let's get it started.-";
+	next;
+	setarray .@m$, "Powder Of Wing Of Bat","Liquid Of Spawn","Grasshopper's Leg","Starsand Of Witch","Fine Grit";
+	while(1) {
+		mes "-Something is still being boiled in the pot.";
+		mes "What am I going to do?-";
 		next;
-		while(1) {
-			mes "-Something is still being boiled in the pot.";
-			mes "What am I going to do?-";
-			next;
-			switch(select("Put the materials in it.:Pour water in it.:Stir it up.:It is over!")) {
+		switch(select("Put the materials in it.:Pour water in it.:Stir it up.:It is over!")) {
 			case 1:
-				switch(select("Powder Of Wing Of Bat:Liquid Of Spawn:Grasshopper's Leg:Starsand Of Witch:Fine Grit")) {
-				case 1:
-					if (.@bat > 0) {
-						mes "-I put the Powder Of Wing Of Bat in the pot.";
-						mes "Its smell slightly changes.-";
-						specialeffect EF_POISONHIT;
-						set .@nankai,.@nankai+1;
-					}else{
-						mes "-I put the Powder Of Wing Of Bat in the pot.";
-						mes "It's color slightly changes.-";
-						specialeffect EF_SMOKE;
-						set .@bat,.@bat+1;
-						set .@maho,.@maho+1;
-						set .@nankai,.@nankai+1;
-					}
-					next;
-					break;
-				case 2:
-					if (.@mush > 0) {
-						mes "-I put the Liquid Of Spawn in the pot.";
-						mes "Its smell slightly changes.-";
-						specialeffect EF_POISONHIT;
-						set .@nankai,.@nankai+1;
-					}else{
-						mes "-I put the Liquid Of Spawn in the pot.";
-						mes "It's color slightly changes.-";
-						specialeffect EF_SMOKE;
-						set .@mush,.@mush+1;
-						set .@maho,.@maho+1;
-						set .@nankai,.@nankai+1;
-					}
-					next;
-					break;
-				case 3:
-					if (.@locker > 0) {
-						mes "-I put the Grasshopper's Leg in the pot.";
-						mes "Its smell slightly changes.-";
-						specialeffect EF_POISONHIT;
-						set .@nankai,.@nankai+1;
-					}else{
-						mes "-I put the Grasshopper's Leg in the pot.";
-						mes "It's color slightly changes.-";
-						specialeffect EF_SMOKE;
-						set .@locker,.@locker+1;
-						set .@maho,.@maho+1;
-						set .@nankai,.@nankai+1;
-					}
-					next;
-					break;
-				case 4:
-					specialeffect EF_POISONHIT;
-					set .@nankai,.@nankai+1;
-					mes "-I put the Starsand Of Witch in the pot.";
-					mes "Its smell slightly changes.-";
-					next;
-					break;
-				case 5:
-					specialeffect EF_POISONHIT;
-					set .@nankai,.@nankai+1;
-					mes "-I put the Fine Grit in the pot.";
-					mes "Its smell slightly changes.-";
-					next;
-					break;
+				set .@m, select (implode(.@m$,":")) - 1;
+				if ((!.@m && .@bat) || (.@m == 1 && .@mush) || (.@m == 2 && .@locker)) specialeffect EF_POISONHIT;
+				else {
+					specialeffect EF_SMOKE;
+					if (!.@m) set .@bat,.@bat+1;
+					if (.@m == 1) set .@mush,.@mush+1;
+					if (.@m == 2) set .locker,.@locker+1;
+					set .@maho,.@maho+1;
 				}
+				if (.@m >= 3) specialeffect EF_POISONHIT;
+				set .@nankai,.@nankai+1;
+				mes "-I put the "+.@m$[.@m]+" in the pot.";
+				mes "Its smell slightly changes.-";
+				next;
 				break;
 			case 2:
 				specialeffect EF_POISONHIT;
@@ -8705,296 +5284,159 @@ mosk_in,221,43,0	script	#bowl	111,{
 				mes "the work has been done.";
 				set mos_nowinter,17;
 				close;
-			}
-			if (.@nankai == 3)
-				break;
 		}
-		specialeffect EF_BUBBLE;
-		mes "-The liquid has been changed";
-		mes "and is now bubbling.";
-		mes "It seems to have shrunk,";
-		mes "but not by much.-";
-		next;
-		mes "-Anyway, the first step is done";
-		mes "let's go on the next stage.-";
+		if (.@nankai == 3) break;
+	}
+	specialeffect EF_BUBBLE;
+	mes "-The liquid has been changed";
+	mes "and is now bubbling.";
+	mes "It seems to have shrunk,";
+	mes "but not by much.-";
+	next;
+	mes "-Anyway, the first step is done";
+	mes "let's go on the next stage.-";
+	next;
+	while(1) {
+		mes "-Well, What am I going to do?-";
 		next;
-		while(1) {
-			mes "-Well, What am I going to do?-";
-			next;
-			switch(select("Put the materials in it.:Pour water in it.:Stir it up.:It is over!")) {
-			case 1:
-				switch(select("Powder Of Wing Of Bat:Liquid Of Spawn:Grasshopper's Leg:Starsand Of Witch:Fine Grit")) {
-				case 1:
-					specialeffect EF_POISONHIT;
-					set .@nankai,.@nankai+1;
-					mes "-I put the Powder Of Wing Of Bat in it.";
-					mes "It's smell drastically changes.-";
-					next;
-					break;
-				case 2:
-					specialeffect EF_POISONHIT;
-					set .@nankai,.@nankai+1;
-					mes "-I put the Liquid Of Spawn in the pot.";
-					mes "It's smell drastically changes.-";
-					next;
-					break;
-				case 3:
-					specialeffect EF_POISONHIT;
-					set .@nankai,.@nankai+1;
-					mes "-I put the Grasshopper's Leg in the pot.";
-					mes "It's smell drastically changes.-";
-					next;
-					break;
-				case 4:
-					if (.@nankai == 5 || .@nankai == 6) {
-						if (.@star > 0) {
-							specialeffect EF_POISONHIT;
-							mes "-I put the Starsand Of Witch in the pot.";
-							mes "Its color slightly changes.-";
-							next;
-						}else{
-							mes "-I put the Starsand Of Witch in the pot.";
-							mes "Its smell slightly changes.-";
-							specialeffect EF_SMOKE;
-							set .@maho,.@maho+1;
-							set .@star,.@star+1;
-							next;
-						}
-					}else{
-						specialeffect EF_POISONHIT;
-						mes "-I put the Starsand Of Witch in the pot.";
-						mes "Its color slightly changes.-";
-						set .@star,.@star+1;
-						next;
-					}
-					set .@nankai,.@nankai+1;
-					break;
-				case 5:
-					if (.@nankai == 5 || .@nankai == 6) {
-						if (.@sand > 0) {
-							specialeffect EF_POISONHIT;
-							mes "-I put the Fine Grit in the pot.";
-							mes "Its color slightly changes.-";
-							next;
-						}else{
-							mes "-I put the Fine Grit in the pot.";
-							mes "Its smell slightly changes.-";
-							specialeffect EF_SMOKE;
-							set .@sand,.@sand+1;
-							set .@maho,.@maho+1;
-							next;
-						}
-					}else{
-						specialeffect EF_POISONHIT;
-						mes "-I put the Fine Grit in the pot.";
-						mes "Its color slightly changes.-";
-						set .@sand,@sand+1;
-						next;
+		switch(select("Put the materials in it.:Pour water in it.:Stir it up.:It is over!")) {
+		case 1:
+			set .@m, select (implode(.@m$,":")) - 1; 
+			if (.@m >= 3) {
+				if (.@nankai == 5 || .@nankai == 6) {
+					if ((.@m == 3 && .@star) || (.@m == 4 && .@sand)) specialeffect EF_POISONHIT;
+					else {
+						specialeffect EF_SMOKE;
+						set .@maho,.@maho+1;
+						if (.@m == 3) set .@star,.@star+1;
+						if (.@m == 4) set .@sand,.@sand+1;
+						set .@w, 1;
 					}
-					set .@nankai,.@nankai+1;
+				} else {
+					specialeffect EF_POISONHIT;
+					if (.@m == 3) set .@star,.@star+1;
+					if (.@m == 4) set .@sand,.@sand+1;
 				}
-				break;
-			case 2:
-				if (.@nankai == 3) {
-					mes "-I pour water in the pot a little.";
-					mes "The boiling sounds stronger as if";
-					mes "something in the cloudy liquid";
-					mes "has changed.-";
-					specialeffect EF_DRAGONSMOKE;
+				next;
+			} else specialeffect EF_POISONHIT;
+			set .@nankai,.@nankai+1;
+			mes "-I put the "+.@m$[.@m]+" in the pot.";
+			mes (.@m <= 2)?"It's smell drastically changes.-":"Its "+((.@w)?"smell":"color")+" slightly changes.-";
+			break;
+		case 2:
+			if (.@nankai == 3) {
+				mes "-I pour water in the pot a little.";
+				mes "The boiling sounds stronger as if";
+				mes "something in the cloudy liquid";
+				mes "has changed.-";
+				specialeffect EF_DRAGONSMOKE;
+				set .@maho,.@maho+1;
+				set .@nankai,.@nankai+1;
+				next;
+			} else {
+				specialeffect EF_POISONHIT;
+				mes "-I pour water in the pot and, the liquid gets thin.-";
+				set .@nankai,.@nankai+1;
+				next;
+			}
+			break;
+		case 3:
+			if (.@nankai == 4) {
+				mes "["+strcharinfo(0)+"]";
+				mes "Ok, I will stir it up this time.";
+				mes "How many times should I..?";
+				next;
+				input .@input;
+				if (.@input == 20) {
+					mes "-It must be 20 times.-";
+					next;
+					specialeffect EF_WIND;
+					mes "-Stirring up makes it";
+					mes "brighter and";
+					mes "its smell gets";
+					mes "more bearable.";
 					set .@maho,.@maho+1;
 					set .@nankai,.@nankai+1;
 					next;
-				}else{
-					specialeffect EF_POISONHIT;
-					mes "-I pour water in the pot and, the liquid gets thin.-";
-					set .@nankai,.@nankai+1;
+				} else if (!.@input) {
+					mes "-I won't stir it up.-";
 					next;
-				}
-				break;
-			case 3:
-				if (.@nankai == 4) {
-					mes "["+strcharinfo(0)+"]";
-					mes "Ok, I will stir it up this time.";
-					mes "How many times should I..?";
+				} else if (.@input > 100) {
+					mes "-It won't be able";
+					mes "to stir so many times.";
+					mes "Let me think again.-";
 					next;
-					input .@input;
-					if (.@input == 20) {
-						mes "-It must be 20 times.-";
-						next;
-						specialeffect EF_WIND;
-						mes "-Stirring up makes it";
-						mes "brighter and";
-						mes "its smell gets";
-						mes "more bearable.";
-						set .@maho,.@maho+1;
-						set .@nankai,.@nankai+1;
-						next;
-					}
-					else if (.@input == 0) {
-						mes "-I won't stir it up.-";
-						next;
-					}
-					else if (.@input > 100) {
-						mes "-It won't be able";
-						mes "to stir so many times.";
-						mes "Let me think again.-";
-						next;
-					}
-					else {
-						mes "-Yes, it must be " + .@input + " times.-";
-						next;
-						mes "-I stir it up really hard.";
-						mes "It is boiled.-";
-						set .@nankai,.@nankai+1;
-						next;
-					}
-				}else{
-					mes "-Bubble, bubble-";
+				} else {
+					mes "-Yes, it must be " + .@input + " times.-";
 					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "Something changed?";
+					mes "-I stir it up really hard.";
+					mes "It is boiled.-";
 					set .@nankai,.@nankai+1;
 					next;
 				}
-				break;
-			case 4:
+			} else {
+				mes "-Bubble, bubble-";
+				next;
 				mes "["+strcharinfo(0)+"]";
-				mes "I will tell Baba Yaga that";
-				mes "it has been done.";
-				set mos_nowinter,17;
-				specialeffect EF_POISONATTACK;
-				close;
+				mes "Something changed?";
+				set .@nankai,.@nankai+1;
+				next;
 			}
-			if (.@nankai == 7)
-				break;
+			break;
+		case 4:
+			mes "["+strcharinfo(0)+"]";
+			mes "I will tell Baba Yaga that";
+			mes "it has been done.";
+			set mos_nowinter,17;
+			specialeffect EF_POISONATTACK;
+			close;
 		}
-		mes "-I am sure that the book told me";
-		mes "to wait for some time.-";
-		next;
-		mes "............";
-		next;
-		mes "............";
-		next;
-		mes "-The smell of the liquid boiling in";
-		mes "the pot has changed enough.";
-		mes "Let's go on to the next stage.-";
+		if (.@nankai == 7) break;
+	}
+	mes "-I am sure that the book told me";
+	mes "to wait for some time.-";
+	next;
+	mes "............";
+	next;
+	mes "............";
+	next;
+	mes "-The smell of the liquid boiling in";
+	mes "the pot has changed enough.";
+	mes "Let's go on to the next stage.-";
+	next;
+	set .@w, 0;
+	while(1) {
+		mes "-Well, What am I going to do?-";
 		next;
-		while(1) {
-			mes "-Well, What am I going to do?-";
-			next;
-			switch(select("Put the materials in it.:Pour water in it.:Stir it up.:It is over!")) {
+		switch(select("Put the materials in it.:Pour water in it.:Stir it up.:It is over!")) {
 			case 1:
 				if (.@nankai != 11) {
-					switch(select("Witched Starsand:Fine Grit:Detonator:Red Blood:Burning Heart")) {
-					case 1:
-						specialeffect EF_POISONHIT;
-						set .@nankai,.@nankai+1;
-						mes "-I put the Starsand Of Witch in the pot.";
-						mes "Its smell slightly changes.-";
-						next;
-						break;
-					case 2:
-						specialeffect EF_POISONHIT;
-						set .@nankai,.@nankai+1;
-						mes "I put the Fine Grit in the pot.";
-						mes "Its smell slightly changes.-";
-						next;
-						break;
-					case 3:
-						if (.@nankai == 9) {
-							mes "-I put the Detonator in the pot.";
-							mes "The smell has been changed a little.-";
-							specialeffect EF_SMOKE;
-							set .@maho,.@maho+1;
-							set .@nankai,.@nankai+1;
-							next;
-						}else{
-							specialeffect EF_POISONHIT;
-							mes "-I put the Detonator in the pot.";
-							mes "The smell gets worse.-";
-							set .@nankai,.@nankai+1;
-							next;
-						}
-						break;
-					case 4:
-						if (.@nankai == 8) {
-							mes "-I put the Red Blood in the pot.-";
-							mes "The smell has been changed a little.-";
-							specialeffect EF_SMOKE;
-							set .@maho,.@maho+1;
-							set .@nankai,.@nankai+1;
-							next;
-						}else{
-							specialeffect EF_POISONHIT;
-							mes "-I put the Red Blood in the pot.";
-							mes "The smell gets worse.-";
-							set .@nankai,.@nankai+1;
-							next;
-						}
-						break;
-					case 5:
-						if (.@nankai == 10) {
-							mes "-I put the Burning Heart in the pot.";
-							mes "The smell has been changed a little.-";
-							specialeffect EF_SMOKE;
-							set .@maho,.@maho+1;
-							set .@nankai,.@nankai+1;
-							next;
-						}else{
-							specialeffect EF_POISONHIT;
-							mes "-I put the Burning Heart in the pot.";
-							mes "The smell gets worse.-";
-							set .@nankai,.@nankai+1;
-							next;
-						}
-					}
-				}else{
-					switch(select("Witched Starsand:Fine Grit:Detonator:Red Blood:Burning Heart:Piece Of Diamond")) {
-					case 1:
-						set .@nankai,.@nankai+1;
-						specialeffect EF_POISONHIT;
-						mes "-I put the Starsand Of Witch in the pot.";
-						mes "The smell gets worse.-";
-						next;
-						break;
-					case 2:
-						set .@nankai,.@nankai+1;
-						specialeffect EF_POISONHIT;
-						mes "I put the Fine Grit in the pot.";
-						mes "The smell gets worse.-";
-						next;
-						break;
-					case 3:
-						mes "-I put the Detonator in the pot.";
-						mes "The smell gets worse.-";
-						specialeffect EF_POISONHIT;
-						set .@nankai,.@nankai+1;
-						next;
-						break;
-					case 4:
-						mes "-I put the Red Blood in the pot.";
-						mes "The smell gets worse.-";
-						specialeffect EF_POISONHIT;
-						set .@nankai,.@nankai+1;
-						next;
-						break;
-					case 5:
-						mes "-I put the Burning Heart in the pot.";
-						mes "The smell gets better.-";
-						specialeffect EF_POISONHIT;
-						set .@nankai,.@nankai+1;
-						next;
-						break;
-					case 6:
-						mes "-I put a Piece Of Diamond in the pot.";
-						mes "The solution alters in color.-";
+					setarray .@m2$, "Witched Starsand","Fine Grit","Detonator","Red Blood","Burning Heart";
+					set .@m, select (implode(.@m2$,":")) - 1;
+					if ((.@m == 2 && .@nankai == 9) || (.@m == 3 && .@nankai == 8) || (.@m == 4 && .@nankai == 10)) {
 						specialeffect EF_SMOKE;
 						set .@maho,.@maho+1;
-						set .@nankai,.@nankai+1;
-						next;
-						break;
+					} else {
+						specialeffect EF_POISONHIT;
+						set .@w, 1;
+					}
+					if (.@m <= 1) specialeffect EF_POISONHIT;
+					set .@nankai,.@nankai+1;
+					mes "-I put the "+.@m2$[.@m]+" in the pot.";
+					mes (.@m <= 1)?"Its smell slightly changes.-":((.@w)?"The smell gets worse.-":"The smell has been changed a little.-");
+				} else {
+					setarray .@m3$, "Witched Starsand","Fine Grit","Detonator","Red Blood","Burning Heart","Piece Of Diamond";
+					set .@m, select (implode(.@m3$,":")) - 1;
+					if (.@m != 5) specialeffect EF_POISONHIT;
+					else {
+						set .@maho,.@maho+1; 
+						specialeffect EF_SMOKE; 
 					}
+					set .@nankai,.@nankai+1;
+					mes "-I put "+((.@m == 5)?"a":"the")+" "+.@m3$[.@m]+" in the pot.";
+					mes (.@m == 5)?"The solution alters in color.-":"The smell gets worse.-";
 				}
+				next;
 				break;
 			case 2:
 				set .@nankai,.@nankai+1;
@@ -9018,18 +5460,15 @@ mosk_in,221,43,0	script	#bowl	111,{
 						set .@maho,.@maho+1;
 						set .@nankai,.@nankai+1;
 						next;
-					}
-					else if (.@input == 0) {
+					} else if (.@input == 0) {
 						mes "-I won't stir it up.-";
 						next;
-					}
-					else if (.@input > 100) {
+					} else if (.@input > 100) {
 						mes "-It won't be to";
 						mes "stir so many times.";
 						mes "Let me think again.-";
 						next;
-					}
-					else {
+					} else {
 						mes "-Yes, it must be " + .@input + " times.-";
 						next;
 						mes "-I stir it up really hard.";
@@ -9037,7 +5476,7 @@ mosk_in,221,43,0	script	#bowl	111,{
 						set .@nankai,.@nankai+1;
 						next;
 					}
-				}else{
+				} else {
 					mes "-Bubble, bubble-";
 					next;
 					mes "["+strcharinfo(0)+"]";
@@ -9047,20 +5486,16 @@ mosk_in,221,43,0	script	#bowl	111,{
 				}
 				break;
 			case 4:
+				mes "-It seems that the work is over.";
+				mes "I need to show this to Baba Yaga.-";
 				if (.@maho == 12) {
-					mes "-It seems that the work is over.";
-					mes "I need to show this to Baba Yaga.-";
 					set mos_nowinter,18;
 					specialeffect EF_GASPUSH;
 					close;
-				}else{
-					mes "-It seems that the work is over.";
-					mes "I need to show this to Baba Yaga.-";
-					specialeffect EF_POISONATTACK;
-					set mos_nowinter,17;
-					close;
 				}
-			}
+				specialeffect EF_POISONATTACK;
+				set mos_nowinter,17;
+				close;
 		}
 	}
 }
@@ -9069,44 +5504,40 @@ mosk_in,221,43,0	script	#bowl	111,{
 // Center of Town
 //----------------------------------------------------------------------------
 moscovia,224,190,0	script	#nowinterplz	844,{
-	if (mos_nowinter == 19) {
-		if (countitem(7765) > 0) {
-			mes "["+strcharinfo(0)+"]";
-			mes "This place must be";
-			mes "the center of town...";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Ok, let's do it!";
-			next;
-			mes "-I drop the magic bottle";
-			mes "containing Baba Yaga's";
-			mes "Secret Medicine.-";
-			delitem 7765,1;
-			specialeffect EF_BARRIER;
-			set mos_nowinter,20;
-			next;
-			mes "-You feel like your";
-			mes "body is heating up.";
-			mes "It's much hotter";
-			mes "than before.-";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "I'm sure that the season has changed";
-			mes "But how can I confirm this?";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "First I'm going to see the Csar.";
-			mes "He would like to hear about this.";
-			close;
-		}else{
-			mes "["+strcharinfo(0)+"]";
-			mes "Ah, where did I place";
-			mes "the magic bottle that Baba Yaga gave to me...";
-			close;
-		}
-	}else{
-		end;
+	if (mos_nowinter != 19) end;
+	if (countitem(7765)) {
+		mes "["+strcharinfo(0)+"]";
+		mes "This place must be";
+		mes "the center of town...";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Ok, let's do it!";
+		next;
+		mes "-I drop the magic bottle";
+		mes "containing Baba Yaga's";
+		mes "Secret Medicine.-";
+		delitem 7765,1;
+		specialeffect EF_BARRIER;
+		set mos_nowinter,20;
+		next;
+		mes "-You feel like your";
+		mes "body is heating up.";
+		mes "It's much hotter";
+		mes "than before.-";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "I'm sure that the season has changed";
+		mes "But how can I confirm this?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "First I'm going to see the Csar.";
+		mes "He would like to hear about this.";
+		close;
 	}
+	mes "["+strcharinfo(0)+"]";
+	mes "Ah, where did I place";
+	mes "the magic bottle that Baba Yaga gave to me...";
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -9123,41 +5554,36 @@ moscovia,252,203,5	script	A Little Girl#mos1	958,{
 			mes "My mom told me.";
 			mes "that she is real.";
 			close;
-		}else{
-			set .@kid,rand(1,100);
-			select("Do you like the warm weather, little girl?");
-			if (.@kid > 70) {
-				mes "[Yosefina]";
-				mes "Yes, I like it very much~";
-				mes "I never want it to leave. I don't want winter to come.";
-				specialeffect2 EF_SUMMONSLAVE;
-				set mos_kid,1;
-				if (mos_middle == 1 && mos_elder == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Yosefina]";
-				mes "Yes, I like it very much~";
-				mes "But, as soon as the sun sets I must go back home.";
-				next;
-				mes "[Yosefina]";
-				mes "Baba Yaga kidnaps";
-				mes "bad kids wandering";
-				mes "in the night, I heard.";
-				close;
-			}
 		}
-	}else{
+		set .@kid,rand(1,100);
+		select("Do you like the warm weather, little girl?");
+		if (.@kid > 70) {
+			mes "[Yosefina]";
+			mes "Yes, I like it very much~";
+			mes "I never want it to leave. I don't want winter to come.";
+			specialeffect2 EF_SUMMONSLAVE;
+			set mos_kid,1;
+			if (mos_middle == 1 && mos_elder == 1) set mos_nowinter,11;
+			close;
+		}
 		mes "[Yosefina]";
-		mes "Baba Yaga, the Horrible Cannibal";
-		mes "is living outside the town.";
+		mes "Yes, I like it very much~";
+		mes "But, as soon as the sun sets I must go back home.";
 		next;
 		mes "[Yosefina]";
-		mes "My mom told me.";
-		mes "that she is real.";
+		mes "Baba Yaga kidnaps";
+		mes "bad kids wandering";
+		mes "in the night, I heard.";
 		close;
 	}
+	mes "[Yosefina]";
+	mes "Baba Yaga, the Horrible Cannibal";
+	mes "is living outside the town.";
+	next;
+	mes "[Yosefina]";
+	mes "My mom told me.";
+	mes "that she is real.";
+	close;
 }
 
 moscovia,233,204,3	script	A Young Man#mos2	968,{
@@ -9168,38 +5594,33 @@ moscovia,233,204,3	script	A Young Man#mos2	968,{
 			mes "Spring is coming";
 			mes "to my mind...";
 			close;
-		}else{
-			select("You don't like winter, do you?");
-			set .@kid,rand(1,100);
-			if (.@kid > 70) {
-				mes "[Fedor]";
-				mes "No, I don't like the cold winter.";
-				mes "And I get angry when";
-				mes "seeing couples.";
-				specialeffect2 EF_SUMMONSLAVE;
-				set mos_middle,1;
-				if (mos_kid == 1 && mos_elder == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Fedor]";
-				mes "Huuuu, I wish I could have a girlfriend";
-				mes "I would be able to enjoy the warm sunlight better...";
-				next;
-				mes "[Fedor]";
-				mes "Who are you?";
-				mes "Don't make matters worse!";
-				close;
-			}
 		}
-	}else{
+		select("You don't like winter, do you?");
+		set .@kid,rand(1,100);
+		if (.@kid > 70) {
+			mes "[Fedor]";
+			mes "No, I don't like the cold winter.";
+			mes "And I get angry when";
+			mes "seeing couples.";
+			specialeffect2 EF_SUMMONSLAVE;
+			set mos_middle,1;
+			if (mos_kid == 1 && mos_elder == 1) set mos_nowinter,11;
+			close;
+		}
+		mes "[Fedor]";
+		mes "Huuuu, I wish I could have a girlfriend";
+		mes "I would be able to enjoy the warm sunlight better...";
+		next;
 		mes "[Fedor]";
-		mes "Finally, winter is over.";
-		mes "Spring is coming";
-		mes "to my mind...";
+		mes "Who are you?";
+		mes "Don't make matters worse!";
 		close;
 	}
+	mes "[Fedor]";
+	mes "Finally, winter is over.";
+	mes "Spring is coming";
+	mes "to my mind...";
+	close;
 }
 
 moscovia,219,229,5	script	A Middle-Aged Man#mos3	964,{
@@ -9214,41 +5635,35 @@ moscovia,219,229,5	script	A Middle-Aged Man#mos3	964,{
 			mes "It doesn't matter to us";
 			mes "how cold the winter is!";
 			close;
-		}else{
-			set .@kid,rand(1,100);
-			select("Whoever likes the winter?");
-			if (.@kid > 70) {
-				mes "[Viktor]";
-				mes "Tell me about it!";
-				mes "Everyone will be sad";
-				mes "when it comes again.";
-				mes "I don't want winter to come.";
-				specialeffect2 EF_SUMMONSLAVE;
-				set mos_elder,1;
-				if (mos_kid == 1 && mos_middle == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Viktor]";
-				mes "Hmm, do you think so...";
-				mes "I am too familiar with both";
-				mes "summer and winter to care much for";
-				mes "one over the other.";
-				close;
-			}
 		}
-	}else{
-		mes "[Viktor]";
-		mes "Our people are very, very";
-		mes "proud of their strength and";
-		mes "invincible spirits.";
-		next;
+		select("Whoever likes the winter?");
+		if (rand(1,100) > 70) {
+			mes "[Viktor]";
+			mes "Tell me about it!";
+			mes "Everyone will be sad";
+			mes "when it comes again.";
+			mes "I don't want winter to come.";
+			specialeffect2 EF_SUMMONSLAVE;
+			set mos_elder,1;
+			if (mos_kid == 1 && mos_middle == 1) set mos_nowinter,11;
+			close;
+		}
 		mes "[Viktor]";
-		mes "It doesn't matter to us";
-		mes "how cold the winter is!";
+		mes "Hmm, do you think so...";
+		mes "I am too familiar with both";
+		mes "summer and winter to care much for";
+		mes "one over the other.";
 		close;
 	}
+	mes "[Viktor]";
+	mes "Our people are very, very";
+	mes "proud of their strength and";
+	mes "invincible spirits.";
+	next;
+	mes "[Viktor]";
+	mes "It doesn't matter to us";
+	mes "how cold the winter is!";
+	close;
 }
 
 moscovia,255,203,3	script	A Little Boy#mos4	962,{
@@ -9264,66 +5679,60 @@ moscovia,255,203,3	script	A Little Boy#mos4	962,{
 			mes "Where is your gold-shining sword and shield?";
 			mes "Where?";
 			close;
-		}else{
+		}
+		mes "[Vasili]";
+		mes "Wow, he is";
+		mes "an adventurer, an adventurer!!";
+		next;
+		mes "[Vasili]";
+		mes "Why did you come here?";
+		mes "Don't you have any colleague?";
+		mes "I heard that the heroes in epics were tall,";
+		mes "but, why are you so small?";
+		mes "Where is your gold-shining sword?";
+		mes "I heard that the armor glittered white,";
+		mes "but, why don't you have on the armor?";
+		mes "Won't you go for another adventure?";
+		mes "How can you do it in the cold and snowy winter?";
+		next;
+		select("I will go if it gets warm.");
+		if (rand(1,100) > 70) {
 			mes "[Vasili]";
-			mes "Wow, he is";
-			mes "an adventurer, an adventurer!!";
+			mes "Will you? I will also";
+			mes "go out for adventures";
+			mes "with shining armor and";
+			mes "a long and heavy sword";
+			mes "some day.";
 			next;
+			specialeffect2 EF_SUMMONSLAVE;
 			mes "[Vasili]";
-			mes "Why did you come here?";
-			mes "Don't you have any colleague?";
-			mes "I heard that the heroes in epics were tall,";
-			mes "but, why are you so small?";
-			mes "Where is your gold-shining sword?";
-			mes "I heard that the armor glittered white,";
-			mes "but, why don't you have on the armor?";
-			mes "Won't you go for another adventure?";
-			mes "How can you do it in the cold and snowy winter?";
-			next;
-			set .@kid,rand(1,100);
-			select("I will go if it gets warm.");
-			if (.@kid > 70) {
-				mes "[Vasili]";
-				mes "Will you? I will also";
-				mes "go out for adventures";
-				mes "with shining armor and";
-				mes "a long and heavy sword";
-				mes "some day.";
-				next;
-				specialeffect2 EF_SUMMONSLAVE;
-				mes "[Vasili]";
-				mes "If winter is gone,";
-				mes "it is much easier to go on adventures.";
-				set mos_kid,1;
-				if (mos_middle == 1 && mos_elder == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Vasili]";
-				mes "Ah, when are you leaving?";
-				mes "Where are you going this time?";
-				next;
-				mes "[Vasili]";
-				mes "Will you go to slay the dragon,";
-				mes "that breathes fire and can";
-				mes "exterminates 10 men by flapping";
-				mes "its wings once?";
-				close;
-			}
+			mes "If winter is gone,";
+			mes "it is much easier to go on adventures.";
+			set mos_kid,1;
+			if (mos_middle == 1 && mos_elder == 1) set mos_nowinter,11;
+			close;
 		}
-	}else{
 		mes "[Vasili]";
-		mes "Wow, he is";
-		mes "an adventurer, an adventurer!!";
+		mes "Ah, when are you leaving?";
+		mes "Where are you going this time?";
 		next;
 		mes "[Vasili]";
-		mes "Tell me your exciting story.";
-		mes "Have you fought a dragon?";
-		mes "Where is your gold-shining sword and shield?";
-		mes "Where?";
+		mes "Will you go to slay the dragon,";
+		mes "that breathes fire and can";
+		mes "exterminates 10 men by flapping";
+		mes "its wings once?";
 		close;
 	}
+	mes "[Vasili]";
+	mes "Wow, he is";
+	mes "an adventurer, an adventurer!!";
+	next;
+	mes "[Vasili]";
+	mes "Tell me your exciting story.";
+	mes "Have you fought a dragon?";
+	mes "Where is your gold-shining sword and shield?";
+	mes "Where?";
+	close;
 }
 
 moscovia,204,188,5	script	A Lady#mos5	959,{
@@ -9335,42 +5744,36 @@ moscovia,204,188,5	script	A Lady#mos5	959,{
 			mes "[Katya]";
 			mes "A million sunflowers are blooming~";
 			close;
-		}else{
-			set .@kid,rand(1,100);
-			select("You look good today.");
-			if (.@kid > 70) {
-				mes "[Katya]";
-				mes "Yes, I feel good.";
-				mes "When it gets warm, sunflowers bloom.";
-				mes "The sunflower is the symbol";
-				mes "of this province.";
-				next;
-				specialeffect2 EF_SUMMONSLAVE;
-				mes "[Katya]";
-				mes "I wish that winter never comes back and";
-				mes "I could see sunflowers everyday.";
-				set mos_middle,1;
-				if (mos_kid == 1 && mos_elder == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Katya]";
-				mes "Yes, I feel good.";
-				mes "When it gets warm, sunflowers bloom.";
-				mes "The sunflower is the symbol";
-				mes "of this province.";
-				close;
-			}
 		}
-	}else{
-		mes "[Katya]";
-		mes "The spring has come~";
-		next;
+		select("You look good today.");
+		if (rand(1,100) > 70) {
+			mes "[Katya]";
+			mes "Yes, I feel good.";
+			mes "When it gets warm, sunflowers bloom.";
+			mes "The sunflower is the symbol";
+			mes "of this province.";
+			next;
+			specialeffect2 EF_SUMMONSLAVE;
+			mes "[Katya]";
+			mes "I wish that winter never comes back and";
+			mes "I could see sunflowers everyday.";
+			set mos_middle,1;
+			if (mos_kid == 1 && mos_elder == 1) set mos_nowinter,11;
+			close;
+		}
 		mes "[Katya]";
-		mes "A million sunflowers are blooming~";
+		mes "Yes, I feel good.";
+		mes "When it gets warm, sunflowers bloom.";
+		mes "The sunflower is the symbol";
+		mes "of this province.";
 		close;
 	}
+	mes "[Katya]";
+	mes "The spring has come~";
+	next;
+	mes "[Katya]";
+	mes "A million sunflowers are blooming~";
+	close;
 }
 
 moscovia,167,97,3	script	A Lady#mos6	961,{
@@ -9384,46 +5787,40 @@ moscovia,167,97,3	script	A Lady#mos6	961,{
 			mes "Where is the sun?";
 			mes "Where is it hiding?";
 			close;
-		}else{
-			set .@kid,rand(1,100);
-			select("The weather is getting warmer.");
-			if (.@kid > 70) {
-				mes "[Roza]";
-				mes "Yes, kids like it and";
-				mes "flowers are blooming.";
-				next;
-				specialeffect2 EF_SUMMONSLAVE;
-				mes "[Roza]";
-				mes "Whoever likes the cold and dark winter?";
-				mes "I hope this weather last forever.";
-				set mos_elder,1;
-				if (mos_kid == 1 && mos_middle == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Roza]";
-				mes "In the warm days,";
-				mes "I'm in trouble.";
-				mes "It's too hard to control";
-				mes "the children.";
-				next;
-				mes "[Roza]";
-				mes "I think";
-				mes "I need winter again.";
-				close;
-			}
 		}
-	}else{
+		select("The weather is getting warmer.");
+		if (rand(1,100) > 70) {
+			mes "[Roza]";
+			mes "Yes, kids like it and";
+			mes "flowers are blooming.";
+			next;
+			specialeffect2 EF_SUMMONSLAVE;
+			mes "[Roza]";
+			mes "Whoever likes the cold and dark winter?";
+			mes "I hope this weather last forever.";
+			set mos_elder,1;
+			if (mos_kid == 1 && mos_middle == 1) set mos_nowinter,11;
+			close;
+		}
 		mes "[Roza]";
-		mes "Naughty children get too";
-		mes "excited in the warm days.";
+		mes "In the warm days,";
+		mes "I'm in trouble.";
+		mes "It's too hard to control";
+		mes "the children.";
 		next;
 		mes "[Roza]";
-		mes "Where is the sun?";
-		mes "Where is it hiding?";
+		mes "I think";
+		mes "I need winter again.";
 		close;
 	}
+	mes "[Roza]";
+	mes "Naughty children get too";
+	mes "excited in the warm days.";
+	next;
+	mes "[Roza]";
+	mes "Where is the sun?";
+	mes "Where is it hiding?";
+	close;
 }
 
 moscovia,202,102,3	script	A Little Boy#mos7	962,{
@@ -9445,53 +5842,49 @@ moscovia,202,102,3	script	A Little Boy#mos7	962,{
 			mes "grandma's grandma's";
 			mes "grandma's grandma.";
 			close;
-		}else{
-			set .@kid,rand(1,100);
-			select("Do you like mysterious stories?");
-			if (.@kid > 70) {
-				mes "[Feliks]";
-				mes "Yes, I love them.";
-				mes "But, in winter,";
-				mes "nobody comes out of their homes.";
-				mes "So it's not very fun.";
-				next;
-				specialeffect2 EF_SUMMONSLAVE;
-				mes "[Feliks]";
-				mes "If winter never comes";
-				mes "I can have";
-				mes "fun all the time...";
-				set mos_kid,1;
-				if (mos_middle == 1 && mos_elder == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Feliks]";
-				mes "Yes, my Grandma told me";
-				mes "fairy-tales.";
-				mes "The winter is cold, but";
-				mes "it is fun to hear them.";
-				close;
+		}
+		select("Do you like mysterious stories?");
+		if (rand(1,100) > 70) {
+			mes "[Feliks]";
+			mes "Yes, I love them.";
+			mes "But, in winter,";
+			mes "nobody comes out of their homes.";
+			mes "So it's not very fun.";
+			next;
+			specialeffect2 EF_SUMMONSLAVE;
+			mes "[Feliks]";
+			mes "If winter never comes";
+			mes "I can have";
+			mes "fun all the time...";
+			set mos_kid,1;
+			if (mos_middle == 1 && mos_elder == 1) {
+				set mos_nowinter,11;
 			}
+			close;
 		}
-	}else{
-		mes "[Feliks]";
-		mes "This is the story";
-		mes "about a terrible dragon.";
-		next;
-		mes "[Feliks]";
-		mes "It is sleeping";
-		mes "in its lair,";
-		mes "but, it destroys everything";
-		mes "around it when it awakes.";
-		next;
 		mes "[Feliks]";
-		mes "This came from my grandma's";
-		mes "grandma's grandma's";
-		mes "grandma's grandma's";
-		mes "grandma's grandma.";
+		mes "Yes, my Grandma told me";
+		mes "fairy-tales.";
+		mes "The winter is cold, but";
+		mes "it is fun to hear them.";
 		close;
 	}
+	mes "[Feliks]";
+	mes "This is the story";
+	mes "about a terrible dragon.";
+	next;
+	mes "[Feliks]";
+	mes "It is sleeping";
+	mes "in its lair,";
+	mes "but, it destroys everything";
+	mes "around it when it awakes.";
+	next;
+	mes "[Feliks]";
+	mes "This came from my grandma's";
+	mes "grandma's grandma's";
+	mes "grandma's grandma's";
+	mes "grandma's grandma.";
+	close;
 }
 
 moscovia,220,172,3	script	A Young Man#mos8	968,{
@@ -9502,46 +5895,40 @@ moscovia,220,172,3	script	A Young Man#mos8	968,{
 			mes "to experience new worlds";
 			mes "as you do.";
 			close;
-		}else{
-			set .@kid,rand(1,100);
-			mes "[Ilyav]";
-			mes "I am going to adventure";
-			mes "to experience new worlds";
-			mes "as you do.";
-			next;
-			select("When do you feel good?");
-			if (.@kid > 70) {
-				mes "[Ilyav]";
-				mes "When the weather is as good as recently";
-				mes "I feel an impulse to adventure";
-				mes "many times a day.";
-				next;
-				specialeffect2 EF_SUMMONSLAVE;
-				mes "[Ilyav]";
-				mes "But, I don't want to in the cold winter.";
-				mes "Hu, if the weather everday was as good as lately,";
-				mes "I would like to go out a lot more.";
-				mes "I hate winter...";
-				set mos_middle,1;
-				if (mos_kid == 1 && mos_elder == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Ilyav]";
-				mes "Well...";
-				mes "I don't know.";
-				mes "I just am sometimes.";
-				close;
-			}
 		}
-	}else{
 		mes "[Ilyav]";
 		mes "I am going to adventure";
 		mes "to experience new worlds";
 		mes "as you do.";
+		next;
+		select("When do you feel good?");
+		if (rand(1,100) > 70) {
+			mes "[Ilyav]";
+			mes "When the weather is as good as recently";
+			mes "I feel an impulse to adventure";
+			mes "many times a day.";
+			next;
+			specialeffect2 EF_SUMMONSLAVE;
+			mes "[Ilyav]";
+			mes "But, I don't want to in the cold winter.";
+			mes "Hu, if the weather everday was as good as lately,";
+			mes "I would like to go out a lot more.";
+			mes "I hate winter...";
+			set mos_middle,1;
+			if (mos_kid == 1 && mos_elder == 1) set mos_nowinter,11;
+			close;
+		}
+		mes "[Ilyav]";
+		mes "Well...";
+		mes "I don't know.";
+		mes "I just am sometimes.";
 		close;
 	}
+	mes "[Ilyav]";
+	mes "I am going to adventure";
+	mes "to experience new worlds";
+	mes "as you do.";
+	close;
 }
 
 moscovia,253,175,3	script	A Man#mos9	964,{
@@ -9553,46 +5940,40 @@ moscovia,253,175,3	script	A Man#mos9	964,{
 			mes "he actually loves";
 			mes "his people.";
 			close;
-		}else{
-			set .@kid,rand(1,100);
-			select("What do you usually do in winter?");
-			if (.@kid > 70) {
-				mes "[Orek]";
-				mes "It is too cold in winter so I don't go outside.";
-				mes "There's so much snow that it makes it hard to go";
-				mes "around here and there.";
-				next;
-				specialeffect2 EF_SUMMONSLAVE;
-				mes "[Orek]";
-				mes "In winter, fishing is more difficult,";
-				mes "anyway, it is bad for us.";
-				mes "I think it would be ok if we never had winter again.";
-				set mos_elder,1;
-				if (mos_kid == 1 && mos_middle == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Orek]";
-				mes "It snows a lot in winter and";
-				mes "gets too cold.";
-				mes "So, we don't go outside";
-				mes "without a particular reason.";
-				next;
-				mes "[Orek]";
-				mes "My family just sits beside the pechka and talks,";
-				mes "hoping that winter passes by soon.";
-				close;
-			}
 		}
-	}else{
+		select("What do you usually do in winter?");
+		if (rand(1,100) > 70) {
+			mes "[Orek]";
+			mes "It is too cold in winter so I don't go outside.";
+			mes "There's so much snow that it makes it hard to go";
+			mes "around here and there.";
+			next;
+			specialeffect2 EF_SUMMONSLAVE;
+			mes "[Orek]";
+			mes "In winter, fishing is more difficult,";
+			mes "anyway, it is bad for us.";
+			mes "I think it would be ok if we never had winter again.";
+			set mos_elder,1;
+			if (mos_kid == 1 && mos_middle == 1) set mos_nowinter,11;
+			close;
+		}
+		mes "[Orek]";
+		mes "It snows a lot in winter and";
+		mes "gets too cold.";
+		mes "So, we don't go outside";
+		mes "without a particular reason.";
+		next;
 		mes "[Orek]";
-		mes "The present Csar is a bit strict and";
-		mes "terrible, but";
-		mes "he actually loves";
-		mes "his people.";
+		mes "My family just sits beside the pechka and talks,";
+		mes "hoping that winter passes by soon.";
 		close;
 	}
+	mes "[Orek]";
+	mes "The present Csar is a bit strict and";
+	mes "terrible, but";
+	mes "he actually loves";
+	mes "his people.";
+	close;
 }
 
 moscovia,168,135,3	script	A Lady#mos10	961,{
@@ -9607,42 +5988,7 @@ moscovia,168,135,3	script	A Lady#mos10	961,{
 			mes "be a tourist town.";
 			mes "What happened...?";
 			close;
-		}else{
-			mes "[Kyra]";
-			mes "I've seen many people";
-			mes "from other provinces recently.";
-			next;
-			mes "[Kyra]";
-			mes "This used to not";
-			mes "be a tourist town.";
-			mes "What happened...?";
-			next;
-			select("Here it is warm and good.");
-			set .@kid,rand(1,100);
-			if (.@kid > 70) {
-				mes "[Kyra]";
-				mes "Hohoho, that may be true now.";
-				mes "But, you don't even know how cold it gets here in winter.";
-				mes "You wouldn't even want to go outside.";
-				next;
-				specialeffect2 EF_SUMMONSLAVE;
-				mes "[Kyra]";
-				mes "It is good to stay with my family, but";
-				mes "nobody likes the cold winter.";
-				set mos_elder,1;
-				if (mos_kid == 1 && mos_middle == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Kyra]";
-				mes "Hohoho, that may be true now.";
-				mes "But, you don't even know how cold it gets here in winter.";
-				mes "You wouldn't even want to go outside.";
-				close;
-			}
 		}
-	}else{
 		mes "[Kyra]";
 		mes "I've seen many people";
 		mes "from other provinces recently.";
@@ -9651,8 +5997,37 @@ moscovia,168,135,3	script	A Lady#mos10	961,{
 		mes "This used to not";
 		mes "be a tourist town.";
 		mes "What happened...?";
+		next;
+		select("Here it is warm and good.");
+		if (rand(1,100) > 70) {
+			mes "[Kyra]";
+			mes "Hohoho, that may be true now.";
+			mes "But, you don't even know how cold it gets here in winter.";
+			mes "You wouldn't even want to go outside.";
+			next;
+			specialeffect2 EF_SUMMONSLAVE;
+			mes "[Kyra]";
+			mes "It is good to stay with my family, but";
+			mes "nobody likes the cold winter.";
+			set mos_elder,1;
+			if (mos_kid == 1 && mos_middle == 1) set mos_nowinter,11;
+			close;
+		}
+		mes "[Kyra]";
+		mes "Hohoho, that may be true now.";
+		mes "But, you don't even know how cold it gets here in winter.";
+		mes "You wouldn't even want to go outside.";
 		close;
 	}
+	mes "[Kyra]";
+	mes "I've seen many people";
+	mes "from other provinces recently.";
+	next;
+	mes "[Kyra]";
+	mes "This used to not";
+	mes "be a tourist town.";
+	mes "What happened...?";
+	close;
 }
 
 moscovia,192,80,3	script	A Lady#mos11	959,{
@@ -9663,50 +6038,44 @@ moscovia,192,80,3	script	A Lady#mos11	959,{
 			mes "their bodies are used for medicinal purposes.";
 			mes "They are very useful.";
 			close;
-		}else{
-			mes "[Sabina]";
-			mes "Sunflowers are squeezed for oil and";
-			mes "their bodies are used for medicinal purposes.";
-			mes "They are very useful.";
-			next;
-			select("When do sunflowers bloom?");
-			set .@kid,rand(1,100);
-			if (.@kid > 70) {
-				mes "[Sabina]";
-				mes "They start to bloom";
-				mes "from the late summer.";
-				mes "You cannot help being";
-				mes "attracted to sunflowers,";
-				mes "if you see the spectacular scene";
-				mes "of a field filled up with them.";
-				next;
-				mes "[Sabina]";
-				mes "If the summer continues to last,";
-				mes "I can see them all the time...";
-				specialeffect2 EF_SUMMONSLAVE;
-				set mos_middle,1;
-				if (mos_kid == 1 && mos_elder == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Sabina]";
-				mes "They start to bloom";
-				mes "from the late summer.";
-				mes "You cannot help being";
-				mes "attracted to sunflowers,";
-				mes "if you see the spectacular scene";
-				mes "of a field filled up with them.";
-				close;
-			}
 		}
-	}else{
 		mes "[Sabina]";
 		mes "Sunflowers are squeezed for oil and";
 		mes "their bodies are used for medicinal purposes.";
 		mes "They are very useful.";
-		close;
-	}
+		next;
+		select("When do sunflowers bloom?");
+		if (rand(1,100) > 70) {
+			mes "[Sabina]";
+			mes "They start to bloom";
+			mes "from the late summer.";
+			mes "You cannot help being";
+			mes "attracted to sunflowers,";
+			mes "if you see the spectacular scene";
+			mes "of a field filled up with them.";
+			next;
+			mes "[Sabina]";
+			mes "If the summer continues to last,";
+			mes "I can see them all the time...";
+			specialeffect2 EF_SUMMONSLAVE;
+			set mos_middle,1;
+			if (mos_kid == 1 && mos_elder == 1) set mos_nowinter,11;
+			close;
+		}
+		mes "[Sabina]";
+		mes "They start to bloom";
+		mes "from the late summer.";
+		mes "You cannot help being";
+		mes "attracted to sunflowers,";
+		mes "if you see the spectacular scene";
+		mes "of a field filled up with them.";
+		close;
+	}
+	mes "[Sabina]";
+	mes "Sunflowers are squeezed for oil and";
+	mes "their bodies are used for medicinal purposes.";
+	mes "They are very useful.";
+	close;
 }
 
 moscovia,211,215,5	script	A Young Man#mos12	967,{
@@ -9722,44 +6091,7 @@ moscovia,211,215,5	script	A Young Man#mos12	967,{
 			mes "when their minds wander";
 			mes "like right now!";
 			close;
-		}else{
-			set .@kid,rand(1,100);
-			mes "[Izlof]";
-			mes "There is a old saying,";
-			mes "'an opportunity is a chance.'";
-			next;
-			mes "[Izlof]";
-			mes "It is best to confess";
-			mes "to ladies in the warm weather,";
-			mes "when their minds wander";
-			mes "right now!";
-			next;
-			select("It's good to have warm weather.");
-			if (.@kid > 70) {
-				mes "[Izlof]";
-				mes "Of course.";
-				mes "From now on, it is my golden age of opportunity!";
-				next;
-				specialeffect2 EF_SUMMONSLAVE;
-				mes "[Izlof]";
-				mes "If it is the summer all the time,";
-				mes "my life will be in an amorous mood.";
-				mes "Hahaha!";
-				mes "I don't want winter to come.";
-				set mos_middle,1;
-				if (mos_kid == 1 && mos_elder == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Izlof]";
-				mes "Of course.";
-				mes "The cold winter has gone.";
-				mes "From now on, it is my golden age!";
-				close;
-			}
 		}
-	}else{
 		mes "[Izlof]";
 		mes "There is a old saying,";
 		mes "'an opportunity is a chance.'";
@@ -9769,8 +6101,39 @@ moscovia,211,215,5	script	A Young Man#mos12	967,{
 		mes "to ladies in the warm weather,";
 		mes "when their minds wander";
 		mes "right now!";
+		next;
+		select("It's good to have warm weather.");
+		if (rand(1,100) > 70) {
+			mes "[Izlof]";
+			mes "Of course.";
+			mes "From now on, it is my golden age of opportunity!";
+			next;
+			specialeffect2 EF_SUMMONSLAVE;
+			mes "[Izlof]";
+			mes "If it is the summer all the time,";
+			mes "my life will be in an amorous mood.";
+			mes "Hahaha!";
+			mes "I don't want winter to come.";
+			set mos_middle,1;
+			if (mos_kid == 1 && mos_elder == 1) set mos_nowinter,11;
+			close;
+		}
+		mes "[Izlof]";
+		mes "Of course.";
+		mes "The cold winter has gone.";
+		mes "From now on, it is my golden age!";
 		close;
 	}
+	mes "[Izlof]";
+	mes "There is a old saying,";
+	mes "'an opportunity is a chance.'";
+	next;
+	mes "[Izlof]";
+	mes "It is best to confess";
+	mes "to ladies in the warm weather,";
+	mes "when their minds wander";
+	mes "right now!";
+	close;
 }
 
 moscovia,149,112,3	script	A Man#mos13	964,{
@@ -9782,50 +6145,44 @@ moscovia,149,112,3	script	A Man#mos13	964,{
 			mes "adventuring everywhere and";
 			mes "coping with all the troubles...";
 			close;
-		}else{
-			mes "[Lev]";
-			mes "I was once like you,";
-			mes "with a hot heart and cool reason,";
-			mes "adventuring everywhere and";
-			mes "coping with all the troubles...";
-			next;
-			set .@kid,rand(1,100);
-			select("You need to take a rest.");
-			if (.@kid > 70) {
-				mes "[Lev]";
-				mes "Yes, under the warm sunlight,";
-				mes "I like to rest.";
-				next;
-				specialeffect2 EF_SUMMONSLAVE;
-				mes "[Lev]";
-				mes "I hope that this warm weather";
-				mes "will last forever.";
-				mes "I hate the cold winter.";
-				set mos_elder,1;
-				if (mos_kid == 1 && mos_middle == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Lev]";
-				mes "Yes, under the warm sunlight,";
-				mes "I like to rest.";
-				next;
-				mes "[Lev]";
-				mes "But, I am still alive!";
-				mes "I don't want to hear talk";
-				mes "like that from you.";
-				close;
-			}
 		}
-	}else{
 		mes "[Lev]";
 		mes "I was once like you,";
 		mes "with a hot heart and cool reason,";
 		mes "adventuring everywhere and";
 		mes "coping with all the troubles...";
+		next;
+		select("You need to take a rest.");
+		if (rand(1,100) > 70) {
+			mes "[Lev]";
+			mes "Yes, under the warm sunlight,";
+			mes "I like to rest.";
+			next;
+			specialeffect2 EF_SUMMONSLAVE;
+			mes "[Lev]";
+			mes "I hope that this warm weather";
+			mes "will last forever.";
+			mes "I hate the cold winter.";
+			set mos_elder,1;
+			if (mos_kid == 1 && mos_middle == 1) set mos_nowinter,11;
+			close;
+		}
+		mes "[Lev]";
+		mes "Yes, under the warm sunlight,";
+		mes "I like to rest.";
+		next;
+		mes "[Lev]";
+		mes "But, I am still alive!";
+		mes "I don't want to hear talk";
+		mes "like that from you.";
 		close;
 	}
+	mes "[Lev]";
+	mes "I was once like you,";
+	mes "with a hot heart and cool reason,";
+	mes "adventuring everywhere and";
+	mes "coping with all the troubles...";
+	close;
 }
 
 moscovia,196,71,3	script	A Young Man#mos14	968,{
@@ -9840,48 +6197,42 @@ moscovia,196,71,3	script	A Young Man#mos14	968,{
 			mes "Do you like";
 			mes "sailing?";
 			close;
-		}else{
-			mes "[Fredek]";
-			mes "The men here grow up";
-			mes "after going through tough waves in";
-			mes "the vast sea";
-			next;
-			select("However, if winter comes...");
-			set .@kid,rand(1,100);
-			if (.@kid > 70) {
-				mes "[Fredek]";
-				mes "Yes, in winter the";
-				mes "sea is frozen, so it";
-				mes "is impossible to sail.";
-				next;
-				specialeffect2 EF_SUMMONSLAVE;
-				mes "[Fredek]";
-				mes "I hope that winter never comes.";
-				mes "It is my dream.";
-				set mos_middle,1;
-				if (mos_kid == 1 && mos_elder == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Fredek]";
-				mes "Although I won't be able";
-				mes "to sail, my passion is not";
-				mes "cooled down from winter.";
-				close;
-			}
 		}
-	}else{
 		mes "[Fredek]";
 		mes "The men here grow up";
 		mes "after going through tough waves in";
 		mes "the vast sea";
 		next;
+		select("However, if winter comes...");
+		if (rand(1,100) > 70) {
+			mes "[Fredek]";
+			mes "Yes, in winter the";
+			mes "sea is frozen, so it";
+			mes "is impossible to sail.";
+			next;
+			specialeffect2 EF_SUMMONSLAVE;
+			mes "[Fredek]";
+			mes "I hope that winter never comes.";
+			mes "It is my dream.";
+			set mos_middle,1;
+			if (mos_kid == 1 && mos_elder == 1) set mos_nowinter,11;
+			close;
+		}
 		mes "[Fredek]";
-		mes "Do you like";
-		mes "sailing?";
+		mes "Although I won't be able";
+		mes "to sail, my passion is not";
+		mes "cooled down from winter.";
 		close;
 	}
+	mes "[Fredek]";
+	mes "The men here grow up";
+	mes "after going through tough waves in";
+	mes "the vast sea";
+	next;
+	mes "[Fredek]";
+	mes "Do you like";
+	mes "sailing?";
+	close;
 }
 
 moscovia,234,168,5	script	A Man#mos15	964,{
@@ -9891,49 +6242,44 @@ moscovia,234,168,5	script	A Man#mos15	964,{
 			mes "Don't you think that the castle is magnificent?";
 			mes "It was built by my great great grandfather.";
 			close;
-		}else{
+		}
+		mes "[Gavrel]";
+		mes "Don't you think that the castle is magnificent?";
+		mes "It was built by my great great grandfather.";
+		next;
+		mes "[Gavrel]";
+		mes "It is very strong and";
+		mes "it is warm inside of it.";
+		mes "I am very proud of it.";
+		next;
+		select("Is it cold much in winter?");
+		if (rand(1,100) > 70) {
 			mes "[Gavrel]";
-			mes "Don't you think that the castle is magnificent?";
-			mes "It was built by my great great grandfather.";
+			mes "Yes, it is very cold.";
+			mes "If you didn't prepare,";
+			mes "it would be hard for you.";
 			next;
+			specialeffect2 EF_SUMMONSLAVE;
 			mes "[Gavrel]";
-			mes "It is very strong and";
-			mes "it is warm inside of it.";
-			mes "I am very proud of it.";
-			next;
-			select("Is it cold much in winter?");
-			set .@kid,rand(1,100);
-			if (.@kid > 70) {
-				mes "[Gavrel]";
-				mes "Yes, it is very cold.";
-				mes "If you didn't prepare,";
-				mes "it would be hard for you.";
-				next;
-				specialeffect2 EF_SUMMONSLAVE;
-				mes "[Gavrel]";
-				mes "It would be a lot better";
-				mes "if winter never came again.";
-				mes "But, design of coldness is";
-				mes "winter itself, isn't it?";
-				set mos_elder,1;
-				if (mos_kid == 1 && mos_middle == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Gavrel]";
-				mes "Yes, it is very cold.";
-				mes "If you didn't prepare,";
-				mes "it would be hard for you.";
-				close;
-			}
+			mes "It would be a lot better";
+			mes "if winter never came again.";
+			mes "But, design of coldness is";
+			mes "winter itself, isn't it?";
+			set mos_elder,1;
+			if (mos_kid == 1 && mos_middle == 1) set mos_nowinter,11;
+			close;
 		}
-	}else{
 		mes "[Gavrel]";
-		mes "Don't you think that the castle is magnificent?";
-		mes "It was built by my great great grandfather.";
+		mes "Yes, it is very cold.";
+		mes "If you didn't prepare,";
+		mes "it would be hard for you.";
 		close;
 	}
+	mes "[Gavrel]";
+	mes "Don't you think that the castle is magnificent?";
+	mes "It was built by my great great grandfather.";
+	close;
+
 }
 
 moscovia,228,80,3	script	A Little Boy#mos16	962,{
@@ -9950,52 +6296,46 @@ moscovia,228,80,3	script	A Little Boy#mos16	962,{
 			mes "back and hurt my neck";
 			mes "while looking up at you.";
 			close;
-		}else{
-			set .@kid,rand(1,100);
-			select("Do you like summer?");
-			if (.@kid > 70) {
-				mes "[Rurik]";
-				mes "Ah, move a bit to the side.";
-				mes "a bit more... Yes.";
-				mes "Ah, stop there.";
-				next;
-				mes "[Rurik]";
-				mes "I certainly like the summer.";
-				mes "Unless the sunlight is too strong,";
-				mes "it is much better than the cold winter.";
-				next;
-				specialeffect2 EF_SUMMONSLAVE;
-				mes "[Rurik]";
-				mes "By the way, what is this for?";
-				mes "It is natural to like the summer.";
-				mes "Do you think";
-				mes "the winter should come again?";
-				set mos_kid,1;
-				if (mos_middle == 1 && mos_elder == 1) {
-					set mos_nowinter,11;
-				}
-				close;
-			}else{
-				mes "[Rurik]";
-				mes "Sure, I like the summer.";
-				mes "Why are you asking";
-				mes "such a question so suddenly?";
-				close;
-			}
 		}
-	}else{
-		mes "[Rurik]";
-		mes "It's hard to look up at you.";
-		mes "Come lower so I can see your eyes.";
-		next;
+		select("Do you like summer?");
+		if (rand(1,100) > 70) {
+			mes "[Rurik]";
+			mes "Ah, move a bit to the side.";
+			mes "a bit more... Yes.";
+			mes "Ah, stop there.";
+			next;
+			mes "[Rurik]";
+			mes "I certainly like the summer.";
+			mes "Unless the sunlight is too strong,";
+			mes "it is much better than the cold winter.";
+			next;
+			specialeffect2 EF_SUMMONSLAVE;
+			mes "[Rurik]";
+			mes "By the way, what is this for?";
+			mes "It is natural to like the summer.";
+			mes "Do you think";
+			mes "the winter should come again?";
+			set mos_kid,1;
+			if (mos_middle == 1 && mos_elder == 1) set mos_nowinter,11;
+			close;
+		}
 		mes "[Rurik]";
-		mes "Hmm, that's better.";
-		mes "Children are the future.";
-		mes "I won't have a future if I fall";
-		mes "back and hurt my neck";
-		mes "while looking up at you.";
+		mes "Sure, I like the summer.";
+		mes "Why are you asking";
+		mes "such a question so suddenly?";
 		close;
 	}
+	mes "[Rurik]";
+	mes "It's hard to look up at you.";
+	mes "Come lower so I can see your eyes.";
+	next;
+	mes "[Rurik]";
+	mes "Hmm, that's better.";
+	mes "Children are the future.";
+	mes "I won't have a future if I fall";
+	mes "back and hurt my neck";
+	mes "while looking up at you.";
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -10010,15 +6350,13 @@ mosk_dun03,225,233,0	script	Pile of skeletons#mosk	111,{
 		mes "-Get closer to see";
 		mes "more carefully.-";
 		close;
-	}else{
-		mes "-The ugly skulls are gathered.-";
-		close;
 	}
+	mes "-The ugly skulls are gathered.-";
+	close;
 }
 
 mosk_dun03,225,233,0	script	#Magic_Bottle	-1,5,5,{
 	end;
-	
 OnTouch:
 	if (mos_nowinter == 8) {
 		mes "-She said that the Magic Gourd Bottle that";
@@ -10037,7 +6375,6 @@ OnTouch:
 		next;
 		while(1) {
 			if(select("Look for it.:I will try next time.") == 1) {
-				set .@findout,rand(1,20);
 				if (BaseJob == Job_Thief) {
 					mes "["+strcharinfo(0)+"]";
 					mes "Here it is.";
@@ -10045,23 +6382,21 @@ OnTouch:
 					set mos_nowinter,9;
 					getitem 7761,1;
 					close;
-				}else{
-					if (.@findout > 14) {
-						mes "["+strcharinfo(0)+"]";
-						mes "Ah, I got it!";
-						mes "I better get out of here quickly.";
-						set mos_nowinter,9;
-						getitem 7761,1;
-						close;
-					}else{
-						mes "............";
-						next;
-						mes "["+strcharinfo(0)+"]";
-						mes "Where the hell is it?!";
-						mes "It has to be in here somewhere!";
-						next;
-					}
 				}
+				if (rand(1,20) > 14) {
+					mes "["+strcharinfo(0)+"]";
+					mes "Ah, I got it!";
+					mes "I better get out of here quickly.";
+					set mos_nowinter,9;
+					getitem 7761,1;
+					close;
+				}
+				mes "............";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Where the hell is it?!";
+				mes "It has to be in here somewhere!";
+				next;
 			}
 			mes "["+strcharinfo(0)+"]";
 			mes "I will try later.";
@@ -10153,22 +6488,22 @@ mosk_in,131,92,3	script	#Csar	-1,7,7,{
 			mes "from the Baba Yaga.";
 			set mos_nowinter,13;
 			close;
-		}else{
-			mes "[Csar Alexsay III]";
-			mes "I said to bring me";
-			mes "40 Yaga's Pestles";
-			mes "from the Baba Yaga.";
-			set mos_nowinter,13;
-			close;
 		}
+		mes "[Csar Alexsay III]";
+		mes "I said to bring me";
+		mes "40 Yaga's Pestles";
+		mes "from the Baba Yaga.";
+		set mos_nowinter,13;
+		close;
 	}
+	end;
 }
 
 //============================================================================
 // Shafka Hat
 //============================================================================
 moscovia,211,93,3	script	Irina#edq	958,{
-	if (checkweight(1201,1) == 0 ) {
+	if (!checkweight(1201,1)) {
 		mes "Wait a moment!!";
 		mes "You have too many items.";
 		mes "You can't receive this.";
@@ -10234,7 +6569,7 @@ moscovia,211,93,3	script	Irina#edq	958,{
 	mes "we can make one immediately!";
 	mes "The materials are: ^0000FFNine Tails 20, Yarn 10, Soft Silk 10, Sea-otter Fur 20, Spool 1^000000.";
 	next;
-	if (countitem(1022) > 19 && countitem(7038) > 9 && countitem(7166) > 9 && countitem(7065) > 19 && countitem(7217) > 0) {
+	if (countitem(1022) > 19 && countitem(7038) > 9 && countitem(7166) > 9 && countitem(7065) > 19 && countitem(7217)) {
 		mes "[Irina]";
 		mes "You did well.";
 		mes "Give me the materials. I will make the Shafka.";
@@ -10259,20 +6594,19 @@ moscovia,211,93,3	script	Irina#edq	958,{
 		mes "Okay?";
 		mes "Okay, so... Bye-bye!~";
 		close;
-	}else{
-		mes "[Irina]";
-		mes "Ah... You lack some materials. We";
-		mes "can't make the Shafka hat with just";
-		mes "these materials.";
-		next;
-		mes "[Irina]";
-		mes "If you bring the right materials, I";
-		mes "will make a Shafka immediately.";
-		next;
-		mes "[Irina]";
-		mes "The materials are: ^0000FFNine Tails 20, Yarn 10, Soft Silk 10, Sea-otter Fur 20, Spool 1^000000.";
-		close;
 	}
+	mes "[Irina]";
+	mes "Ah... You lack some materials. We";
+	mes "can't make the Shafka hat with just";
+	mes "these materials.";
+	next;
+	mes "[Irina]";
+	mes "If you bring the right materials, I";
+	mes "will make a Shafka immediately.";
+	next;
+	mes "[Irina]";
+	mes "The materials are: ^0000FFNine Tails 20, Yarn 10, Soft Silk 10, Sea-otter Fur 20, Spool 1^000000.";
+	close;
 }
 
 //============================================================================
@@ -10283,7 +6617,7 @@ moscovia,211,93,3	script	Irina#edq	958,{
 // Sage - Starting Point
 //----------------------------------------------------------------------------
 mosk_fild02,198,252,3	script	Sage#rus01	755,{
-	if (rhea_rus_main < 1) {
+	if (!rhea_rus_main) {
 		mes "[Sage]";
 		mes "Ah, a foreigner,";
 		mes "you're not from";
@@ -10309,7 +6643,7 @@ mosk_fild02,198,252,3	script	Sage#rus01	755,{
 		mes "["+ strcharinfo(0) +"]";
 		mes "This is a card of one of the monsters that inhabit the Rune Midgard continent.";
 		next;
-		if (countitem(4001) < 1) {
+		if (!countitem(4001)) {
 			mes "[Sage]";
 			mes "...?!";
 			mes "What are you talking about?";
@@ -10349,34 +6683,32 @@ mosk_fild02,198,252,3	script	Sage#rus01	755,{
 		mes "But, don't worry about me. I know my way around here and am not afraid of monsters, haha.";
 		set rhea_rus_main,1;
 		close;
-	}else{
-		mes "[Sage]";
-		mes "Now, that winter has passed and summer is coming the weather is great. And I know that winter comes every year, but I always pray that it won't return again.";
-		next;
-		mes "[Sage]";
-		mes "After the passing of winter, the summer weather has made the forest dense and the air so warm. My favorite season will always be summer.";
-		next;
-		mes "[Sage]";
-		mes "But, don't forget that you should still be careful. Lots of adventurers were lost in the forst in front of us.";
-		next;
-		mes "[Sage]";
-		mes "Only one has come back and told me of a mysterious stone, where the road splits into three, that curses those who touch it so I've been keeping away from it.";
-		next;
-		mes "[Sage]";
-		mes "Me? Haha, don't worry about me. I know my way around here and am not afraid of monsters, haha.";
-		close;
 	}
+	mes "[Sage]";
+	mes "Now, that winter has passed and summer is coming the weather is great. And I know that winter comes every year, but I always pray that it won't return again.";
+	next;
+	mes "[Sage]";
+	mes "After the passing of winter, the summer weather has made the forest dense and the air so warm. My favorite season will always be summer.";
+	next;
+	mes "[Sage]";
+	mes "But, don't forget that you should still be careful. Lots of adventurers were lost in the forst in front of us.";
+	next;
+	mes "[Sage]";
+	mes "Only one has come back and told me of a mysterious stone, where the road splits into three, that curses those who touch it so I've been keeping away from it.";
+	next;
+	mes "[Sage]";
+	mes "Me? Haha, don't worry about me. I know my way around here and am not afraid of monsters, haha.";
+	close;
 }
 
 //----------------------------------------------------------------------------
 // Mysterious Stone
 //----------------------------------------------------------------------------
 mosk_dun01,169,162,0	script	Mysterious Stone#rus02	111,{
-	if (rhea_rus_main < 1) {
+	if (!rhea_rus_main) {
 		mes "- The road forks here -";
 		close;
-	}
-	else if (rhea_rus_main > 0 && rhea_rus_main < 3) {
+	} else if (rhea_rus_main && rhea_rus_main < 3) {
 		mes "- Words are engraved -";
 		mes "- on the stone -";
 		next;
@@ -10388,41 +6720,40 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	111,{
 		mes "...Where should I go?";
 		next;
 		switch(select("Right:Left:Middle")) {
-		case 1:
-			mes "["+ strcharinfo(0) +"]";
-			mes "...What about the right...";
-			next;
-			mes "- You decide to go to the right -";
-			next;
-			mes "- !!!!!! -";
-			percentheal -50,-50;
-			specialeffect2 EF_DARKBREATH;
-			specialeffect2 EF_HIT2;
-			emotion 23,1;
-			next;
-			mes "- An unknown force has -";
-			mes "- drained your health -";
-			close2;
-			warp "mosk_dun01",190,47;
-			end;
-			break;
-		case 2:
-			if (checkriding() == 0) {
+			case 1:
 				mes "["+ strcharinfo(0) +"]";
-				mes "...What about the left...?";
+				mes "...What about the right...";
 				next;
-				mes "- You decide to go to the left -";
+				mes "- You decide to go to the right -";
 				next;
 				mes "- !!!!!! -";
+				percentheal -50,-50;
+				specialeffect2 EF_DARKBREATH;
+				specialeffect2 EF_HIT2;
 				emotion 23,1;
 				next;
 				mes "- An unknown force has -";
-				mes "- cursed your body -";
-				sc_start SC_CURSE,60000,0;
+				mes "- drained your health -";
 				close2;
 				warp "mosk_dun01",190,47;
 				end;
-			}else{
+			case 2:
+				if (!checkriding()) {
+					mes "["+ strcharinfo(0) +"]";
+					mes "...What about the left...?";
+					next;
+					mes "- You decide to go to the left -";
+					next;
+					mes "- !!!!!! -";
+					emotion 23,1;
+					next;
+					mes "- An unknown force has -";
+					mes "- cursed your body -";
+					sc_start SC_CURSE,60000,0;
+					close2;
+					warp "mosk_dun01",190,47;
+					end;
+				}
 				mes "["+ strcharinfo(0) +"]";
 				mes "...What about the left...?";
 				next;
@@ -10439,37 +6770,20 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	111,{
 				close2;
 				warp "mosk_dun01",190,47;
 				end;
-			}
-			break;
-		case 3:
-			mes "["+ strcharinfo(0) +"]";
-			mes "...What about the middle...?";
-			next;
-			mes "- You move forward -";
-			mes "- toward the middle -";
-			next;
-			mes "- !!!!!! -";
-			emotion 23,1;
-			donpcevent "Gray Wolf#rus03::OnEnable";
-			set rhea_rus_main,2;
-			close;
+			case 3:
+				mes "["+ strcharinfo(0) +"]";
+				mes "...What about the middle...?";
+				next;
+				mes "- You move forward -";
+				mes "- toward the middle -";
+				next;
+				mes "- !!!!!! -";
+				emotion 23,1;
+				donpcevent "Gray Wolf#rus03::OnEnable";
+				set rhea_rus_main,2;
+				close;
 		}
-	}
-	else if (rhea_rus_main == 3) {
-		mes "- Words are engraved -";
-		mes "- on the stone -";
-		next;
-		mes "- Right path -> Drain -";
-		mes "- Left path -> Curse -";
-		mes "- Middle -> ? -";
-		next;
-		mes "- You carefully read the stone -";
-		mes "- and decide to wait -";
-		set rhea_rus_main,4;
-		donpcevent "Gray Wolf#rus03::OnEnable";
-		close;
-	}
-	else if (rhea_rus_main == 4) {
+	} else if (rhea_rus_main == 3 || rhea_rus_main == 4) {
 		mes "- Words are engraved -";
 		mes "- on the stone -";
 		next;
@@ -10479,6 +6793,7 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	111,{
 		next;
 		mes "- You carefully read the stone -";
 		mes "- and decide to wait -";
+		if (rhea_rus_main == 3) set rhea_rus_main,4;
 		donpcevent "Gray Wolf#rus03::OnEnable";
 		close;
 	}
@@ -10495,8 +6810,7 @@ mosk_dun01,167,160,3	script	Gray Wolf#rus03	972,{
 		close2;
 		warp "mosk_dun01",190,47;
 		end;
-	}
-	else if (rhea_rus_main == 2) {
+	} else if (rhea_rus_main == 2) {
 		mes "[Gray Wolf]";
 		mes "Halt, adventurer.";
 		mes "Why did you disregard the warnings on the stone?";
@@ -10530,8 +6844,7 @@ mosk_dun01,167,160,3	script	Gray Wolf#rus03	972,{
 		close2;
 		warp "mosk_dun01",190,47;
 		end;
-	}
-	else if (rhea_rus_main == 4) {
+	} else if (rhea_rus_main == 4) {
 		mes "[Gray Wolf]";
 		mes "...Why did you come back?";
 		next;
@@ -10618,8 +6931,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 		mes "...?!";
 		emotion 1,1;
 		close;
-	}
-	else if (rhea_rus_main == 5) {
+	} else if (rhea_rus_main == 5) {
 		set .@speak01,rand(1,3);
 		if (.@speak01 == 3) {
 			mes "["+ strcharinfo(0) +"]";
@@ -10627,7 +6939,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 			emotion 1,1;
 			donpcevent "Gray Wolf#rus05::OnEnable";
 			next;
-		}else{
+		} else {
 			mes "["+ strcharinfo(0) +"]";
 			mes "...?!";
 			emotion 1,1;
@@ -10672,8 +6984,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 		donpcevent "Gray Wolf#rus05::OnDisable";
 		set rhea_rus_main,6;
 		close;
-	}
-	else if (rhea_rus_main > 5 && rhea_rus_main < 8) {
+	} else if (rhea_rus_main > 5 && rhea_rus_main < 8) {
 		mes "[Girl's Voice]";
 		mes "Help me get out of here.";
 		mes "I hope you can help me find that '^0000ffGolden Key^000000' that can open anything.";
@@ -10681,8 +6992,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 		mes "[Girl's Voice]";
 		mes "I've heard about a keymaker in Moscovia who knows how to make a '^0000ffGolden Key^000000'.";
 		close;
-	}
-	else if (rhea_rus_main == 8) {
+	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_quiz < 3) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
@@ -10715,19 +7025,17 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 			mes "...Ok, be careful There are a lot of monsters there.";
 			donpcevent "1#rus27::OnEnable";
 			close;
-		}else{
-			mes "[Girl's Voice]";
-			mes "Have you.. got the key?";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "Not yet... Give me a second.";
-			next;
-			mes "[Girl's Voice]";
-			mes "If you gather all the necessary things, go to Moscovia and find the keymaker. Do me this favor, please.";
-			close;
 		}
-	}
-	else if (rhea_rus_main > 8 && rhea_rus_main < 47) {
+		mes "[Girl's Voice]";
+		mes "Have you.. got the key?";
+		next;
+		mes "["+ strcharinfo(0) +"]";
+		mes "Not yet... Give me a second.";
+		next;
+		mes "[Girl's Voice]";
+		mes "If you gather all the necessary things, go to Moscovia and find the keymaker. Do me this favor, please.";
+		close;
+	} else if (rhea_rus_main > 8 && rhea_rus_main < 47) {
 		mes "[Girl's Voice]";
 		mes "Have you.. got the key?";
 		next;
@@ -10738,126 +7046,121 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 			mes "[Girl's Voice]";
 			mes "Go to Moscovia and find the keymaker.";
 			close;
-		}else{
-			mes "["+ strcharinfo(0) +"]";
-			mes "Not yet... Give me a second.";
-			next;
-			mes "[Girl's Voice]";
-			mes "If you gather all the things necessary, go to Moscovia and find the keymaker. Do me this favor, please.";
-			close;
 		}
-	}
-	else if (rhea_rus_main == 47) {
-		if (countitem(7876) > 0) {
+		mes "["+ strcharinfo(0) +"]";
+		mes "Not yet... Give me a second.";
+		next;
+		mes "[Girl's Voice]";
+		mes "If you gather all the things necessary, go to Moscovia and find the keymaker. Do me this favor, please.";
+		close;
+	} else if (rhea_rus_main == 47) {
+		if (countitem(7876)) {
 			if ($@rus_req02 == 1) {
 				mes "[Girl's Voice]";
 				mes "I can feel Koshei's energy.. It is not a time to use the key...";
 				close;
-			}else{
-				set $@rus_req02,1;
-				mes "[Girl's Voice]";
-				mes "Did you get the key?";
-				next;
+			}
+			set $@rus_req02,1;
+			mes "[Girl's Voice]";
+			mes "Did you get the key?";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "I did. So, how do I use it?";
+			next;
+			mes "[Girl's Voice]";
+			mes "Listen very carefully!";
+			mes "Left the key up, and shout '^0000ffThe Free wind blows and gets you wherever you want^000000'.";
+			next;
+			input .@input$;
+			if (.@input$ == "The Free wind blows and gets you wherever you want") {
 				mes "["+ strcharinfo(0) +"]";
-				mes "I did. So, how do I use it?";
-				next;
-				mes "[Girl's Voice]";
-				mes "Listen very carefully!";
-				mes "Left the key up, and shout '^0000ffThe Free wind blows and gets you wherever you want^000000'.";
+				mes "^0000ff "+ .@input$ +" !! ^000000";
 				next;
-				input .@input$;
-				if (.@input$ == "The Free wind blows and gets you wherever you want") {
-					mes "["+ strcharinfo(0) +"]";
-					mes "^0000ff "+ .@input$ +" !! ^000000";
-					next;
-					mes "- The key begins to glow -";
-					mes "- wind begins to blow -";
-					mes "- from somewhere -";
-					specialeffect2 EF_BEGINSPELL;
-					specialeffect EF_FREEZED;
-					next;
-				}else{
-					mes "["+ strcharinfo(0) +"]";
-					mes " "+ .@input$ +" !! ";
-					next;
-					mes "[Girl's Voice]";
-					mes ".........................................................................................";
-					next;
-					mes "[Girl's Voice]";
-					mes "You must've said it wrong...";
-					set $@rus_req02,0;
-					close;
-				}
-				mes "- The wind disappears and -";
-				mes "- a very young girl appears -";
-				donpcevent "Maria Morebna#rus46::OnEnable";
-				specialeffect EF_FREEZED,AREA,"Maria Morebna#rus46";
-				next;
-				mes "[Maria Morebna]";
-				mes "Thank you!";
-				mes "I'm finally out of there! Now I can.....................aaaaak!!!....";
-				next;
-				specialeffect EF_HIT2,AREA,"Maria Morebna#rus46";
-				specialeffect EF_DARKBREATH,AREA,"Maria Morebna#rus46";
-				specialeffect EF_DEVIL,AREA,"Maria Morebna#rus46";
-				mes "- Maria is attacked -";
-				mes "- and falls down!! -";
+				mes "- The key begins to glow -";
+				mes "- wind begins to blow -";
+				mes "- from somewhere -";
+				specialeffect2 EF_BEGINSPELL;
+				specialeffect EF_FREEZED;
 				next;
+			} else {
 				mes "["+ strcharinfo(0) +"]";
-				mes "Maria?! What happened?!";
-				sc_start SC_CURSE,60000,0;
-				emotion 23,1;
-				next;
-				mes "[Koshei, the Immortal]";
-				mes "I really want to thank you, human. Maria was imprisoned in the wall so I couldn't do anything!";
-				next;
-				mes "[Koshei, the Immortal]";
-				mes "She'll thank me for giving her a quick death!!";
-				next;
-				mes "[Koshei, the Immortal]";
-				mes "But you, human... You are here to disturb me?";
-				next;
-				mes "[Koshei, the Immortal]";
-				mes "No one can stop me! Now, die!!!";
-				next;
-				mes "[Gray Wolf]";
-				mes "Watch out!!";
-				next;
-				donpcevent "Gray Wolf#rus05::OnEnable";
-				mes "[Koshei, the Immortal]";
-				mes "Gray Wolf...";
-				mes "You think you can fight me?!";
+				mes " "+ .@input$ +" !! ";
 				next;
-				specialeffect EF_FIREHIT,AREA,"Gray Wolf#rus05";
-				mes "- Staggering from -";
-				mes "- Koshei's flames, -";
-				mes "- Gray Wolf quickly tell me -";
-				next;
-				mes "[Gray Wolf]";
-				mes "Listen, I can still help Maria if I treat her now.";
-				mes "I will flee with her and leave you to deal with Koshei!!";
+				mes "[Girl's Voice]";
+				mes ".........................................................................................";
 				next;
-				donpcevent "Gray Wolf#rus05::OnDisable";
-				donpcevent "Maria Morebna#rus46::OnDisable";
-				mes "[Koshei, the Immortal]";
-				mes "Stop! Where do you think you're going?!!!";
-				delitem 7876,1;
-				set rhea_rus_main,48;
-				monster "mosk_dun01",45,256,"Koshei, the Immortal",1890,1,"Wall#rus04::OnMyMobDead";
-				donpcevent "Koshei#rus47::OnEnable";
+				mes "[Girl's Voice]";
+				mes "You must've said it wrong...";
+				set $@rus_req02,0;
 				close;
 			}
-		}else{
-			mes "[Girl's Voice]";
-			mes "Have you.. got the key?";
+			mes "- The wind disappears and -";
+			mes "- a very young girl appears -";
+			donpcevent "Maria Morebna#rus46::OnEnable";
+			specialeffect EF_FREEZED,AREA,"Maria Morebna#rus46";
+			next;
+			mes "[Maria Morebna]";
+			mes "Thank you!";
+			mes "I'm finally out of there! Now I can.....................aaaaak!!!....";
+			next;
+			specialeffect EF_HIT2,AREA,"Maria Morebna#rus46";
+			specialeffect EF_DARKBREATH,AREA,"Maria Morebna#rus46";
+			specialeffect EF_DEVIL,AREA,"Maria Morebna#rus46";
+			mes "- Maria is attacked -";
+			mes "- and falls down!! -";
 			next;
 			mes "["+ strcharinfo(0) +"]";
-			mes "Sure! Here it...";
-			mes "...............Errr?";
+			mes "Maria?! What happened?!";
+			sc_start SC_CURSE,60000,0;
+			emotion 23,1;
+			next;
+			mes "[Koshei, the Immortal]";
+			mes "I really want to thank you, human. Maria was imprisoned in the wall so I couldn't do anything!";
+			next;
+			mes "[Koshei, the Immortal]";
+			mes "She'll thank me for giving her a quick death!!";
+			next;
+			mes "[Koshei, the Immortal]";
+			mes "But you, human... You are here to disturb me?";
+			next;
+			mes "[Koshei, the Immortal]";
+			mes "No one can stop me! Now, die!!!";
+			next;
+			mes "[Gray Wolf]";
+			mes "Watch out!!";
+			next;
+			donpcevent "Gray Wolf#rus05::OnEnable";
+			mes "[Koshei, the Immortal]";
+			mes "Gray Wolf...";
+			mes "You think you can fight me?!";
+			next;
+			specialeffect EF_FIREHIT,AREA,"Gray Wolf#rus05";
+			mes "- Staggering from -";
+			mes "- Koshei's flames, -";
+			mes "- Gray Wolf quickly tell me -";
+			next;
+			mes "[Gray Wolf]";
+			mes "Listen, I can still help Maria if I treat her now.";
+			mes "I will flee with her and leave you to deal with Koshei!!";
+			next;
+			donpcevent "Gray Wolf#rus05::OnDisable";
+			donpcevent "Maria Morebna#rus46::OnDisable";
+			mes "[Koshei, the Immortal]";
+			mes "Stop! Where do you think you're going?!!!";
+			delitem 7876,1;
+			set rhea_rus_main,48;
+			monster "mosk_dun01",45,256,"Koshei, the Immortal",1890,1,"Wall#rus04::OnMyMobDead";
+			donpcevent "Koshei#rus47::OnEnable";
 			close;
 		}
-	}
-	else if (rhea_rus_main == 48) {
+		mes "[Girl's Voice]";
+		mes "Have you.. got the key?";
+		next;
+		mes "["+ strcharinfo(0) +"]";
+		mes "Sure! Here it...";
+		mes "...............Errr?";
+		close;
+	} else if (rhea_rus_main == 48) {
 		if ($@rus_req02 == 1) {
 			mes "[Gray Wolf's voice]";
 			mes "I can sense Koshei's presence.";
@@ -10866,32 +7169,30 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 			mes "I can still help Maria if I treat her now.";
 			mes "I will flee with her and leave you to deal with Koshei!!";
 			close;
-		}else{
-			mes "["+ strcharinfo(0) +"]";
-			mes "...Maria...";
-			mes "I... could do nothing...";
-			next;
-			mes "[Gray Wolf]";
-			mes "No, it's not too late!";
-			emotion 0,1;
-			donpcevent "Gray Wolf#rus05::OnEnable";
-			next;
-			mes "[Gray Wolf]";
-			mes "She's alive.";
-			mes "But, she's still unstable.";
-			next;
-			mes "[Gray Wolf]";
-			mes "To save her, I need 'Life Water' and 'Death Water'. Find Baba Yaga, she'll know what to do.";
-			next;
-			mes "[Gray Wolf]";
-			mes "I can't keep her alive for much longer. You must find Baba Yaga.";
-			set rhea_rus_main,49;
-			close2;
-			donpcevent "Gray Wolf#rus05::OnDisable";
-			end;
 		}
-	}
-	else if (rhea_rus_main > 48 && rhea_rus_main < 51) {
+		mes "["+ strcharinfo(0) +"]";
+		mes "...Maria...";
+		mes "I... could do nothing...";
+		next;
+		mes "[Gray Wolf]";
+		mes "No, it's not too late!";
+		emotion 0,1;
+		donpcevent "Gray Wolf#rus05::OnEnable";
+		next;
+		mes "[Gray Wolf]";
+		mes "She's alive.";
+		mes "But, she's still unstable.";
+		next;
+		mes "[Gray Wolf]";
+		mes "To save her, I need 'Life Water' and 'Death Water'. Find Baba Yaga, she'll know what to do.";
+		next;
+		mes "[Gray Wolf]";
+		mes "I can't keep her alive for much longer. You must find Baba Yaga.";
+		set rhea_rus_main,49;
+		close2;
+		donpcevent "Gray Wolf#rus05::OnDisable";
+		end;
+	} else if (rhea_rus_main > 48 && rhea_rus_main < 51) {
 		mes "[Gray Wolf's voice]";
 		mes "But, she's still unstable.";
 		next;
@@ -10901,8 +7202,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 		mes "[Gray Wolf's voice]";
 		mes "I can't keep her alive for much longer. You must find Baba Yaga.";
 		close;
-	}
-	else if (rhea_rus_main == 51) {
+	} else if (rhea_rus_main == 51) {
 		if ($@rus_req02 == 1) {
 			mes "[Gray Wolf's voice]";
 			mes "I can sense Koshei's presence.";
@@ -10911,173 +7211,141 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 			mes "I can still help Maria if I treat her now.";
 			mes "I will flee with her and leave you to deal with Koshei!!";
 			close;
-		}else{
-			mes "[Gray Wolf's voice]";
-			mes "Did you get the 'Life Water' and 'Death Water'?";
-			next;
+		}
+		mes "[Gray Wolf's voice]";
+		mes "Did you get the 'Life Water' and 'Death Water'?";
+		next;
+		mes "["+ strcharinfo(0) +"]";
+		mes "I've got them! How's Maria?!";
+		donpcevent "Gray Wolf#rus05::OnEnable";
+		donpcevent "Maria Morebna#rus46::OnEnable";
+		next;
+		mes "[Gray Wolf]";
+		mes "I fear that her spirit has gone. Severe wounds and curses are hindering her spirit from coming back. But we can save her with that water.";
+		next;
+		mes "["+ strcharinfo(0) +"]";
+		mes "Ok... First...";
+		next;
+		if(select("Death Water:Life Water") == 1) {
 			mes "["+ strcharinfo(0) +"]";
-			mes "I've got them! How's Maria?!";
-			donpcevent "Gray Wolf#rus05::OnEnable";
-			donpcevent "Maria Morebna#rus46::OnEnable";
+			mes "I hope this works...";
 			next;
-			mes "[Gray Wolf]";
-			mes "I fear that her spirit has gone. Severe wounds and curses are hindering her spirit from coming back. But we can save her with that water.";
+			mes "- I pour the Death Water -";
+			mes "- on Maria's stiff body -";
 			next;
+		} else {
 			mes "["+ strcharinfo(0) +"]";
-			mes "Ok... First...";
+			mes "I hope this works...";
 			next;
-			if(select("Death Water:Life Water") == 1) {
-				mes "["+ strcharinfo(0) +"]";
-				mes "I hope this works...";
-				next;
-				mes "- I pour the Death Water -";
-				mes "- on Maria's stiff body -";
-				next;
-			}else{
-				mes "["+ strcharinfo(0) +"]";
-				mes "I hope this works...";
-				next;
-				mes "- I pour the Life Water -";
-				mes "- on Maria's stiff body -";
-				next;
-				mes "[Maria Morebna]";
-				mes "..........................";
-				next;
-				mes "- Nothing changed -";
-				next;
-				mes "["+ strcharinfo(0) +"]";
-				mes "Huk, was this wrong...?!";
-				next;
-				mes "[Gray Wolf]";
-				mes "What are you doing?! I told you we did not have much time! What are you going to do now?!";
-				next;
-				donpcevent "Gray Wolf#rus05::OnDisable";
-				donpcevent "Maria Morebna#rus46::OnDisable";
-				mes "["+ strcharinfo(0) +"]";
-				mes "I am so sorry. But some water is left...";
-				close;
-			}
-			mes "- The wounds and -";
-			mes "- curses on her body -";
-			mes "- are removed !! -";
-			specialeffect EF_ABSORBSPIRITS,AREA,"Maria Morebna#rus46";
+			mes "- I pour the Life Water -";
+			mes "- on Maria's stiff body -";
 			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "Ok! Next...";
+			mes "[Maria Morebna]";
+			mes "..........................";
 			next;
-			if(select("Death Water:Life Water") == 1) {
-				mes "["+ strcharinfo(0) +"]";
-				mes "Pour the 'Death Water' again...";
-				next;
-				mes "["+ strcharinfo(0) +"]";
-				mes "...!? No, not 'Death Water'.. I should pour 'Life Water'.......";
-				next;
-				mes "[Gray Wolf]";
-				mes "............................";
-				mes "Can I trust you...?";
-				next;
-				mes "["+ strcharinfo(0) +"]";
-				mes "Hehehe, you can trust me. Next is the 'Life Water'.";
-				next;
-				mes "- I pour 'Life Water' on Maria -";
-				next;
-			}else{
-				mes "["+ strcharinfo(0) +"]";
-				mes "Ok, next the 'Life Water'.";
-				next;
-				mes "- I pour the Life Water -";
-				mes "- on Maria's stiff body  -";
-				next;
-			}
-			mes "- !! -";
-			specialeffect EF_RESURRECTION,AREA,"Maria Morebna#rus46";
+			mes "- Nothing changed -";
 			next;
-			mes "[Gray Wolf]";
-			mes "Success!!";
+			mes "["+ strcharinfo(0) +"]";
+			mes "Huk, was this wrong...?!";
 			next;
-			mes "[Maria Morebna]";
-			mes "Ah, did I...?!";
-			mes "You saved me. I really appreicate it. Thank you for helping us fight against Koshei.";
+			mes "[Gray Wolf]";
+			mes "What are you doing?! I told you we did not have much time! What are you going to do now?!";
 			next;
-			mes "[Maria Morebna]";
-			mes "And you, Gray Wolf.. Thank you for protecting me while I was helpless.";
+			donpcevent "Gray Wolf#rus05::OnDisable";
+			donpcevent "Maria Morebna#rus46::OnDisable";
+			mes "["+ strcharinfo(0) +"]";
+			mes "I am so sorry. But some water is left...";
+			close;
+		}
+		mes "- The wounds and -";
+		mes "- curses on her body -";
+		mes "- are removed !! -";
+		specialeffect EF_ABSORBSPIRITS,AREA,"Maria Morebna#rus46";
+		next;
+		mes "["+ strcharinfo(0) +"]";
+		mes "Ok! Next...";
+		next;
+		if(select("Death Water:Life Water") == 1) {
+			mes "["+ strcharinfo(0) +"]";
+			mes "Pour the 'Death Water' again...";
 			next;
-			mes "[Maria Morebna]";
-			mes "Koshei wasn't completely destroyed. But, his power has weakened, it shouldn't be hard to seal his power without me also being sealed.";
+			mes "["+ strcharinfo(0) +"]";
+			mes "...!? No, not 'Death Water'.. I should pour 'Life Water'.......";
 			next;
-			mes "[Maria Morebna]";
-			mes "Koshei and I are bound by magic. If one's power should be sealed, the other must be sealed as well.";
+			mes "[Gray Wolf]";
+			mes "............................";
+			mes "Can I trust you...?";
 			next;
-			mes "[Maria Morebna]";
-			mes "But the original seal weakened over time and Koshei was able to get out of his confinement. That is why I asked you to get me out of here.";
+			mes "["+ strcharinfo(0) +"]";
+			mes "Hehehe, you can trust me. Next is the 'Life Water'.";
 			next;
-			mes "[Maria Morebna]";
-			mes "He realized that I was trying to break free and waited here for anyone who would help me. I never ever expected it...";
+			mes "- I pour 'Life Water' on Maria -";
 			next;
-			mes "[Maria Morebna]";
-			mes "Anyway, I'm so grateful for everything you did.";
+		} else {
+			mes "["+ strcharinfo(0) +"]";
+			mes "Ok, next the 'Life Water'.";
 			next;
-			mes "[Maria Morebna]";
-			mes "Please accept my poor reward, I hope that it will be of some help for such a brave adventurer. I hope that the gods will bless you on your journey.";
+			mes "- I pour the Life Water -";
+			mes "- on Maria's stiff body  -";
 			next;
-			mes "[Maria Morebna]";
-			mes "It's been a long time since I've felt the sunlight, fresh wind and the scent of grass. I'm so grateful.";
-			set rhea_rus_main,52;
-			set .@rus_food,rand(1,6);
-			if (.@rus_food == 1) {
-				getitem 12093,1;
-			}
-			else if (.@rus_food == 2) {
-				getitem 12088,1;
-			}
-			else if (.@rus_food == 3) {
-				getitem 12073,1;
-			}
-			else if (.@rus_food == 4) {
-				getitem 12078,1;
-			}
-			else if (.@rus_food == 5) {
-				getitem 12083,1;
-			}
-			else {
-				getitem 12098,1;
-			}
-			if (BaseLevel < 56) {
-				getexp 1300,350;
-			}
-			else if (BaseLevel > 55 && BaseLevel < 61) {
-				getexp 2460,615;
-			}
-			else if (BaseLevel > 60 && BaseLevel < 66) {
-				getexp 4242,1061;
-			}
-			else if (BaseLevel > 65 && BaseLevel < 71) {
-				getexp 6489,1622;
-			}
-			else if (BaseLevel > 70 && BaseLevel < 76) {
-				getexp 16491,4123;
-			}
-			else if (BaseLevel > 75 && BaseLevel < 81) {
-				getexp 27629,6907;
-			}
-			else if (BaseLevel > 80 && BaseLevel < 86) {
-				getexp 34041,8510;
-			}
-			else if (BaseLevel > 85 && BaseLevel < 91) {
-				getexp 41846,10462;
-			}
-			else if (BaseLevel > 90 && BaseLevel < 150) {
-				getexp 88814,22204;
-			}
-			else {
-				getitem 617,1;
-			}
-			donpcevent "Gray Wolf#rus05::OnDisable";
-			donpcevent "Maria Morebna#rus46::OnDisable";
-			close;
 		}
-	}
-	else if (rhea_rus_main > 51) {
+		mes "- !! -";
+		specialeffect EF_RESURRECTION,AREA,"Maria Morebna#rus46";
+		next;
+		mes "[Gray Wolf]";
+		mes "Success!!";
+		next;
+		mes "[Maria Morebna]";
+		mes "Ah, did I...?!";
+		mes "You saved me. I really appreicate it. Thank you for helping us fight against Koshei.";
+		next;
+		mes "[Maria Morebna]";
+		mes "And you, Gray Wolf.. Thank you for protecting me while I was helpless.";
+		next;
+		mes "[Maria Morebna]";
+		mes "Koshei wasn't completely destroyed. But, his power has weakened, it shouldn't be hard to seal his power without me also being sealed.";
+		next;
+		mes "[Maria Morebna]";
+		mes "Koshei and I are bound by magic. If one's power should be sealed, the other must be sealed as well.";
+		next;
+		mes "[Maria Morebna]";
+		mes "But the original seal weakened over time and Koshei was able to get out of his confinement. That is why I asked you to get me out of here.";
+		next;
+		mes "[Maria Morebna]";
+		mes "He realized that I was trying to break free and waited here for anyone who would help me. I never ever expected it...";
+		next;
+		mes "[Maria Morebna]";
+		mes "Anyway, I'm so grateful for everything you did.";
+		next;
+		mes "[Maria Morebna]";
+		mes "Please accept my poor reward, I hope that it will be of some help for such a brave adventurer. I hope that the gods will bless you on your journey.";
+		next;
+		mes "[Maria Morebna]";
+		mes "It's been a long time since I've felt the sunlight, fresh wind and the scent of grass. I'm so grateful.";
+		set rhea_rus_main,52;
+		set .@rus_food,rand(1,6);
+		switch (rand(1,6)) {
+			Case 1: getitem 12093,1; break;
+			Case 2: getitem 12088,1; break;
+			Case 3: getitem 12073,1; break;
+			Case 4: getitem 12078,1; break;
+			Case 5: getitem 12083,1; break;
+			Case 6: getitem 12098,1; break;
+		}
+		if (BaseLevel < 56) getexp 1300,350;
+		else if (BaseLevel < 61) getexp 2460,615;
+		else if (BaseLevel < 66) getexp 4242,1061;
+		else if (BaseLevel < 71) getexp 6489,1622;
+		else if (BaseLevel < 76) getexp 16491,4123;
+		else if (BaseLevel < 81) getexp 27629,6907;
+		else if (BaseLevel < 86) getexp 34041,8510;
+		else if (BaseLevel < 91) getexp 41846,10462;
+		else if (BaseLevel < 150) getexp 88814,22204;
+		else getitem 617,1;
+		donpcevent "Gray Wolf#rus05::OnDisable";
+		donpcevent "Maria Morebna#rus46::OnDisable";
+		close;
+	} else if (rhea_rus_main > 51) {
 		mes "[Girl's Voice]";
 		mes "... Koshei is immortal and will surely appear again someday...";
 		next;
@@ -11121,7 +7389,6 @@ OnMyMobDead:
 //----------------------------------------------------------------------------
 mosk_dun01,5,5,0	script	Koshei#rus47	-1,0,0,{
 	end;
-
 OnInit:
 	disablenpc "Koshei#rus47";
 	end;
@@ -11155,66 +7422,37 @@ OnTimer300000:
 }
 
 //----------------------------------------------------------------------------
-// Gray Wolf
+// Gray Wolf & Maria Morebna
 //----------------------------------------------------------------------------
-mosk_dun01,50,256,3	script	Gray Wolf#rus05	972,{
+-	script	mos_rus#main	-1,{
 	end;
-
 OnInit:
-	disablenpc "Gray Wolf#rus05";
+	if (compare(strnpcinfo(0),"main")) end;
+	disablenpc strnpcinfo(0);
 	end;
 
 OnEnable:
 	initnpctimer;
-	enablenpc "Gray Wolf#rus05";
+	enablenpc strnpcinfo(0);
 	end;
 
 OnDisable:
 	stopnpctimer;
-	disablenpc "Gray Wolf#rus05";
+	disablenpc strnpcinfo(0);
 	end;
 
 OnTimer120000:
 	stopnpctimer;
-	donpcevent "Gray Wolf#rus05::OnDisable";
-	end;
-}
-
-//----------------------------------------------------------------------------
-// Maria Morebna
-//----------------------------------------------------------------------------
-mosk_dun01,46,256,3	script	Maria Morebna#rus46	958,{
-	end;
-
-OnInit:
-	disablenpc "Maria Morebna#rus46";
-	end;
-
-OnEnable:
-	initnpctimer;
-	enablenpc "Maria Morebna#rus46";
-	end;
-
-OnDisable:
-	stopnpctimer;
-	disablenpc "Maria Morebna#rus46";
-	end;
-
-OnTimer120000:
-	donpcevent "Maria Morebna#rus46::OnDisable";
+	donpcevent strnpcinfo(0)+"::OnDisable";
 	end;
 }
+mosk_dun01,50,256,3	duplicate(mos_rus#main)	Gray Wolf#rus05	972
+mosk_dun01,46,256,3	duplicate(mos_rus#main)	Maria Morebna#rus46	958
 
 //----------------------------------------------------------------------------
 // The Blacksmith (Golden Key)
 //----------------------------------------------------------------------------
 moscovia,178,127,0	script	The Blacksmith#rus06	63,{
-	if (checkweight(1201,1) == 0) {
-		mes "[The Blacksmith]";
-		mes "Why are you carrying that much?";
-		mes "Are you training for something?";
-		close;
-	}
 	if ((MaxWeight-Weight) < 3500) {
 		mes "[The Blacksmith]";
 		mes "Why are you carrying that much?";
@@ -11230,8 +7468,7 @@ moscovia,178,127,0	script	The Blacksmith#rus06	63,{
 		mes "[The Blacksmith]";
 		mes "But, I've heard that some people have become lost in the forest on the island near this village. What's going on?";
 		close;
-	}
-	else if (rhea_rus_main == 6) {
+	} else if (rhea_rus_main == 6) {
 		mes "[The Blacksmith]";
 		mes "Bahaha~";
 		mes "Good weather! Eh?";
@@ -11297,8 +7534,7 @@ moscovia,178,127,0	script	The Blacksmith#rus06	63,{
 		mes "I promise you, I'll explain when you bring the ^0000ff25 Steel^000000 to me. Please just get the Steel and come back.";
 		set rhea_rus_main,7;
 		close;
-	}
-	else if (rhea_rus_main == 7) {
+	} else if (rhea_rus_main == 7) {
 		if (countitem(999) > 24) {
 			mes "[The Blacksmith]";
 			mes "Ohhh, that was faster than I expected!";
@@ -11346,24 +7582,16 @@ moscovia,178,127,0	script	The Blacksmith#rus06	63,{
 			mes "And don't forget to wear these!";
 			delitem 999,25;
 			set rhea_rus_main,8;
-			if (BaseClass == Job_Merchant || BaseClass == Job_Swordman || BaseClass == Job_Thief || BaseClass == Job_Archer || BaseClass == Job_Ninja || BaseClass == Job_Gunslinger) {
-				getitem 2429,1;
-				close;
-			}else {
-				getitem 2430,1;
-				close;
-			}
-		}else{
-			mes "[The Blacksmith]";
-			mes "What are you doing? First, you must get me ^0000ff25 Steel^000000.";
-			next;
-			mes "[The Blacksmith]";
-			mes "The faster you get me the materials, The faster you can help Maria Morebna.";
-			close;
+			if (BaseClass == Job_Merchant || BaseClass == Job_Swordman || BaseClass == Job_Thief || BaseClass == Job_Archer || BaseClass == Job_Ninja || BaseClass == Job_Gunslinger) getitem 2429,1; else getitem 2430,1; close;
 		}
-	}
-	else if (rhea_rus_main == 8) {
-		if (countitem(724) > 1 && countitem(969) > 2 && countitem(7877) > 0 && countitem(7878) > 1 && countitem(7879) > 9) {
+		mes "[The Blacksmith]";
+		mes "What are you doing? First, you must get me ^0000ff25 Steel^000000.";
+		next;
+		mes "[The Blacksmith]";
+		mes "The faster you get me the materials, The faster you can help Maria Morebna.";
+		close;
+	} else if (rhea_rus_main == 8) {
+		if (countitem(724) > 1 && countitem(969) > 2 && countitem(7877) && countitem(7878) > 1 && countitem(7879) > 9) {
 			if (rhea_rus_ring > 8 && rhea_rus_hair > 8 && rhea_rus_quiz > 29) {
 				if(getequipid(EQI_SHOES) != 2429) {
 					if(getequipid(EQI_SHOES) != 2430) {
@@ -11409,88 +7637,33 @@ moscovia,178,127,0	script	The Blacksmith#rus06	63,{
 				mes "[The Blacksmith]";
 				mes "This spell protects you from any curse the keymaker might try to use. Remember the words of the spell. It won't last very long because I am just a blacksmith.";
 				next;
-				if (countitem(2429) > 0) {
-					mes "[The Blacksmith]";
-					mes "The forest is dangerous. Be very careful in there!";
-					mes "Ah and you shouldn't be needing those Steel Boots anymore. Good luck!";
-					delitem 2429,1;
-					set rhea_rus_main,9;
-					close;
-				}
-				else if (countitem(2430) > 0) {
+				if (countitem(2429) || countitem(2430)) {
 					mes "[The Blacksmith]";
 					mes "The forest is dangerous. Be very careful in there!";
 					mes "Ah and you shouldn't be needing those Steel Boots anymore. Good luck!";
-					delitem 2430,1;
+					if (countitem(2429)) delitem 2429,1; else delitem 2430,1;
 					set rhea_rus_main,9;
 					close;
 				}
-				else {
-					mes "[The Blacksmith]";
-					mes "The forest is dangerous. Be very careful in there!";
-					mes "Ah, and your steel boots..?";
-					next;
-					mes "[The Blacksmith]";
-					mes "Where are they?";
-					close;
-				}
-			}else{
 				mes "[The Blacksmith]";
-				mes "You need ^0000ff2 Cursed Ruby, 3 Gold, 1 Red Ring, 2 Lusalka's Hair, 10 Golden Thread^000000 to make the key.";
-				next;
-				switch(select("Red Ring?:Lusalka's Hair?:Golden Thread?")) {
-				case 1:
-					mes "[The Blacksmith]";
-					mes "The Red Ring has powerful enchanting powers. I had one before, but I gave it to my friend, Vassili, as a gift.";
-					next;
-					mes "[The Blacksmith]";
-					mes "I think it would be odd to ask him to give it back to me. So uh you've got to ask him if he would give it to you.";
-					next;
-					break;
-				case 2:
-					mes "[The Blacksmith]";
-					mes "It's said that a bride who drowns to death just before her wedding becomes Lusalka, the aqua fairy.";
-					mes "You must find Lusalka's hair.";
-					next;
-					mes "[The Blacksmith]";
-					mes "I heard that a young maid has been lost recently.";
-					mes "It's very unfortunate but...";
-					mes "she might be Lusalka...";
-					next;
-					mes "[The Blacksmith]";
-					mes "Her mother is somewhere in this village asking for people to help her find her missing daughter.";
-					next;
-					break;
-				case 3:
-					mes "[The Blacksmith]";
-					mes "Golden Thread is made from gold by using a special spinning wheel technique. I don't know exactly how it's done. But I know who does.";
-					next;
-					mes "[The Blacksmith]";
-					mes "Find a man named Marozka. He is the only one who knows how to use the spinning wheel to make the Golden Thread.";
-					next;
-					mes "[The Blacksmith]";
-					mes "Maria should know where he is.";
-					next;
-				}
-				mes "[The Blacksmith]";
-				mes "Ah, and... You still have the boots that I made right? ^ff0000Without them, you cannot get anything for the key, I swear. You must put on them.^000000";
+				mes "The forest is dangerous. Be very careful in there!";
+				mes "Ah, and your steel boots..?";
 				next;
 				mes "[The Blacksmith]";
-				mes "Well, you know what to do now. I will be waiting here.";
+				mes "Where are they?";
 				close;
 			}
-		}else{
-			mes "[The Blacksmith]";
-			mes "You need ^0000ff2 Cursed Ruby, 3 Gold, 1 Red Ring, 2 Lusalka's Hair, 10 Golden Thread^000000 to make the key.";
-			next;
-			switch(select("Red Ring?:Lusalka's Hair?:Golden Thread?")) {
+		}
+		mes "[The Blacksmith]";
+		mes "You need ^0000ff2 Cursed Ruby, 3 Gold, 1 Red Ring, 2 Lusalka's Hair, 10 Golden Thread^000000 to make the key.";
+		next;
+		switch(select("Red Ring?:Lusalka's Hair?:Golden Thread?")) {
 			case 1:
 				mes "[The Blacksmith]";
 				mes "The Red Ring has powerful enchanting powers. I had one before, but I gave it to my friend, Vassili, as a gift.";
 				next;
 				mes "[The Blacksmith]";
 				mes "I think it would be odd to ask him to give it back to me. So uh you've got to ask him if he would give it to you.";
-				next;
 				break;
 			case 2:
 				mes "[The Blacksmith]";
@@ -11504,7 +7677,6 @@ moscovia,178,127,0	script	The Blacksmith#rus06	63,{
 				next;
 				mes "[The Blacksmith]";
 				mes "Her mother is somewhere in this village asking for people to help her find her missing daughter.";
-				next;
 				break;
 			case 3:
 				mes "[The Blacksmith]";
@@ -11515,17 +7687,16 @@ moscovia,178,127,0	script	The Blacksmith#rus06	63,{
 				next;
 				mes "[The Blacksmith]";
 				mes "Maria should know where he is.";
-				next;
-			}
-			mes "[The Blacksmith]";
-			mes "Ah, and... You still have the boots that I made right? ^ff0000Without them, you cannot get anything for the key, I swear. You must put on them.^000000";
-			next;
-			mes "[The Blacksmith]";
-			mes "Well, you know what to do now. I will be waiting here.";
-			close;
+				break;
 		}
-	}
-	else if (rhea_rus_main == 9) {
+		next;
+		mes "[The Blacksmith]";
+		mes "Ah, and... You still have the boots that I made right? ^ff0000Without them, you cannot get anything for the key, I swear. You must put on them.^000000";
+		next;
+		mes "[The Blacksmith]";
+		mes "Well, you know what to do now. I will be waiting here.";
+		close;
+	} else if (rhea_rus_main == 9) {
 		mes "[The Blacksmith]";
 		mes "The keymaker is at a cabin deep inside of the forest.";
 		next;
@@ -11535,16 +7706,14 @@ moscovia,178,127,0	script	The Blacksmith#rus06	63,{
 		mes "[The Blacksmith]";
 		mes "Don't forget the spell, '^ff0000Spellshield Protection.^000000'";
 		close;
-	}
-	else if (rhea_rus_main > 9 && rhea_rus_main < 52) {
+	} else if (rhea_rus_main > 9 && rhea_rus_main < 52) {
 		mes "[The Blacksmith]";
 		mes "He is in his cabin deep inside of the forest. There, the keymaker of the Golden Key is living.";
 		next;
 		mes "[The Blacksmith]";
 		mes "The Golden Key is able to release Maria. Good luck!";
 		close;
-	}
-	else if (rhea_rus_main > 51) {
+	} else if (rhea_rus_main > 51) {
 		mes "[The Blacksmith]";
 		mes "I heard the news. You have done well.";
 		next;
@@ -11558,12 +7727,6 @@ moscovia,178,127,0	script	The Blacksmith#rus06	63,{
 // Vassili Grandpapa (Red Ring)
 //----------------------------------------------------------------------------
 moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
-	if (checkweight(1201,1) == 0) {
-		mes "[Vassili Grandpapa]";
-		mes "Why are you carring that much?";
-		mes "Are you training for something?";
-		close;
-	}
 	if ((MaxWeight-Weight) < 3500) {
 		mes "[Vassili Grandpapa]";
 		mes "Why are you carring that much?";
@@ -11584,8 +7747,7 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 		mes "[Vassili Grandpapa]";
 		mes "Eeee, I don't want to experience that coldness any more.";
 		close;
-	}
-	else if (rhea_rus_main == 8) {
+	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_ring < 1) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
@@ -11610,7 +7772,7 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 				mes "[Vassili Grandpapa]";
 				mes "Red Ring?! Why are you looking for that?";
 				next;
-			}else{
+			} else {
 				mes "[Vassili Grandpapa]";
 				mes "Mmm, what? I don't understand you.";
 				close;
@@ -11652,16 +7814,14 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 			mes "She disappeared soon... after Now all I have is Ryubaba. She is also pretty and smart but nothing can relieve the sadnesss in my heart from losing Mashenka...";
 			set rhea_rus_ring,1;
 			close;
-		}
-		else if (rhea_rus_ring > 0 && rhea_rus_ring < 8) {
+		} else if (rhea_rus_ring && rhea_rus_ring < 8) {
 			mes "[Vassili Grandpapa]";
 			mes "I can still remember how happy she was when I gave it to her.";
 			next;
 			mes "[Vassili Grandpapa]";
 			mes "She disappeared soon... after Now all I have is Ryubaba. She is also pretty and smart but nothing can relieve the sadnesss in my heart from losing Mashenka...";
 			close;
-		}
-		else if (rhea_rus_ring == 8) {
+		} else if (rhea_rus_ring == 8) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
@@ -11675,7 +7835,7 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 			mes "["+ strcharinfo(0) +"]";
 			mes "...Listen to... this.";
 			next;
-			if (countitem(7883) > 0) {
+			if (countitem(7883)) {
 				mes "- You play the flute -";
 				next;
 				mes "^ff0000Red ring that my father gave me^000000";
@@ -11780,50 +7940,28 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 				delitem 7883,1;
 				set rhea_rus_ring,10;
 				getitem 7877,1;
-				if (BaseLevel < 56) {
-					getexp 470,0;
-				}
-				else if (BaseLevel > 55 && BaseLevel < 61) {
-					getexp 615,0;
-				}
-				else if (BaseLevel > 60 && BaseLevel < 66) {
-					getexp 1061,0;
-				}
-				else if (BaseLevel > 65 && BaseLevel < 71) {
-					getexp 1622,0;
-				}
-				else if (BaseLevel > 70 && BaseLevel < 76) {
-					getexp 4123,0;
-				}
-				else if (BaseLevel > 75 && BaseLevel < 81) {
-					getexp 6907,0;
-				}
-				else if (BaseLevel > 80 && BaseLevel < 86) {
-					getexp 8510,0;
-				}
-				else if (BaseLevel > 85 && BaseLevel < 91) {
-					getexp 10462,0;
-				}
-				else if (BaseLevel > 90 && BaseLevel < 99) {
-					getexp 22204,0;
-				}
-				else {
-					getitem 607,1;
-				}
-				close;
-			}else{
-				mes "[Vassili Grandpapa]";
-				mes "...............................";
-				mes "...............................";
-				mes "...What did you say?";
-				next;
-				mes "["+ strcharinfo(0) +"]";
-				mes "Ehh?! This is weird. Where is the flute?!";
-				emotion 23,1;
+				if (BaseLevel < 56) getexp 470,0;
+				else if (BaseLevel > 55 && BaseLevel < 61) getexp 615,0;
+				else if (BaseLevel > 60 && BaseLevel < 66) getexp 1061,0;
+				else if (BaseLevel > 65 && BaseLevel < 71) getexp 1622,0;
+				else if (BaseLevel > 70 && BaseLevel < 76) getexp 4123,0;
+				else if (BaseLevel > 75 && BaseLevel < 81) getexp 6907,0;
+				else if (BaseLevel > 80 && BaseLevel < 86) getexp 8510,0;
+				else if (BaseLevel > 85 && BaseLevel < 91) getexp 10462,0;
+				else if (BaseLevel > 90 && BaseLevel < 99) getexp 22204,0;
+				else getitem 607,1;
 				close;
 			}
-		}
-		else if (rhea_rus_ring == 9) {
+			mes "[Vassili Grandpapa]";
+			mes "...............................";
+			mes "...............................";
+			mes "...What did you say?";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "Ehh?! This is weird. Where is the flute?!";
+			emotion 23,1;
+			close;
+		} else if (rhea_rus_ring == 9) {
 			mes "[Vassili Grandpapa]";
 			mes "You may think it is foolish but I cannot relieve the sadness of my lost daughter.";
 			next;
@@ -11831,29 +7969,16 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 			mes "It is parents that wander around the entrance of the village to wait for their children...";
 			close;
 		}
-		else {
-			mes "[Vassili Grandpapa]";
-			mes "..It is my fault that this tragedy between my daughters happened. I will spend the rest of my life trying to make up for it...";
-			close;
-		}
-	}
-	else {
-		mes "[Vassili Grandpapa]";
-		mes "..It is my fault that this tragedy between my daughters happened. I will spend the rest of my life trying to make up for it...";
-		close;
 	}
+	mes "[Vassili Grandpapa]";
+	mes "..It is my fault that this tragedy between my daughters happened. I will spend the rest of my life trying to make up for it...";
+	close;
 }
 
 //----------------------------------------------------------------------------
 // Ryubaba (Red Ring)
 //----------------------------------------------------------------------------
 moscovia,213,216,3	script	Ryubaba#rus08	960,{
-	if (checkweight(1201,1) == 0) {
-		mes "[Ryubaba]";
-		mes "What on earth do you have in your bag?";
-		mes "Are you training for something?";
-		close;
-	}
 	if ((MaxWeight-Weight) < 3500) {
 		mes "[Ryubaba]";
 		mes "What on earth do you have in your bag?";
@@ -11870,7 +7995,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 		close;
 	}
 	else if (rhea_rus_main == 8) {
-		if (rhea_rus_ring < 1) {
+		if (!rhea_rus_ring) {
 			mes "[Ryubaba]";
 			mes "Ah, how beautiful I am.";
 			next;
@@ -11878,8 +8003,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 			mes "Mmm, you must be an adventurer? What would you say? Have you seen somebody more beautiful than me? I doubt it. How can you find anyone more beautiful than me?";
 			emotion 18;
 			close;
-		}
-		else if (rhea_rus_ring == 1) {
+		} else if (rhea_rus_ring == 1) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
@@ -11894,22 +8018,18 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 			mes "Mmm, you must be an adventurer? What would you say? Have you seen somebody more beautiful than me? I doubt it. How can you find anyone more beautiful than me?";
 			next;
 			if(select("Are you crazy!:Yes, you are right.") == 1) {
-				if (Sex == 0) {
-					mes "["+ strcharinfo(0) +"]";
-					mes "Are you crazy!? Don't you know how wide the world is and how many beautiful people there are? You're pretty full of it, country girl!";
-					next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "Are you crazy!? Don't you know how wide the world is and how many beautiful people there are? You're pretty full of it, country girl!";
+				next;
+				if (!Sex) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "Besides, if there was a most beautiful girl in the world it would be me, me, me!";
-					next;
-				}else{
-					mes "["+ strcharinfo(0) +"]";
-					mes "Are you crazy!? Don't you know how wide the world is and how many beautiful people there are? You're pretty full of it, country girl!";
-					next;
+				} else {
 					mes "["+ strcharinfo(0) +"]";
 					mes "Have you seen dancers dancing? Have you seen beautiful and pure priests?!";
 					mes "And nothing is like the kind Kafra Employees!!!";
-					next;
 				}
+				next;
 				mes "[Ryubaba]";
 				mes "What!? You bastard!!";
 				mes "I hate you! Get out of my face!";
@@ -11927,16 +8047,14 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 			set rhea_rus_ring,4;
 			getitem 573,1;
 			close;
-		}
-		else if (rhea_rus_ring == 2) {
+		} else if (rhea_rus_ring == 2) {
 			mes "[Ryubaba]";
 			mes "I have never met a person ruder than you!";
 			mes "I hate you! Get out of my face!";
 			close2;
 			warp "moscovia",220,210;
 			end;
-		}
-		else if (rhea_rus_ring == 3) {
+		} else if (rhea_rus_ring == 3) {
 			if (countitem(748) > 0 || countitem(749) > 0) {
 				mes "[Ryubaba]";
 				mes "What? Why are you here? You get of my...";
@@ -11944,42 +8062,31 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 				mes "[Ryubaba]";
 				mes "...Is that for me?";
 				next;
-				if (countitem(748) > 0) {
+				if (countitem(748) || countitem(749)) {
 					mes "[Ryubaba]";
 					mes "Ok. Well, I forgive you.";
-					delitem 748,1;
+					if (countitem(748)) delitem 748,1; else delitem 749,1;
 					set rhea_rus_ring,4;
 					close;
 				}
-				else if (countitem(749) > 0) {
-					mes "[Ryubaba]";
-					mes "Ok. Well, I forgive you.";
-					delitem 749,1;
-					set rhea_rus_ring,4;
-					close;
-				}
-				else {
-					mes "[Ryubaba]";
-					mes "Well, I forgive.. eh?";
-					next;
-					mes "[Ryubaba]";
-					mes "What? Are you trying to trick me!?";
-					mes "I have never met a person ruder than you!";
-					mes "I hate you! Get out of my face!";
-					close2;
-					warp "moscovia",220,210;
-					end;
-				}
-			}else{
 				mes "[Ryubaba]";
+				mes "Well, I forgive.. eh?";
+				next;
+				mes "[Ryubaba]";
+				mes "What? Are you trying to trick me!?";
 				mes "I have never met a person ruder than you!";
 				mes "I hate you! Get out of my face!";
 				close2;
 				warp "moscovia",220,210;
 				end;
 			}
-		}
-		else if (rhea_rus_ring == 4) {
+			mes "[Ryubaba]";
+			mes "I have never met a person ruder than you!";
+			mes "I hate you! Get out of my face!";
+			close2;
+			warp "moscovia",220,210;
+			end;
+		} else if (rhea_rus_ring == 4) {
 			mes "[Ryubaba]";
 			mes "Huhu, have you ever met anyone as beautiful as I am?";
 			next;
@@ -11997,7 +8104,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 				mes "[Ryubaba]";
 				mes "A Red Ring?!";
 				next;
-			}else{
+			} else { 
 				mes "[Ryubaba]";
 				mes "Heh, what are you talking about? What is that?";
 				close;
@@ -12013,8 +8120,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 			mes "Right... Let me finish talking. We tried searching for her but we couldn't find her. She must have been wearing the ring when she disappeared around the marsh.";
 			set rhea_rus_ring,5;
 			close;
-		}
-		else if (rhea_rus_ring > 4 && rhea_rus_ring < 7) {
+		} else if (rhea_rus_ring > 4 && rhea_rus_ring < 7) {
 			mes "[Ryubaba]";
 			mes "Ah, that ring... Yes, my father gave it to my baby sister, Mashenka.";
 			mes "But, she went out to take a stroll and disappeared around the marsh.";
@@ -12025,8 +8131,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 			mes "[Ryubaba]";
 			mes "Right... Let me finish talking. We tried searching for her but we couldn't find her. She must have been wearing the ring when she disappeared around the marsh.";
 			close;
-		}
-		else if (rhea_rus_ring == 7) {
+		} else if (rhea_rus_ring == 7) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
@@ -12137,45 +8242,23 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 				delitem 7883,1;
 				set rhea_rus_ring,9;
 				getitem 7877,1;
-				if (BaseLevel < 56) {
-					getexp 470,0;
-				}
-				else if (BaseLevel > 55 && BaseLevel < 61) {
-					getexp 615,0;
-				}
-				else if (BaseLevel > 60 && BaseLevel < 66) {
-					getexp 1061,0;
-				}
-				else if (BaseLevel > 65 && BaseLevel < 71) {
-					getexp 1622,0;
-				}
-				else if (BaseLevel > 70 && BaseLevel < 76) {
-					getexp 4123,0;
-				}
-				else if (BaseLevel > 75 && BaseLevel < 81) {
-					getexp 6907,0;
-				}
-				else if (BaseLevel > 80 && BaseLevel < 86) {
-					getexp 8510,0;
-				}
-				else if (BaseLevel > 85 && BaseLevel < 91) {
-					getexp 10462,0;
-				}
-				else if (BaseLevel > 90 && BaseLevel < 99) {
-					getexp 22204,0;
-				}
-				else{
-					getitem 607,1;
-				}
-				close;
-			}else{
-				mes "["+ strcharinfo(0) +"]";
-				mes "...!? Where is the flute!?";
-				emotion 23,1;
+				if (BaseLevel < 56) getexp 470,0;
+				else if (BaseLevel < 61) getexp 615,0;
+				else if (BaseLevel < 66) getexp 1061,0;
+				else if (BaseLevel < 71) getexp 1622,0;
+				else if (BaseLevel < 76) getexp 4123,0;
+				else if (BaseLevel < 81) getexp 6907,0;
+				else if (BaseLevel < 86) getexp 8510,0;
+				else if (BaseLevel < 91) getexp 10462,0;
+				else if (BaseLevel < 99) getexp 22204,0;
+				else getitem 607,1;
 				close;
 			}
-		}
-		else if (rhea_rus_ring == 8) {
+			mes "["+ strcharinfo(0) +"]";
+			mes "...!? Where is the flute!?";
+			emotion 23,1;
+			close;
+		} else if (rhea_rus_ring == 8) {
 			mes "[Ryubaba]";
 			mes "You give it back to me!";
 			next;
@@ -12187,17 +8270,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 			close2;
 			warp "moscovia",203,80;
 			end;
-		}else{
-			mes "[Ryubaba]";
-			mes "................................";
-			mes "I was stupid...";
-			next;
-			mes "[Ryubaba]";
-			mes "I have to repent for my sins and atone for them for the rest of my life.";
-			close;
 		}
-	}
-	else {
 		mes "[Ryubaba]";
 		mes "................................";
 		mes "I was stupid...";
@@ -12206,6 +8279,13 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 		mes "I have to repent for my sins and atone for them for the rest of my life.";
 		close;
 	}
+	mes "[Ryubaba]";
+	mes "................................";
+	mes "I was stupid...";
+	next;
+	mes "[Ryubaba]";
+	mes "I have to repent for my sins and atone for them for the rest of my life.";
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -12217,8 +8297,7 @@ moscovia,223,210,3	script	Little Boy#rus09	962,{
 		mes "I will be an adventer and will marry the most beautiful bride!";
 		mes "A bride more beautiful than sister Ryubaba!";
 		close;
-	}
-	else if (rhea_rus_main == 8) {
+	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_ring == 2) {
 			mes "[Little Boy]";
 			mes "Hehe, you have done by her?";
@@ -12230,7 +8309,7 @@ moscovia,223,210,3	script	Little Boy#rus09	962,{
 			mes "[Little Boy]";
 			mes "I don't like her cause she doesn't give me candies or cookies. Although she is beautiful, her temper is so bad...";
 			next;
-			if (countitem(529) > 0 || countitem(538) > 0) {
+			if (countitem(529) || countitem(538)) {
 				mes "[Little Boy]";
 				mes "Ah, do you have candies or cookies?";
 				next;
@@ -12247,50 +8326,31 @@ moscovia,223,210,3	script	Little Boy#rus09	962,{
 				mes "[Little Boy]";
 				mes "Ah, I will inform you of something!";
 				next;
-				if (countitem(529) > 0) {
+				if (countitem(529)) {
 					mes "[Little Boy]";
 					mes "Sister Ryubaba likes presents! Especially flowers such as roses. She believes that they resemble her.";
-					delitem 529,1;
+					if (countitem(529)) delitem 529,1; else delitem 538,1;
 					set rhea_rus_ring,3;
 					close;
 				}
-				else if (countitem(538) > 0) {
-					mes "[Little Boy]";
-					mes "Sister Ryubaba likes presents! Especially flowers such as roses. She believes that they resemble her.";
-					delitem 538,1;
-					set rhea_rus_ring,3;
-					close;
-				}
-				else {
-					mes "[Little Boy]";
-					mes "Sister Ryubaba likes.. eh?";
-					mes "Don't you have candies or cookies? Don't you want to give them to me?";
-					close;
-				}
-			}else{
 				mes "[Little Boy]";
-				mes "I love candy and cookies most.";
+				mes "Sister Ryubaba likes.. eh?";
+				mes "Don't you have candies or cookies? Don't you want to give them to me?";
 				close;
 			}
-		}
-		else if (rhea_rus_ring == 3) {
 			mes "[Little Boy]";
-			mes "Sister Ryubaba likes presents! Especially flowers such as roses. She believes that they resemble her.";
+			mes "I love candy and cookies most.";
 			close;
-		}
-		else {
+		} else if (rhea_rus_ring == 3) {
 			mes "[Little Boy]";
-			mes "I will be an adventer and will marry the most beautiful bride!";
-			mes "A bride more beautiful than sister Ryubaba!";
+			mes "Sister Ryubaba likes presents! Especially flowers such as roses. She believes that they resemble her.";
 			close;
 		}
 	}
-	else {
-		mes "[Little Boy]";
-		mes "I will be an adventer and will marry the most beautiful bride!";
-		mes "A bride more beautiful than sister Ryubaba!";
-		close;
-	}
+	mes "[Little Boy]";
+	mes "I will be an adventer and will marry the most beautiful bride!";
+	mes "A bride more beautiful than sister Ryubaba!";
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -12304,8 +8364,7 @@ mosk_fild02,157,233,0	script	Shepherdess#rus10	69,{
 		mes "[Shepherdess]";
 		mes "I wish that I could listen to music all the time.";
 		close;
-	}
-	else if (rhea_rus_main == 8) {
+	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_ring < 5) {
 			mes "[Shepherdess]";
 			mes "Haaaa, boring, boring! Herding sheep is really boring!";
@@ -12313,8 +8372,7 @@ mosk_fild02,157,233,0	script	Shepherdess#rus10	69,{
 			mes "[Shepherdess]";
 			mes "I wish that I could listen to music all the time.";
 			close;
-		}
-		else if (rhea_rus_ring == 5) {
+		} else if (rhea_rus_ring == 5) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
@@ -12344,8 +8402,7 @@ mosk_fild02,157,233,0	script	Shepherdess#rus10	69,{
 			mes "I am an excellent flute player! If you get me enough Pointed Branches, I will make a flute from them and play beautiful music for you. Please~!";
 			set rhea_rus_ring,6;
 			close;
-		}
-		else if (rhea_rus_ring == 6) {
+		} else if (rhea_rus_ring == 6) {
 			if (countitem(7882) > 24) {
 				if(getequipid(EQI_SHOES) != 2429) {
 					if(getequipid(EQI_SHOES) != 2430) {
@@ -12400,62 +8457,48 @@ mosk_fild02,157,233,0	script	Shepherdess#rus10	69,{
 				set rhea_rus_ring,7;
 				getitem 7883,1;
 				close;
-			}else{
-				mes "[Shepherdess]";
-				mes "Hm, I think I might have heard something about her but I don't remember...";
-				mes "You should check around the marsh yourself to see if you find something.";
-				next;
-				mes "[Shepherdess]";
-				mes "Ah, right! While you're searching, can you gather some Pointed Branches for me? Could you please get me ^0000ff50 Pointed Branches^000000?";
-				next;
-				mes "[Shepherdess]";
-				mes "I am an excellent flute player! If you get me enough Pointed Branches, I will make a flute from them and play beautiful music for you. Please~!";
-				close;
 			}
-		}
-		else if (rhea_rus_ring > 6) {
 			mes "[Shepherdess]";
-			mes "I will never play a flute made from the Pointed Branches around the marsh ever again!";
-			close;
-		}
-		else {
+			mes "Hm, I think I might have heard something about her but I don't remember...";
+			mes "You should check around the marsh yourself to see if you find something.";
+			next;
 			mes "[Shepherdess]";
-			mes "Haaaa, boring, boring! Herding sheep is really boring!";
+			mes "Ah, right! While you're searching, can you gather some Pointed Branches for me? Could you please get me ^0000ff50 Pointed Branches^000000?";
 			next;
 			mes "[Shepherdess]";
-			mes "I wish that I could listen to music all the time.";
+			mes "I am an excellent flute player! If you get me enough Pointed Branches, I will make a flute from them and play beautiful music for you. Please~!";
+			close;
+		} else if (rhea_rus_ring > 6) {
+			mes "[Shepherdess]";
+			mes "I will never play a flute made from the Pointed Branches around the marsh ever again!";
 			close;
 		}
 	}
-	else {
-		mes "[Shepherdess]";
-		mes "Haaaa, boring, boring! Herding sheep is really boring!";
-		next;
-		mes "[Shepherdess]";
-		mes "I wish that I could listen to music all the time.";
-		close;
-	}
+	mes "[Shepherdess]";
+	mes "Haaaa, boring, boring! Herding sheep is really boring!";
+	next;
+	mes "[Shepherdess]";
+	mes "I wish that I could listen to music all the time.";
+	close;
 }
 
 //----------------------------------------------------------------------------
 // Pointed Trees (Wooden Flute)
 //----------------------------------------------------------------------------
-mosk_fild02,151,188,0	script	Pointed Tree#rus11	111,{
+-	script	PTree#rusmain	-1,{
 	if (rhea_rus_ring == 6) {
 		if (countitem(7882) < 50) {
-			set .@branch01,rand(1,3);
-			if (.@branch01 == 2) {
+			if (rand(1,3) == 2) {
 				mes "- I avoid the thorns and -";
 				mes "- cut off a branch!! -";
 				getitem 7882,1;
 				donpcevent "Pointed Tree#rus11::OnDisable";
 				close;
-			}else{
-				mes "- My hand is pricked by thorns! -";
-				specialeffect2 EF_HIT2;
-				percentheal -5,0;
-				close;
 			}
+			mes "- My hand is pricked by thorns! -";
+			specialeffect2 EF_HIT2;
+			percentheal -5,0;
+			close;
 		}
 	}
 
@@ -12477,272 +8520,14 @@ OnTimer60000:
 	donpcevent "Pointed Tree#rus11::OnEnable";
 	end;
 }
-
-mosk_fild02,160,227,0	script	Pointed Tree#rus12	111,{
-	if (rhea_rus_ring == 6) {
-		if (countitem(7882) < 50) {
-			set .@branch01,rand(1,3);
-			if (.@branch01 == 2) {
-				mes "- I avoid the thorns and -";
-				mes "- cut off a branch!! -";
-				getitem 7882,1;
-				donpcevent "Pointed Tree#rus12::OnDisable";
-				close;
-			}else{
-				mes "- My hand is pricked by thorns! -";
-				specialeffect2 EF_HIT2;
-				percentheal -5,0;
-				close;
-			}
-		}
-	}
-
-OnInit:
-	enablenpc "Pointed Tree#rus12";
-	end;
-
-OnEnable:
-	stopnpctimer;
-	enablenpc "Pointed Tree#rus12";
-	end;
-
-OnDisable:
-	initnpctimer;
-	disablenpc "Pointed Tree#rus12";
-	end;
-
-OnTimer60000:
-	donpcevent "Pointed Tree#rus12::OnEnable";
-	end;
-}
-
-mosk_fild02,160,179,0	script	Pointed Tree#rus13	111,{
-	if (rhea_rus_ring == 6) {
-		if (countitem(7882) < 50) {
-			set .@branch01,rand(1,3);
-			if (.@branch01 == 2) {
-				mes "- I avoid the thorns and -";
-				mes "- cut off a branch!! -";
-				getitem 7882,1;
-				donpcevent "Pointed Tree#rus13::OnDisable";
-				close;
-			}else{
-				mes "- My hand is pricked by thorns! -";
-				specialeffect2 EF_HIT2;
-				percentheal -5,0;
-				close;
-			}
-		}
-	}
-
-OnInit:
-	enablenpc "Pointed Tree#rus13";
-	end;
-
-OnEnable:
-	stopnpctimer;
-	enablenpc "Pointed Tree#rus13";
-	end;
-
-OnDisable:
-	initnpctimer;
-	disablenpc "Pointed Tree#rus13";
-	end;
-
-OnTimer60000:
-	donpcevent "Pointed Tree#rus13::OnEnable";
-	end;
-}
-
-mosk_fild02,142,247,0	script	Pointed Tree#rus14	111,{
-	if (rhea_rus_ring == 6) {
-		if (countitem(7882) < 50) {
-			set .@branch01,rand(1,3);
-			if (.@branch01 == 2) {
-				mes "- I avoid the thorns and -";
-				mes "- cut off a branch!! -";
-				getitem 7882,1;
-				donpcevent "Pointed Tree#rus14::OnDisable";
-				close;
-			}else{
-				mes "- My hand is pricked by thorns! -";
-				specialeffect2 EF_HIT2;
-				percentheal -5,0;
-				close;
-			}
-		}
-	}
-
-OnInit:
-	enablenpc "Pointed Tree#rus14";
-	end;
-
-OnEnable:
-	stopnpctimer;
-	enablenpc "Pointed Tree#rus14";
-	end;
-
-OnDisable:
-	initnpctimer;
-	disablenpc "Pointed Tree#rus14";
-	end;
-
-OnTimer60000:
-	donpcevent "Pointed Tree#rus14::OnEnable";
-	end;
-}
-
-mosk_fild02,149,223,0	script	Pointed Tree#rus15	111,{
-	if (rhea_rus_ring == 6) {
-		if (countitem(7882) < 50) {
-			set .@branch01,rand(1,3);
-			if (.@branch01 == 2) {
-				mes "- I avoid the thorns and -";
-				mes "- cut off a branch!! -";
-				getitem 7882,1;
-				donpcevent "Pointed Tree#rus15::OnDisable";
-				close;
-			}else{
-				mes "- My hand is pricked by thorns! -";
-				specialeffect2 EF_HIT2;
-				percentheal -5,0;
-				close;
-			}
-		}
-	}
-
-OnInit:
-	enablenpc "Pointed Tree#rus15";
-	end;
-
-OnEnable:
-	stopnpctimer;
-	enablenpc "Pointed Tree#rus15";
-	end;
-
-OnDisable:
-	initnpctimer;
-	disablenpc "Pointed Tree#rus15";
-	end;
-
-OnTimer60000:
-	donpcevent "Pointed Tree#rus15::OnEnable";
-	end;
-}
-
-mosk_fild02,114,223,0	script	Pointed Tree#rus16	111,{
-	if (rhea_rus_ring == 6) {
-		if (countitem(7882) < 50) {
-			set .@branch01,rand(1,3);
-			if (.@branch01 == 2) {
-				mes "- I avoid the thorns and -";
-				mes "- cut off a branch!! -";
-				getitem 7882,1;
-				donpcevent "Pointed Tree#rus16::OnDisable";
-				close;
-			}else{
-				mes "- My hand is pricked by thorns! -";
-				specialeffect2 EF_HIT2;
-				percentheal -5,0;
-				close;
-			}
-		}
-	}
-
-OnInit:
-	enablenpc "Pointed Tree#rus16";
-	end;
-
-OnEnable:
-	stopnpctimer;
-	enablenpc "Pointed Tree#rus16";
-	end;
-
-OnDisable:
-	initnpctimer;
-	disablenpc "Pointed Tree#rus16";
-	end;
-
-OnTimer60000:
-	donpcevent "Pointed Tree#rus16::OnEnable";
-	end;
-}
-
-mosk_fild02,101,197,0	script	Pointed Tree#rus17	111,{
-	if (rhea_rus_ring == 6) {
-		if (countitem(7882) < 50) {
-			set .@branch01,rand(1,3);
-			if (.@branch01 == 2) {
-				mes "- I avoid the thorns and -";
-				mes "- cut off a branch!! -";
-				getitem 7882,1;
-				donpcevent "Pointed Tree#rus17::OnDisable";
-				close;
-			}else{
-				mes "- My hand is pricked by thorns! -";
-				specialeffect2 EF_HIT2;
-				percentheal -5,0;
-				close;
-			}
-		}
-	}
-
-OnInit:
-	enablenpc "Pointed Tree#rus17";
-	end;
-
-OnEnable:
-	stopnpctimer;
-	enablenpc "Pointed Tree#rus17";
-	end;
-
-OnDisable:
-	initnpctimer;
-	disablenpc "Pointed Tree#rus17";
-	end;
-
-OnTimer60000:
-	donpcevent "Pointed Tree#rus17::OnEnable";
-	end;
-}
-
-mosk_fild02,125,182,0	script	Pointed Tree#rus18	111,{
-	if (rhea_rus_ring == 6) {
-		if (countitem(7882) < 50) {
-			set .@branch01,rand(1,3);
-			if (.@branch01 == 2) {
-				mes "- I avoid the thorns and -";
-				mes "- cut off a branch!! -";
-				getitem 7882,1;
-				donpcevent "Pointed Tree#rus18::OnDisable";
-				close;
-			}else{
-				mes "- My hand is pricked by thorns! -";
-				specialeffect2 EF_HIT2;
-				percentheal -5,0;
-				close;
-			}
-		}
-	}
-
-OnInit:
-	enablenpc "Pointed Tree#rus18";
-	end;
-
-OnEnable:
-	stopnpctimer;
-	enablenpc "Pointed Tree#rus18";
-	end;
-
-OnDisable:
-	initnpctimer;
-	disablenpc "Pointed Tree#rus18";
-	end;
-
-OnTimer60000:
-	donpcevent "Pointed Tree#rus18::OnEnable";
-	end;
-}
+mosk_fild02,151,188,0	duplicate(PTree#rusmain)	Pointed Tree#rus11	111
+mosk_fild02,160,227,0	duplicate(PTree#rusmain)	Pointed Tree#rus12	111
+mosk_fild02,160,179,0	duplicate(PTree#rusmain)	Pointed Tree#rus13	111
+mosk_fild02,142,247,0	duplicate(PTree#rusmain)	Pointed Tree#rus14	111
+mosk_fild02,149,223,0	duplicate(PTree#rusmain)	Pointed Tree#rus15	111
+mosk_fild02,114,223,0	duplicate(PTree#rusmain)	Pointed Tree#rus16	111
+mosk_fild02,101,197,0	duplicate(PTree#rusmain)	Pointed Tree#rus17	111
+mosk_fild02,125,182,0	duplicate(PTree#rusmain)	Pointed Tree#rus18	111
 
 //----------------------------------------------------------------------------
 // Worried Mother (Lusalka's Hair)
@@ -12758,8 +8543,7 @@ moscovia,166,145,1	script	Worried Mother#rus19	961,{
 		mes "[Worried Mother]";
 		mes "My daughter disappeared some days ago and now i'm really worried. I hope nothing happened to her...";
 		close;
-	}
-	else if (rhea_rus_main == 8) {
+	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_hair < 1) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
@@ -12799,8 +8583,7 @@ moscovia,166,145,1	script	Worried Mother#rus19	961,{
 			mes "Please, please find my daughter.";
 			set rhea_rus_hair,1;
 			close;
-		}
-		else if (rhea_rus_hair == 1) {
+		} else if (rhea_rus_hair == 1) {
 			mes "[Worried Mother]";
 			mes "Ah, there are some things that you have to know.";
 			next;
@@ -12823,8 +8606,7 @@ moscovia,166,145,1	script	Worried Mother#rus19	961,{
 			mes "I'm not sure where she would be but it has to be somewhere near water. Please, find where my daughter is. I beg of you.";
 			set rhea_rus_hair,2;
 			close;
-		}
-		else if (rhea_rus_hair > 1 && rhea_rus_hair < 9) {
+		} else if (rhea_rus_hair > 1 && rhea_rus_hair < 9) {
 			mes "[Worried Mother]";
 			mes "Lusalka is a good aqua nymph but is not completely harmless. Her stare will seriously hurt anyone who makes eye contact with her.";
 			next;
@@ -12841,23 +8623,13 @@ moscovia,166,145,1	script	Worried Mother#rus19	961,{
 			mes "I'm not sure where she would be but it has to be somewhere near water. Please, find where my daughter is. I beg of you.";
 			close;
 		}
-		else {
-			mes "[Worried Mother]";
-			mes "I am able to do nothing recently.";
-			next;
-			mes "[Worried Mother]";
-			mes "It seems that I lost something, but I don't know what it is...";
-			close;
-		}
-	}
-	else {
-		mes "[Worried Mother]";
-		mes "I am able to do nothing recently.";
-		next;
-		mes "[Worried Mother]";
-		mes "It seems that I lost something, but I don't know what it is...";
-		close;
 	}
+	mes "[Worried Mother]";
+	mes "I am able to do nothing recently.";
+	next;
+	mes "[Worried Mother]";
+	mes "It seems that I lost something, but I don't know what it is...";
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -12876,18 +8648,12 @@ mosk_fild02,101,200,0	duplicate(NoSwim)	Caution#rus02	837
 //----------------------------------------------------------------------------
 mosk_fild02,116,202,3	script	Lusalka#07russai_22	-1,3,3,{
 	end;
-
 OnTouch:
 	if (rhea_rus_main < 8) {
 		emotion 1,1;
 		close;
-	}
-	else if (rhea_rus_main == 8) {
-		if (rhea_rus_hair < 2) {
-			emotion 1,1;
-			close;
-		}
-		else if (rhea_rus_hair == 2) {
+	} else if (rhea_rus_main == 8) {
+		if (rhea_rus_hair == 2) {
 			if (gettime(3)>=23 || gettime(3)<=5) {
 				mes "- Splash !! -";
 				next;
@@ -12896,29 +8662,23 @@ OnTouch:
 					mes "- and see something gleaming -";
 					donpcevent "Lusalka#rus23::OnEnable";
 					close;
-				}else{
-					mes "- You hear a splashing as -";
-					mes "- something gleaming -";
-					mes "- seems to stare at you!! -";
-					next;
-					specialeffect2 EF_FLASHER;
-					percentheal -100,0;
-					close;
 				}
-			}else{
-				emotion 1,1;
+				mes "- You hear a splashing as -";
+				mes "- something gleaming -";
+				mes "- seems to stare at you!! -";
+				next;
+				specialeffect2 EF_FLASHER;
+				percentheal -100,0;
 				close;
 			}
-		}
-		else if (rhea_rus_hair > 2 && rhea_rus_hair < 7) {
+		} else if (rhea_rus_hair > 2 && rhea_rus_hair < 7) {
 			mes "[Lusalka's Voice]";
 			mes "His name is 'Igor'.. He has gone to the capital of Rune Midgarts. Give him my golden earrings.";
 			next;
 			mes "[Lusalka's Voice]";
 			mes "And please, tell him to stop suffering and to be happy. This is my request.";
 			close;
-		}
-		else if (rhea_rus_hair == 7) {
+		} else if (rhea_rus_hair == 7) {
 			if (gettime(3)>=23 || gettime(3)<=5) {
 				mes "- Splash !! -";
 				next;
@@ -12926,18 +8686,13 @@ OnTouch:
 					mes "-You hear splashing sound and see something gleaming-";
 					donpcevent "Lusalka#rus23::OnEnable";
 					close;
-				}else{
-					mes "-You seem to hear the splash but something gleaming raids on you!!-";
-					specialeffect2 EF_FLASHER;
-					percentheal -100,0;
-					close;
 				}
-			}else{
-				emotion 1,1;
+				mes "-You seem to hear the splash but something gleaming raids on you!!-";
+				specialeffect2 EF_FLASHER;
+				percentheal -100,0;
 				close;
 			}
-		}
-		else if (rhea_rus_hair == 8) {
+		} else if (rhea_rus_hair == 8) {
 			mes "["+ strcharinfo(0) +"]";
 			mes "What was that?!";
 			mes "Why am I here?";
@@ -12957,8 +8712,7 @@ OnTouch:
 			set rhea_rus_hair,9;
 			getitem 7878,2;
 			close;
-		}
-		else if (rhea_rus_hair > 8) {
+		} else if (rhea_rus_hair > 8) {
 			mes "- You feel that someone -";
 			mes "- is watching you -";
 			next;
@@ -12970,37 +8724,29 @@ OnTouch:
 			mes "- still feel the sadness -";
 			close;
 		}
-		else {
-			emotion 1,1;
-			close;
-		}
-	}
-	else {
-		emotion 1,1;
-		close;
 	}
+	emotion 1,1;
+	close;
 }
 
 //----------------------------------------------------------------------------
 // Lusalka (Lusalka's Hair)
 //----------------------------------------------------------------------------
 mosk_fild02,124,202,3	script	Lusalka#rus23	971,{
-	if (countitem(523) > 0) {
+	if (countitem(523)) {
 		if (rhea_rus_main < 8) {
 			mes "[Lusalka]";
 			mes "...Your alive...";
 			mes "My stare didn't...";
 			mes "What are you doing here...?";
 			close;
-		}
-		else if (rhea_rus_main == 8) {
+		} else if (rhea_rus_main == 8) {
 			if (rhea_rus_hair < 2) {
 				mes "...Your alive...";
 				mes "My stare didn't...";
 				mes "What are you doing here...?";
 				close;
-			}
-			else if (rhea_rus_hair == 2) {
+			} else if (rhea_rus_hair == 2) {
 				if(getequipid(EQI_SHOES) != 2429) {
 					if(getequipid(EQI_SHOES) != 2430) {
 						mes "["+ strcharinfo(0) +"]";
@@ -13083,16 +8829,14 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	971,{
 				set rhea_rus_hair,3;
 				donpcevent "Lusalka#rus23::OnDisable";
 				close;
-			}
-			else if (rhea_rus_hair > 2 && rhea_rus_hair < 7) {
+			} else if (rhea_rus_hair > 2 && rhea_rus_hair < 7) {
 				mes "[Lusalka]";
 				mes "His name is 'Igor'.. He has gone to the capital of Rune Midgarts. Give him my golden earrings.";
 				next;
 				mes "[Lusalka]";
 				mes "And please, tell him to stop suffering and to be happy. This is my request.";
 				close;
-			}
-			else if (rhea_rus_hair == 7) {
+			} else if (rhea_rus_hair == 7) {
 				if(getequipid(EQI_SHOES) != 2429) {
 					if(getequipid(EQI_SHOES) != 2430) {
 						mes "["+ strcharinfo(0) +"]";
@@ -13165,18 +8909,7 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	971,{
 				set rhea_rus_hair,8;
 				donpcevent "Lusalka#rus23::OnDisable";
 				close;
-			}
-			else if (rhea_rus_hair > 7) {
-				mes "["+ strcharinfo(0) +"]";
-				mes "...?! What are you? The marsh ghost?";
-				next;
-				mes "[Lusalka]";
-				mes "..........................";
-				next;
-				mes "- The green thing seems to open its mouth to say something but closes it soon after and watches you with its sad eyes-";
-				close;
-			}
-			else {
+			} else if (rhea_rus_hair > 7) {
 				mes "["+ strcharinfo(0) +"]";
 				mes "...?! What are you? The marsh ghost?";
 				next;
@@ -13186,17 +8919,22 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	971,{
 				mes "- The green thing seems to open its mouth to say something but closes it soon after and watches you with its sad eyes-";
 				close;
 			}
+			mes "["+ strcharinfo(0) +"]";
+			mes "...?! What are you? The marsh ghost?";
+			next;
+			mes "[Lusalka]";
+			mes "..........................";
+			next;
+			mes "- The green thing seems to open its mouth to say something but closes it soon after and watches you with its sad eyes-";
+			close;
 		}
-		else {
-			end;
-		}
-	}else{
-		mes "-When Lusalka watches you, you are blacked out-";
-		specialeffect2 EF_FLASHER;
-		percentheal -100,0;
-		donpcevent "Lusalka#rus23::OnDisable";
-		close;
+		end;
 	}
+	mes "-When Lusalka watches you, you are blacked out-";
+	specialeffect2 EF_FLASHER;
+	percentheal -100,0;
+	donpcevent "Lusalka#rus23::OnDisable";
+	close;
 
 OnInit:
 	disablenpc "Lusalka#rus23";
@@ -13229,8 +8967,7 @@ prontera,228,279,3	script	Wanderer#rus24	968,{
 		mes "[A Wanderer from a strange land]";
 		mes "In your free time, come to see me! The weather here is even more favorable than our the best summer back home.";
 		close;
-	}
-	else if (rhea_rus_main == 8) {
+	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_hair < 3) {
 			mes "[A Wanderer from a strange land]";
 			mes "Hey, there are so many adventurers around here. I can see why this is the capital of the Rune Midgarts Kingdom!";
@@ -13238,8 +8975,7 @@ prontera,228,279,3	script	Wanderer#rus24	968,{
 			mes "[A Wanderer from a strange land]";
 			mes "In your free time, come to see me! The weather here is even more favorable than our the best summer back home.";
 			close;
-		}
-		else if (rhea_rus_hair == 3) {
+		} else if (rhea_rus_hair == 3) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
@@ -13271,7 +9007,7 @@ prontera,228,279,3	script	Wanderer#rus24	968,{
 				mes "Ah, yes. I have been there...";
 				mes "By the way, the important thing is.. are you..... "+ .@input$ +"?";
 				next;
-			}else{
+			} else {
 				mes "["+ strcharinfo(0) +"]";
 				mes "Ah, yes. I have been there...";
 				mes "By the way, the important thing is.. are you..... "+ .@input$ +"?";
@@ -13304,8 +9040,7 @@ prontera,228,279,3	script	Wanderer#rus24	968,{
 			mes "to travel to a desert.";
 			set rhea_rus_hair,4;
 			close;
-		}
-		else if (rhea_rus_hair > 3 && rhea_rus_hair < 7) {
+		} else if (rhea_rus_hair > 3 && rhea_rus_hair < 7) {
 			mes "[A Wanderer from a strange land]";
 			mes "He called himself Igg. I came here with him but parted with him quite a while ago. He was sad because he couldn't forget about his lost lover.";
 			next;
@@ -13317,23 +9052,13 @@ prontera,228,279,3	script	Wanderer#rus24	968,{
 			mes "to travel to a desert.";
 			close;
 		}
-		else {
-			mes "[A Wanderer from a strange land]";
-			mes "Is there anywhere I should go? Where have you been with him?";
-			next;
-			mes "[A Wanderer from a strange land]";
-			mes "Let me know somewhere.";
-			close;
-		}
-	}
-	else {
-		mes "[A Wanderer from a strange land]";
-		mes "Is there anywhere I should go? Where have you been with him?";
-		next;
-		mes "[A Wanderer from a strange land]";
-		mes "Let me know somewhere.";
-		close;
 	}
+	mes "[A Wanderer from a strange land]";
+	mes "Is there anywhere I should go? Where have you been with him?";
+	next;
+	mes "[A Wanderer from a strange land]";
+	mes "Let me know somewhere.";
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -13347,8 +9072,7 @@ morocc,165,82,0	script	Morroc Villager#rus25	48,{
 		mes "[Morroc Villager]";
 		mes "But natives, like me, can tell the difference.";
 		close;
-	}
-	else if (rhea_rus_main == 8) {
+	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_hair < 4) {
 			mes "[Morroc Villager]";
 			mes "Huh, more and more adventurers are settling here recently, so it's hard to tell who is a villager or an adventurer.";
@@ -13356,8 +9080,7 @@ morocc,165,82,0	script	Morroc Villager#rus25	48,{
 			mes "[Morroc Villager]";
 			mes "But natives, like me, can tell the difference.";
 			close;
-		}
-		else if (rhea_rus_hair == 4) {
+		} else if (rhea_rus_hair == 4) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
@@ -13397,8 +9120,7 @@ morocc,165,82,0	script	Morroc Villager#rus25	48,{
 			mes "Yep that's gotta be who you're looking for. I can see his gloomy face right now... that poor sad man.";
 			set rhea_rus_hair,5;
 			close;
-		}
-		else if (rhea_rus_hair > 4 && rhea_rus_hair < 7) {
+		} else if (rhea_rus_hair > 4 && rhea_rus_hair < 7) {
 			mes "[Morroc Villager]";
 			mes "He was here a coupla days ago but he left to see the Pyramid. I never saw him after that. I said it would be dangerous but he went anyways.";
 			next;
@@ -13406,17 +9128,10 @@ morocc,165,82,0	script	Morroc Villager#rus25	48,{
 			mes "Yep that's gotta be who you're looking for. I can see his gloomy face right now... that poor sad man.";
 			close;
 		}
-		else {
-			mes "[Morroc Villager]";
-			mes "Many travellers in the village and I feel fun to see them. Even though I am here, I feel like that I travel all around the world?";
-			close;
-		}
-	}
-	else {
-		mes "[Morroc Villager]";
-		mes "Many travellers in the village and I feel fun to see them. Even though I am here, I feel like that I travel all around the world?";
-		close;
 	}
+	mes "[Morroc Villager]";
+	mes "Many travellers in the village and I feel fun to see them. Even though I am here, I feel like that I travel all around the world?";
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -13427,14 +9142,12 @@ moc_pryd04,126,120,0	script	Soldier#rus26	967,{
 		mes "[A gloomy looking soldier]";
 		mes "............................";
 		close;
-	}
-	else if (rhea_rus_main == 8) {
+	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_hair < 5) {
 			mes "[A gloomy looking soldier]";
 			mes "............................";
 			close;
-		}
-		else if (rhea_rus_hair == 4 || rhea_rus_hair == 5) {
+		} else if (rhea_rus_hair == 4 || rhea_rus_hair == 5) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
@@ -13511,8 +9224,7 @@ moc_pryd04,126,120,0	script	Soldier#rus26	967,{
 			mes "Oh... Svetlana!!!";
 			set rhea_rus_hair,6;
 			close;
-		}
-		else if (rhea_rus_hair == 6) {
+		} else if (rhea_rus_hair == 6) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
@@ -13548,8 +9260,7 @@ moc_pryd04,126,120,0	script	Soldier#rus26	967,{
 			mes "Before the full moon, I will be back to Moscovia and meet her. I will come back so strong and happy that when I go to see her she will not suffer anymore.";
 			set rhea_rus_hair,7;
 			close;
-		}
-		else if (rhea_rus_hair == 7) {
+		} else if (rhea_rus_hair == 7) {
 			mes "[A gloomy looking soldier]";
 			mes "Could you please go to her and tell her my message?";
 			mes "I remember every moment I've had with her and... I still love her.";
@@ -13557,29 +9268,13 @@ moc_pryd04,126,120,0	script	Soldier#rus26	967,{
 			mes "[A gloomy looking soldier]";
 			mes "Before the full moon, I will be back to Moscovia and meet her. I will come back so strong and happy that when I go to see her she will not suffer anymore.";
 			close;
-		}
-		else if (rhea_rus_main > 7) {
-			mes "[A gloomy looking soldier]";
-			mes "... I feel like I lost something precious.";
-			next;
-			mes "- He looks down at the golden earrings and rubs it carefully -";
-			close;
-		}
-		else {
-			mes "[A gloomy looking soldier]";
-			mes "... I feel like I lost something precious.";
-			next;
-			mes "- He looks down at the golden earrings and rubs it carefully -";
-			close;
-		}
-	}
-	else {
-		mes "[A gloomy looking soldier]";
-		mes "... I feel like I lost something precious.";
-		next;
-		mes "- He looks down at the golden earrings and rubs it carefully -";
-		close;
+		} 
 	}
+	mes "[A gloomy looking soldier]";
+	mes "... I feel like I lost something precious.";
+	next;
+	mes "- He looks down at the golden earrings and rubs it carefully -";
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -13587,7 +9282,6 @@ moc_pryd04,126,120,0	script	Soldier#rus26	967,{
 //----------------------------------------------------------------------------
 mosk_dun01,45,250,3	script	1#rus27	45,3,3,{
 	end;
-
 OnTouch:
 	warp "mosk_que",49,22;
 	end;
@@ -13612,21 +9306,15 @@ OnTimer30000:
 	donpcevent "1#rus27::OnDisable";
 	end;
 }
-
 mosk_que,0,0,0,0	monster	Freezer	1887,10,20000,0,0
 mosk_que,0,0,0,0	monster	Hatii Baby	1888,3,300000,0,0
 mosk_que,0,0,0,0	monster	Sasquatch	1243,15,10000,0,0
 
 mosk_que,49,22,3	script	#rus27	-1,3,3,{
 	end;
-
 OnTouch:
-	if (rhea_rus_main < 8) {
-		emotion 1,1;
-		close;
-	}
-	else if (rhea_rus_main == 8) {
-		if (rhea_rus_quiz < 1) {
+	if (rhea_rus_main == 8) {
+		if (!rhea_rus_quiz) {
 			mes "[Voice unidentified]";
 			mes "Who dares to come into my cave!";
 			next;
@@ -13660,18 +9348,12 @@ OnTouch:
 			close;
 		}
 	}
-	else {
-		emotion 1,1;
-		close;
-	}
+	emotion 1,1;
+	close;
 }
 
 mosk_que,45,131,0	script	Stone Furnace#rus28	111,{
-	if (rhea_rus_main < 8) {
-		emotion 1,1;
-		close;
-	}
-	else if (rhea_rus_main == 8) {
+	if (rhea_rus_main == 8) {
 		if (rhea_rus_quiz == 1) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
@@ -13685,8 +9367,7 @@ mosk_que,45,131,0	script	Stone Furnace#rus28	111,{
 			mes "- Be careful and -";
 			mes "- don't get burned -";
 			next;
-			set .@rus_pie01,rand(1,3);
-			if (.@rus_pie01 == 2) {
+			if (rand(1,3) == 2) {
 				mes "- You quickly stretch out -";
 				mes "- your hand and pick up -";
 				mes "- the well baked cookies! -";
@@ -13694,7 +9375,7 @@ mosk_que,45,131,0	script	Stone Furnace#rus28	111,{
 				mes "- ^0000ffYou got 100^000000 -";
 				mes "- ^0000ffWell Baked Cookies!!^000000 -";
 				next;
-			}else{
+			} else {
 				mes "- You quickly stretch out -";
 				mes "- your hand and pick up -";
 				mes "- the well baked cookies! -";
@@ -13706,7 +9387,7 @@ mosk_que,45,131,0	script	Stone Furnace#rus28	111,{
 				percentheal -5,0;
 				close;
 			}
-			if ($@rus_req01 == 0) {
+			if (!$@rus_req01) {
 				mes "[Marozka's Guard]";
 				mes "How did this rat get inside the cave?!";
 				announce "Marozka's Guard : Invader! Search the whole cave!!",bc_map,0x87CEEB;
@@ -13715,19 +9396,16 @@ mosk_que,45,131,0	script	Stone Furnace#rus28	111,{
 				monster "mosk_que",49,156,"Marozka's Guard",1889,1,"Stone Furnace#rus28::OnMyMobDead";
 				set $@rus_req01,1;
 				close;
-			}else{
-				mes "[Marozka's Guard]";
-				mes "How did this rat get inside the cave?!";
-				announce "Marozka's Guard : Invader! Search the whole cave!!",bc_map,0x87CEEB;
-				set rhea_rus_quiz,2;
-				close;
 			}
+			mes "[Marozka's Guard]";
+			mes "How did this rat get inside the cave?!";
+			announce "Marozka's Guard : Invader! Search the whole cave!!",bc_map,0x87CEEB;
+			set rhea_rus_quiz,2;
+			close;
 		}
 	}
-	else {
-		emotion 1,1;
-		close;
-	}
+	emotion 1,1;
+	close;
 
 OnInit:
 	set $@rus_req01,0;
@@ -13746,11 +9424,7 @@ OnTimer300000:
 }
 
 mosk_que,56,202,0	script	Occult Apple Tree#rus29	111,{
-	if (rhea_rus_main < 8) {
-		emotion 1,1;
-		close;
-	}
-	else if (rhea_rus_main == 8) {
+	if (rhea_rus_main == 8) {
 		if (rhea_rus_quiz == 2) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
@@ -13764,12 +9438,11 @@ mosk_que,56,202,0	script	Occult Apple Tree#rus29	111,{
 			mes "- But they are higher than -";
 			mes "- you expected them to be -";
 			next;
-			set .@rus_apple01,rand(1,5);
-			if (.@rus_apple01 == 2) {
+			if (rand(1,5) == 2) {
 				mes "- You hit the tree firmly, -";
 				mes "- and the apples fall down! -";
 				next;
-			}else{
+			} else {
 				mes "- You hit the tree firmly, -";
 				mes "- worms fall down! -";
 				next;
@@ -13784,10 +9457,8 @@ mosk_que,56,202,0	script	Occult Apple Tree#rus29	111,{
 			close;
 		}
 	}
-	else {
-		emotion 1,1;
-		close;
-	}
+	emotion 1,1;
+	close;
 }
 
 mosk_que,47,217,0	warp	Escape#rus30	1,1,mosk_fild02,237,266
@@ -13800,14 +9471,12 @@ mosk_fild02,243,270,0	script	Marozka#rus31	866,{
 		mes "[Marozka]";
 		mes "...........................";
 		close;
-	}
-	else if (rhea_rus_main == 8) {
+	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_quiz < 3) {
 			mes "[Marozka]";
 			mes "...........................";
 			close;
-		}
-		else if (rhea_rus_quiz == 3) {
+		} else if (rhea_rus_quiz == 3) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
@@ -13835,24 +9504,21 @@ mosk_fild02,243,270,0	script	Marozka#rus31	866,{
 			set rus_time01,gettime(3);
 			set rus_time02,gettime(4);
 			close;
-		}
-		else if (rhea_rus_quiz == 4) {
+		} else if (rhea_rus_quiz == 4) {
 			if (rus_time01 < gettime(3) || rus_time02 < gettime(4) || (rus_time02 == 6 && gettime(4) == 0)) {
 				mes "[Marozka]";
 				mes "Ah, just in time.";
 				mes "I have finally finished making the 'Golden Thread'. Just wait one more second and it'll be ready.";
 				set rhea_rus_quiz,28;
 				close;
-			}else{
-				mes "[Marozka]";
-				mes "As you've heard, to make the 'Golden Thread' is very difficult and takes a very long time.";
-				next;
-				mes "[Marozka]";
-				mes "I will begin making it now... let me see... Could you please come back to me in an hour?";
-				close;
 			}
-		}
-		else if (rhea_rus_quiz == 28) {
+			mes "[Marozka]";
+			mes "As you've heard, to make the 'Golden Thread' is very difficult and takes a very long time.";
+			next;
+			mes "[Marozka]";
+			mes "I will begin making it now... let me see... Could you please come back to me in an hour?";
+			close;
+		} else if (rhea_rus_quiz == 28) {
 			mes "[Marozka]";
 			mes "As promised, here's the 'Golden Thread'.";
 			mes "So, you are really going to fight Koshei the Immportal, eh?";
@@ -13877,8 +9543,7 @@ mosk_fild02,243,270,0	script	Marozka#rus31	866,{
 			mes "That was a test of your strength. Now you must pass the test of mind and wisdom.";
 			set rhea_rus_quiz,29;
 			close;
-		}
-		else if (rhea_rus_quiz == 29) {
+		} else if (rhea_rus_quiz == 29) {
 			if(getequipid(EQI_SHOES) != 2429) {
 				if(getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
@@ -13901,83 +9566,28 @@ mosk_fild02,243,270,0	script	Marozka#rus31	866,{
 			mes "[Marozka]";
 			mes "What is deaf, dumb, and blind and always tells the truth?";
 			next;
-			switch(select("A Poring:A Picky:A Mirror:A Tree")) {
-			case 1:
-				set .@rus_quiz01,.@rus_quiz01;
-				break;
-			case 2:
-				set .@rus_quiz01,.@rus_quiz01;
-				break;
-			case 3:
-				set .@rus_quiz01,.@rus_quiz01+1;
-				break;
-			case 4:
-				set .@rus_quiz01,.@rus_quiz01;
-			}
+			set .@j,select("A Poring:A Picky:A Mirror:A Tree"); 
+			set .@rus_quiz01,(.@j==3)?.@rus_quiz01+1:.@rus_quiz01;
 			mes "[Marozka]";
 			mes "If 4 cats can catch 4 mice every 4 minutes, what is the minimum number of cats needed to get 10 mice in 10 minutes?";
 			next;
-			switch(select("4:5:6:10")) {
-			case 1:
-				set .@rus_quiz01,.@rus_quiz01+1;
-				break;
-			case 2:
-				set .@rus_quiz01,.@rus_quiz01;
-				break;
-			case 3:
-				set .@rus_quiz01,.@rus_quiz01;
-				break;
-			case 4:
-				set .@rus_quiz01,.@rus_quiz01;
-			}
+			set .@j,select("4:5:6:10");
+			set .@rus_quiz01,(.@j==1)?.@rus_quiz01+1:.@rus_quiz01;
 			mes "[Marozka]";
 			mes "Which of these gets shorter during winter and longer during summer?";
 			next;
-			switch(select("Sky:Day:Waves:Wind")) {
-			case 1:
-				set .@rus_quiz01,.@rus_quiz01;
-				break;
-			case 2:
-				set .@rus_quiz01,.@rus_quiz01+1;
-				break;
-			case 3:
-				set .@rus_quiz01,.@rus_quiz01;
-				break;
-			case 4:
-				set .@rus_quiz01,.@rus_quiz01;
-			}
+			set .@j,select("Sky:Day:Waves:Wind");
+			set .@rus_quiz01,(.@j==2)?.@rus_quiz01+1:.@rus_quiz01;
 			mes "[Marozka]";
 			mes "Doris Etticoat, wears a petticoat and has a red nose; the longer she stands, the shorter she grows. What is she?";
 			next;
-			switch(select("A Star:A Candle:A Sword:The Moon")) {
-			case 1:
-				set .@rus_quiz01,.@rus_quiz01;
-				break;
-			case 2:
-				set .@rus_quiz01,.@rus_quiz01+1;
-				break;
-			case 3:
-				set .@rus_quiz01,.@rus_quiz01;
-				break;
-			case 4:
-				set .@rus_quiz01,.@rus_quiz01;
-			}
+			set .@j,select("A Star:A Candle:A Sword:The Moon");
+			set .@rus_quiz01,(.@j==2)?.@rus_quiz01+1:.@rus_quiz01;
 			mes "[Marozka]";
 			mes "My top and bottom are twins of a kind. The middle of me makes one body combined. If I stand tall and still, run faster I will. What am I?";
 			next;
-			switch(select("A Woman:Valkyrie:The Moon:An Hourglass")) {
-			case 1:
-				set .@rus_quiz01,.@rus_quiz01;
-				break;
-			case 2:
-				set .@rus_quiz01,.@rus_quiz01;
-				break;
-			case 3:
-				set .@rus_quiz01,.@rus_quiz01;
-				break;
-			case 4:
-				set .@rus_quiz01,.@rus_quiz01+1;
-			}
+			set .@j,select("A Woman:Valkyrie:The Moon:An Hourglass");
+			set .@rus_quiz01,(.@j==4)?.@rus_quiz01+1:.@rus_quiz01;
 			mes "[Marozka]";
 			mes "Now let's see how you did.";
 			next;
@@ -13985,7 +9595,7 @@ mosk_fild02,243,270,0	script	Marozka#rus31	866,{
 				mes "[Marozka]";
 				mes "You got all of them correct.";
 				next;
-			}else{
+			} else {
 				mes "[Marozka]";
 				mes "I told you before that I wouldn't give you the Golden Thread until you got all questions correct.";
 				next;
@@ -14002,23 +9612,13 @@ mosk_fild02,243,270,0	script	Marozka#rus31	866,{
 			getitem 7879,10;
 			close;
 		}
-		else {
-			mes "[Marozka]";
-			mes "...............................";
-			next;
-			mes "- He closes his eyes -";
-			mes "- and stands still -";
-			close;
-		}
-	}
-	else {
-		mes "[Marozka]";
-		mes "...............................";
-		next;
-		mes "- He closes his eyes -";
-		mes "- and stands still -";
-		close;
 	}
+	mes "[Marozka]";
+	mes "...............................";
+	next;
+	mes "- He closes his eyes -";
+	mes "- and stands still -";
+	close;
 }
 
 //----------------------------------------------------------------------------
@@ -14032,8 +9632,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		emotion 29;
 		emotion 23,1;
 		close;
-	}
-	else if (rhea_rus_main == 9) {
+	} else if (rhea_rus_main == 9) {
 		mes "[Baba Yaga]";
 		mes "Why are you here, you yummy looking human? If you lotter around here any longer, I will make myself some tasty human soup! Hehehehehe";
 		next;
@@ -14067,7 +9666,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 			mes ""+ .@input$ +" !!!";
 			specialeffect2 EF_ABSORBSPIRITS;
 			next;
-		}else{
+		} else {
 			mes "["+ strcharinfo(0) +"]";
 			mes "Eh, eh.. I mean.. I say.. spell...";
 			mes ""+ .@input$ +" !!!";
@@ -14105,11 +9704,11 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		mes "[Baba Yaga]";
 		mes "Ok, the materials for the key are...";
 		next;
-		if (countitem(724) > 1 && countitem(969) > 2 && countitem(7877) > 0 && countitem(7878) > 1 && countitem(7879) > 9) {
+		if (countitem(724) > 1 && countitem(969) > 2 && countitem(7877) && countitem(7878) > 1 && countitem(7879) > 9) {
 			mes "[Baba Yaga]";
 			mes "You have already gatered all the materials?";
 			next;
-		}else{
+		} else {
 			mes "[Baba Yaga]";
 			mes "What? I cannot make you the 'Golden Key' without the materials.";
 			next;
@@ -14126,8 +9725,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		delitem 7879,10;
 		set rhea_rus_main,10;
 		close;
-	}
-	else if (rhea_rus_main == 10) {
+	} else if (rhea_rus_main == 10) {
 		mes "[Baba Yaga]";
 		mes "You come here!";
 		next;
@@ -14145,8 +9743,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 			mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe.";
 			set rhea_rus_main,11;
 			close;
-		}
-		else if (BaseClass == Job_Acolyte) {
+		} else if (BaseClass == Job_Acolyte) {
 			mes "[Baba Yaga]";
 			mes "Behind my house, there is noisy coffin. It has been so nosiy recently that I can't sleep. Silence it.";
 			next;
@@ -14154,8 +9751,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 			mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe.";
 			set rhea_rus_main,16;
 			close;
-		}
-		else if (BaseClass == Job_Thief) {
+		} else if (BaseClass == Job_Thief) {
 			mes "[Baba Yaga]";
 			mes "Please find my silver spoons. Those bad pirates stole them. I can feel them around the wrecked ship. Bring them to me.";
 			next;
@@ -14163,8 +9759,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 			mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe.";
 			set rhea_rus_main,21;
 			close;
-		}
-		else if (BaseClass == Job_Mage) {
+		} else if (BaseClass == Job_Mage) {
 			mes "[Baba Yaga]";
 			mes "Buy me a magic book. It is published by Momotaro in Amatsu. Go there and buy it for me.";
 			next;
@@ -14172,8 +9767,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 			mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe.";
 			set rhea_rus_main,26;
 			close;
-		}
-		else if (BaseClass == Job_Swordman) {
+		} else if (BaseClass == Job_Swordman) {
 			mes "[Baba Yaga]";
 			mes "Can you see a jar next to the cabin? There is a House ghost living in there. Drive him out of there. He irritates me a lot.";
 			next;
@@ -14182,49 +9776,42 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 			set rhea_rus_main,31;
 			close;
 		}
-		else {
-			mes "[Baba Yaga]";
-			mes "Go to the Broom Grandmother in Payon and buy me a broom. It is best for cleaning but I don't have time to go there.";
-			next;
-			mes "[Baba Yaga]";
-			mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe.";
-			set rhea_rus_main,36;
-			close;
-		}
-	}
-	else if (rhea_rus_main > 10 && rhea_rus_main < 16) {
+		mes "[Baba Yaga]";
+		mes "Go to the Broom Grandmother in Payon and buy me a broom. It is best for cleaning but I don't have time to go there.";
+		next;
+		mes "[Baba Yaga]";
+		mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe.";
+		set rhea_rus_main,36;
+		close;
+	} else if (rhea_rus_main > 10 && rhea_rus_main < 16) {
 		mes "[Baba Yaga]";
 		mes "My cow has run away. Find her and cast a Return Spell on her. The spell is '^ff0000Good feed is orange-flavored^000000'. You sould remember it.";
 		next;
 		mes "[Baba Yaga]";
 		mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe.";
 		close;
-	}
-	else if (rhea_rus_main > 15 && rhea_rus_main < 21) {
+	} else if (rhea_rus_main > 15 && rhea_rus_main < 21) {
 		mes "[Baba Yaga]";
 		mes "Can you see a jar next to the cabin? There is a House ghost living in there. Drive him out of there. He irritates me a lot.";
 		next;
 		mes "[Baba Yaga]";
 		mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe.";
 		close;
-	}
-	else if (rhea_rus_main > 20 && rhea_rus_main < 26) {
+	} else if (rhea_rus_main > 20 && rhea_rus_main < 26) {
 		mes "[Baba Yaga]";
 		mes "Please find my silver spoons. Those bad pirates stole them. I can feel them around the wrecked ship. Bring them to me.";
 		next;
 		mes "[Baba Yaga]";
 		mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe.";
 		close;
-	}
-	else if (rhea_rus_main == 26) {
+	} else if (rhea_rus_main == 26) {
 		mes "[Baba Yaga]";
 		mes "Buy me a magic book. It is published by Momotaro in Amatsu. Go there and buy it for me.";
 		next;
 		mes "[Baba Yaga]";
 		mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe.";
 		close;
-	}
-	else if (rhea_rus_main == 27) {
+	} else if (rhea_rus_main == 27) {
 		if (countitem(7881) > 0) {
 			mes "[Baba Yaga]";
 			mes "Ho, did you buy the magic book? Give it to me. I will try it out.";
@@ -14244,16 +9831,14 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 			monster "mosk_dun02",54,210,"Brutal Gardener",1497,1,"Baba Yaga#rus32::OnMyMobDead";
 			donpcevent "Baba Yaga#rus32::OnDisable";
 			close;
-		}else{
-			mes "[Baba Yaga]";
-			mes "Buy me a magic book. It is published by Momotaro in Amatsu. Go there and buy it for me.";
-			next;
-			mes "[Baba Yaga]";
-			mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe.";
-			close;
 		}
-	}
-	else if (rhea_rus_main == 28) {
+		mes "[Baba Yaga]";
+		mes "Buy me a magic book. It is published by Momotaro in Amatsu. Go there and buy it for me.";
+		next;
+		mes "[Baba Yaga]";
+		mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe.";
+		close;
+	} else if (rhea_rus_main == 28) {
 		mes "["+ strcharinfo(0) +"]";
 		mes "W, what is this, suddenly?!";
 		next;
@@ -14272,8 +9857,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		monster "mosk_dun02",54,210,"Alarm past 5 minutes",1193,1,"Baba Yaga#rus32::OnMyMobDead";
 		donpcevent "Baba Yaga#rus32::OnDisable";
 		close;
-	}
-	else if (rhea_rus_main == 29) {
+	} else if (rhea_rus_main == 29) {
 		mes "["+ strcharinfo(0) +"]";
 		mes "What are you doing!!";
 		next;
@@ -14301,24 +9885,21 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		mes "Huh, I can make it for you right now. You have a violent temper.";
 		set rhea_rus_main,44;
 		close;
-	}
-	else if (rhea_rus_main > 30 && rhea_rus_main < 36) {
+	} else if (rhea_rus_main > 30 && rhea_rus_main < 36) {
 		mes "[Baba Yaga]";
 		mes "Can you see a jar next to the cabin? There is a House ghost living in there. Drive him out of there. He irritates me a lot.";
 		next;
 		mes "[Baba Yaga]";
 		mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe.";
 		close;
-	}
-	else if (rhea_rus_main > 35 && rhea_rus_main < 41) {
+	} else if (rhea_rus_main > 35 && rhea_rus_main < 41) {
 		mes "[Baba Yaga]";
 		mes "Go to the Broom Grandmother in Payon and buy me a broom. It is best for cleaning but I don't have time to go there.";
 		next;
 		mes "[Baba Yaga]";
 		mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe.";
 		close;
-	}
-	else if (rhea_rus_main == 41) {
+	} else if (rhea_rus_main == 41) {
 		mes "["+ strcharinfo(0) +"]";
 		mes "I have done your favor! I got the cow!";
 		next;
@@ -14330,8 +9911,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		set rhea_rus_main,47;
 		getitem 7876,1;
 		close;
-	}
-	else if (rhea_rus_main == 42) {
+	} else if (rhea_rus_main == 42) {
 		mes "["+ strcharinfo(0) +"]";
 		mes "I have done your favor! The coffin is now silenced!";
 		next;
@@ -14346,9 +9926,8 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		set rhea_rus_main,47;
 		getitem 7876,1;
 		close;
-	}
-	else if (rhea_rus_main == 43) {
-		if (countitem(7880) > 0) {
+	} else if (rhea_rus_main == 43) {
+		if (countitem(7880)) {
 			mes "["+ strcharinfo(0) +"]";
 			mes "I have done your favor! I found and got the silver spoons!";
 			next;
@@ -14364,22 +9943,20 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 			set rhea_rus_main,47;
 			getitem 7876,1;
 			close;
-		}else{
-			mes "["+ strcharinfo(0) +"]";
-			mes "I have done your favor! I found and got the silver spoons!";
-			next;
-			mes "[Baba Yaga]";
-			mes "Oh, yes, yes. Give them to me.";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "Here they.. They..?!";
-			next;
-			mes "[Baba Yaga]";
-			mes "You fool! Where did you sell my spoons!? Get them for me right now!";
-			close;
 		}
-	}
-	else if (rhea_rus_main == 44) {
+		mes "["+ strcharinfo(0) +"]";
+		mes "I have done your favor! I found and got the silver spoons!";
+		next;
+		mes "[Baba Yaga]";
+		mes "Oh, yes, yes. Give them to me.";
+		next;
+		mes "["+ strcharinfo(0) +"]";
+		mes "Here they.. They..?!";
+		next;
+		mes "[Baba Yaga]";
+		mes "You fool! Where did you sell my spoons!? Get them for me right now!";
+		close;
+	} else if (rhea_rus_main == 44) {
 		mes "["+ strcharinfo(0) +"]";
 		mes "I have done your favor. Give me the key!";
 		next;
@@ -14391,8 +9968,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		set rhea_rus_main,47;
 		getitem 7876,1;
 		close;
-	}
-	else if (rhea_rus_main == 45) {
+	} else if (rhea_rus_main == 45) {
 		mes "["+ strcharinfo(0) +"]";
 		mes "I have done your favor! The House ghost is now quiet!";
 		next;
@@ -14407,8 +9983,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		set rhea_rus_main,47;
 		getitem 7876,1;
 		close;
-	}
-	else if (rhea_rus_main == 46) {
+	} else if (rhea_rus_main == 46) {
 		mes "["+ strcharinfo(0) +"]";
 		mes "I have done your favor! Here, the best broom from Payon!";
 		next;
@@ -14423,16 +9998,14 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		set rhea_rus_main,47;
 		getitem 7876,1;
 		close;
-	}
-	else if (rhea_rus_main > 46 && rhea_rus_main < 49) {
+	} else if (rhea_rus_main > 46 && rhea_rus_main < 49) {
 		mes "[Baba Yaga]";
 		mes "You got the key and went to Maria immedately, right?";
 		next;
 		mes "[Baba Yaga]";
 		mes "Take care of yourself. When you release her, Koshei will come out and bring destruction.";
 		close;
-	}
-	else if (rhea_rus_main == 49) {
+	} else if (rhea_rus_main == 49) {
 		mes "[Baba Yaga]";
 		mes "What are you doing here? Kehehehe.";
 		next;
@@ -14462,9 +10035,8 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		mes "Bring them to me quickly! Time is running out!";
 		set rhea_rus_main,50;
 		close;
-	}
-	else if (rhea_rus_main == 50) {
-		if (countitem(523) > 0 && countitem(12020) > 0 && countitem(610) > 1 && countitem(520) > 9) {
+	} else if (rhea_rus_main == 50) {
+		if (countitem(523) && countitem(12020) && countitem(610) > 1 && countitem(520) > 9) {
 			mes "[Baba Yaga]";
 			mes "Kehe, you are very quick.";
 			next;
@@ -14515,19 +10087,17 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 			delitem 520,10;
 			set rhea_rus_main,51;
 			close;
-		}else{
-			mes "[Baba Yaga]";
-			mes "'Living Water'... I just need the ingredients.  I need ^0000ff1 Holy Water^000000 and ^0000ff2 Yggdrasil Leaves^000000.";
-			next;
-			mes "[Baba Yaga]";
-			mes "And 'Dead Water'.. I need ^0000ff1 Cursed Water^000000 and ^0000ff10 Hinalle Leaflets^000000.";
-			next;
-			mes "[Baba Yaga]";
-			mes "Bring them to me quickly! Time is running out!";
-			close;
 		}
-	}
-	else if (rhea_rus_main == 51) {
+		mes "[Baba Yaga]";
+		mes "'Living Water'... I just need the ingredients.  I need ^0000ff1 Holy Water^000000 and ^0000ff2 Yggdrasil Leaves^000000.";
+		next;
+		mes "[Baba Yaga]";
+		mes "And 'Dead Water'.. I need ^0000ff1 Cursed Water^000000 and ^0000ff10 Hinalle Leaflets^000000.";
+		next;
+		mes "[Baba Yaga]";
+		mes "Bring them to me quickly! Time is running out!";
+		close;
+	} else if (rhea_rus_main == 51) {
 		mes "[Baba Yaga]";
 		mes "Go to Maria to help her.";
 		next;
@@ -14537,8 +10107,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		mes "[Baba Yaga]";
 		mes "Go there right now! Kehehehehe";
 		close;
-	}
-	else if (rhea_rus_main == 52) {
+	} else if (rhea_rus_main == 52) {
 		mes "[Baba Yaga]";
 		mes "You are more useful than I thought, kid.";
 		next;
@@ -14570,8 +10139,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		mes "Whenever you come to me, I will make you potions with just a few materials and a small fee. I hope that this will be of help to you. Kehehehehehe.";
 		set rhea_rus_main,53;
 		close;
-	}
-	else if (rhea_rus_main > 52) {
+	} else if (rhea_rus_main > 52) {
 		mes "[Baba Yaga]";
 		mes "Oh, you are back. What can I do for you?";
 		next;
@@ -14585,9 +10153,8 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 					set .@red_apple01,countitem(512);
 					set .@red_zeny01,Zeny;
 					while(1) {
-						if (.@red_potion01 == 0 || .@red_tube01 == 0 || .@red_cup01 == 0 || .@red_apple01 < 5 || .@red_zeny01 < 20) {
-							break;
-						}else{
+						if (!.@red_potion01 || !.@red_tube01 || !.@red_cup01 || .@red_apple01 < 5 || .@red_zeny01 < 20) break;
+						else {
 							set .@red_slim01,.@red_slim01+1;
 							set .@red_potion01,.@red_potion01-1;
 							set .@redpotion_send,.@redpotion_send+1;
@@ -14612,22 +10179,18 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 					next;
 					while(1) {
 						input .@input;
-						if (.@input == 0) {
+						if (!.@input) {
 							mes "[Baba Yaga]";
 							mes "You don't want it?";
 							next;
 							mes "[Baba Yaga]";
 							mes "I don't understand you. What do you want? Kehehehehe.";
 							close;
-						}
-						else if (.@input > 100) {
+						} else if (.@input > 100) {
 							mes "[Baba Yaga]";
 							mes "I said no more then 100 at a time. Kehehehehe.";
 							next;
-						}
-						else {
-							break;
-						}
+						} else break;
 					}
 					set .@redpotion_send,.@input;
 					set .@redtube_send,.@input;
@@ -14640,18 +10203,17 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 						mes "Where are the materials?";
 						mes "They are not enough! Check them and come back again! Kehehehehe.";
 						close;
-					}else{
-						mes "[Baba Yaga]";
-						mes "Ho, you want "+ .@input +". Ok, wait here for a while.";
-						next;
-						mes "- Baba Yaga grinds the Apples -";
-						mes "- and pours the Red Potion -";
-						mes "- into the Medicine Bowl, -";
-						mes "- boils and cools it down -";
-						mes "- and puts it in the Test Tube -";
-						next;
 					}
 					mes "[Baba Yaga]";
+					mes "Ho, you want "+ .@input +". Ok, wait here for a while.";
+					next;
+					mes "- Baba Yaga grinds the Apples -";
+					mes "- and pours the Red Potion -";
+					mes "- into the Medicine Bowl, -";
+					mes "- boils and cools it down -";
+					mes "- and puts it in the Test Tube -";
+					next;
+					mes "[Baba Yaga]";
 					mes "Here, done!";
 					specialeffect EF_PHARMACY_OK;
 					next;
@@ -14664,19 +10226,13 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 					set Zeny,Zeny-.@redzeny_send;
 					getitem 545,.@total_red01;
 					close;
-				}else{
-					mes "[Baba Yaga]";
-					mes "To make Condensed Red Potions, I need ^0000ff1 Red Potion, 1 Empty Test Tube, 1 Medicine Bowl, 5 Apples and 20 Zeny^000000.";
-					close;
 				}
-			}else{
-				mes "[Baba Yaga]";
-				mes "To make Condensed Red Potions, I need ^0000ff1 Red Potion, 1 Empty Test Tube, 1 Medicine Bowl, 5 Apples and 20 Zeny^000000.";
-				close;
 			}
-			break;
+			mes "[Baba Yaga]";
+			mes "To make Condensed Red Potions, I need ^0000ff1 Red Potion, 1 Empty Test Tube, 1 Medicine Bowl, 5 Apples and 20 Zeny^000000.";
+			close;
 		case 2:
-			if (countitem(503) > 0 && countitem(1092) > 0 && countitem(7134) > 0 && countitem(513) > 9) {
+			if (countitem(503) && countitem(1092) && countitem(7134) && countitem(513) > 9) {
 				if (Zeny > 49) {
 					set .@yell_potion01,countitem(503);
 					set .@yell_tube01,countitem(1092);
@@ -14684,9 +10240,8 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 					set .@yell_banana01,countitem(513);
 					set .@yell_zeny01,Zeny;
 					while(1) {
-						if (.@yell_potion01 == 0 || .@yell_tube01 == 0 || .@yell_cup01 == 0 || .@yell_banana01 < 10 || .@yell_zeny01 < 50) {
-							break;
-						}else{
+						if (!.@yell_potion01 || !.@yell_tube01 || !.@yell_cup01 || .@yell_banana01 < 10 || .@yell_zeny01 < 50) break;
+						else {
 							set .@yell_slim01,.@yell_slim01+1;
 							set .@yell_potion01,.@yell_potion01-1;
 							set .@yellpotion_send,.@yellpotion_send+1;
@@ -14711,22 +10266,18 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 					next;
 					while(1) {
 						input .@input;
-						if (.@input == 0) {
+						if (!.@input) {
 							mes "[Baba Yaga]";
 							mes "You don't want it?";
 							next;
 							mes "[Baba Yaga]";
 							mes "I don't understand you. What do you want? Kehehehehe.";
 							close;
-						}
-						else if (.@input > 100) {
+						} else if (.@input > 100) {
 							mes "[Baba Yaga]";
 							mes "I said no more then 100 at a time. Kehehehehe.";
 							next;
-						}
-						else {
-							break;
-						}
+						} else break;
 					}
 					set .@yellpotion_send,.@input;
 					set .@yelltube_send,.@input;
@@ -14739,18 +10290,17 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 						mes "Where are the materials?";
 						mes "They are not enough! Check them and come back again! Kehehehehe.";
 						close;
-					}else{
-						mes "[Baba Yaga]";
-						mes "Ho, you want "+ .@input +". Ok, wait here for a while.";
-						next;
-						mes "- Baba Yaga grinds the Banannas -";
-						mes "- and pours the Yellow Potion -";
-						mes "- into the Medicine Bowl, -";
-						mes "- boils and cools it down -";
-						mes "- and puts it in the Test Tube -";
-						next;
 					}
 					mes "[Baba Yaga]";
+					mes "Ho, you want "+ .@input +". Ok, wait here for a while.";
+					next;
+					mes "- Baba Yaga grinds the Banannas -";
+					mes "- and pours the Yellow Potion -";
+					mes "- into the Medicine Bowl, -";
+					mes "- boils and cools it down -";
+					mes "- and puts it in the Test Tube -";
+					next;
+					mes "[Baba Yaga]";
 					mes "Here, done!";
 					specialeffect EF_PHARMACY_OK;
 					next;
@@ -14763,17 +10313,11 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 					set Zeny,Zeny-.@yellzeny_send;
 					getitem 546,.@total_yell01;
 					close;
-				}else{
-					mes "[Baba Yaga]";
-					mes "To make Condensed Yellow Potions, I need ^0000ff1 Yellow Potion, 1 Test Tube, 1 Medicine_Bowl, 10 Bananas and 50 Zeny^000000.";
-					close;
 				}
-			}else{
-				mes "[Baba Yaga]";
-				mes "To make Condensed Yellow Potions, I need ^0000ff1 Yellow Potion, 1 Test Tube, 1 Medicine_Bowl, 10 Bananas and 50 Zeny^000000.";
-				close;
 			}
-			break;
+			mes "[Baba Yaga]";
+			mes "To make Condensed Yellow Potions, I need ^0000ff1 Yellow Potion, 1 Test Tube, 1 Medicine_Bowl, 10 Bananas and 50 Zeny^000000.";
+			close;
 		case 3:
 			mes "[Baba Yaga]";
 			mes "You don't want anything?";
@@ -14783,11 +10327,9 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 			close;
 		}
 	}
-	else {
-		mes "[Baba Yaga]";
-		mes "What are you, human child.";
-		close;
-	}
+	mes "[Baba Yaga]";
+	mes "What are you, human child.";
+	close;
 
 OnInit:
 	enablenpc "Baba Yaga#rus32";
@@ -14818,7 +10360,6 @@ OnMyMobDead:
 //----------------------------------------------------------------------------
 mosk_dun02,257,193,0	script	Cow#rus33	889,3,3,{
 	end;
-
 OnInit:
 	enablenpc "Cow#rus33";
 	end;
@@ -14832,12 +10373,7 @@ OnDisable:
 	end;
 
 OnTouch:
-	if (rhea_rus_main < 11) {
-		mes "[Cow]";
-		mes "Mooo...";
-		close;
-	}
-	else if (rhea_rus_main == 11) {
+	if (rhea_rus_main == 11) {
 		mes "[Cow]";
 		mes "Moo..";
 		next;
@@ -14853,8 +10389,7 @@ OnTouch:
 		next;
 		mes "- The cow seems surprised, jumps and tries to attack you !! -";
 		next;
-		set .@russ_cow01,rand(1,4);
-		if (.@russ_cow01 == 3) {
+		if (rand(1,4) == 3) {
 			mes "- You almost get hit and dodge its attack and cast the spell !! -";
 			next;
 			input .@input$;
@@ -14867,7 +10402,7 @@ OnTouch:
 				donpcevent "Cow#rus33::OnDisable";
 				donpcevent "Cow#rus34::OnEnable";
 				next;
-			}else{
+			} else {
 				mes "["+ strcharinfo(0) +"]";
 				mes ""+ .@input$ +" !!!";
 				next;
@@ -14875,35 +10410,29 @@ OnTouch:
 				mes "...Moo...";
 				emotion 9;
 				next;
-				set .@run_cow01,rand(1,2);
-				if (.@run_cow01 == 1) {
-					mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
+				mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
+				if (rand(1,2) == 1) {
 					donpcevent "Cow#rus33::OnDisable";
 					donpcevent "Cow#rus34::OnEnable";
-					close;
-				}else{
-					mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
+				} else {
 					donpcevent "Cow#rus33::OnDisable";
 					donpcevent "Cow#rus35::OnEnable";
-					close;
 				}
+				close;
 			}
-		}else{
+		} else {
 			mes "["+ strcharinfo(0) +"]";
 			mes "Akkkk?! Eh!? The s-spell...";
 			next;
-			set .@run_cow02,rand(1,2);
-			if (.@run_cow02 == 1) {
-				mes "- You hesitate, the cow, seems to gibe at you, passes by you and runs to bushes !! -";
+			mes "- You hesitate, the cow, seems to gibe at you, passes by you and runs to bushes !! -";
+			if (rand(1,2) == 1) {
 				donpcevent "Cow#rus33::OnDisable";
 				donpcevent "Cow#rus34::OnEnable";
-				close;
-			}else{
-				mes "- You hesitate, the cow, seems to gibe at you, passes by you and runs to bushes !! -";
+			} else {
 				donpcevent "Cow#rus33::OnDisable";
 				donpcevent "Cow#rus35::OnEnable";
-				close;
 			}
+			close;
 		}
 		mes "["+ strcharinfo(0) +"]";
 		mes "What a surprise. The cow is bad like its owner.";
@@ -14912,8 +10441,7 @@ OnTouch:
 		mes "Ok, then. Let's get back to Baba Yaga...";
 		set rhea_rus_main,41;
 		close;
-	}
-	else if (rhea_rus_main == 41) {
+	} else if (rhea_rus_main == 41) {
 		mes "[Cow]";
 		mes "Moo...";
 		next;
@@ -14923,16 +10451,13 @@ OnTouch:
 		mes "I must return to Baba Yaga...";
 		close;
 	}
-	else {
-		mes "[Cow]";
-		mes "Moo...";
-		close;
-	}
+	mes "[Cow]";
+	mes "Moo...";
+	close;
 }
 
 mosk_dun02,257,193,0	script	Cow#rus34	889,3,3,{
 	end;
-
 OnInit:
 	enablenpc "Cow#rus34";
 	end;
@@ -14946,12 +10471,7 @@ OnDisable:
 	end;
 
 OnTouch:
-	if (rhea_rus_main < 11) {
-		mes "[Cow]";
-		mes "Mooo...";
-		close;
-	}
-	else if (rhea_rus_main == 11) {
+	if (rhea_rus_main == 11) {
 		mes "[Cow]";
 		mes "Moo..";
 		next;
@@ -14967,8 +10487,7 @@ OnTouch:
 		next;
 		mes "- The cow seems surprised, jumps and tries to attack you !! -";
 		next;
-		set .@russ_cow01,rand(1,4);
-		if (.@russ_cow01 == 3) {
+		if (rand(1,4) == 3) {
 			mes "- You almost get hit and dodge its attack and cast the spell !! -";
 			next;
 			input .@input$;
@@ -14981,7 +10500,7 @@ OnTouch:
 				donpcevent "Cow#rus34::OnDisable";
 				donpcevent "Cow#rus34::OnEnable";
 				next;
-			}else{
+			} else {
 				mes "["+ strcharinfo(0) +"]";
 				mes ""+ .@input$ +" !!!";
 				next;
@@ -14989,35 +10508,30 @@ OnTouch:
 				mes "...Moo...";
 				emotion 9;
 				next;
-				set .@run_cow01,rand(1,2);
-				if (.@run_cow01 == 1) {
-					mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
+				mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
+				if (rand(1,2) == 1) {
 					donpcevent "Cow#rus34::OnDisable";
 					donpcevent "Cow#rus34::OnEnable";
-					close;
-				}else{
-					mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
+				} else {
 					donpcevent "Cow#rus34::OnDisable";
 					donpcevent "Cow#rus35::OnEnable";
-					close;
 				}
+				close;
 			}
-		}else{
+		} else {
 			mes "["+ strcharinfo(0) +"]";
 			mes "Akkkk?! Eh!? The s-spell...";
 			next;
-			set .@run_cow02,rand(1,2);
-			if (.@run_cow02 == 1) {
-				mes "- You hesitate, the cow, seems to gibe at you, passes by you and runs to bushes !! -";
+			mes "- You hesitate, the cow, seems to gibe at you, passes by you and runs to bushes !! -";
+			if (rand(1,2) == 1) {	
 				donpcevent "Cow#rus34::OnDisable";
 				donpcevent "Cow#rus34::OnEnable";
-				close;
-			}else{
+			} else {
 				mes "- You hesitate, the cow, seems to gibe at you, passes by you and runs to bushes !! -";
 				donpcevent "Cow#rus34::OnDisable";
 				donpcevent "Cow#rus35::OnEnable";
-				close;
 			}
+			close;
 		}
 		mes "["+ strcharinfo(0) +"]";
 		mes "What a surprise. The cow is bad like its owner.";
@@ -15026,8 +10540,7 @@ OnTouch:
 		mes "Ok, then. Let's get back to Baba Yaga...";
 		set rhea_rus_main,41;
 		close;
-	}
-	else if (rhea_rus_main == 41) {
+	} else if (rhea_rus_main == 41) {
 		mes "[Cow]";
 		mes "Moo...";
 		next;
@@ -15037,16 +10550,13 @@ OnTouch:
 		mes "I must return to Baba Yaga...";
 		close;
 	}
-	else {
-		mes "[Cow]";
-		mes "Moo...";
-		close;
-	}
+	mes "[Cow]";
+	mes "Moo...";
+	close;
 }
 
 mosk_dun02,257,193,0	script	Cow#rus35	889,3,3,{
 	end;
-
 OnInit:
 	enablenpc "Cow#rus35";
 	end;
@@ -15060,12 +10570,7 @@ OnDisable:
 	end;
 
 OnTouch:
-	if (rhea_rus_main < 11) {
-		mes "[Cow]";
-		mes "Mooo...";
-		close;
-	}
-	else if (rhea_rus_main == 11) {
+	if (rhea_rus_main == 11) {
 		mes "[Cow]";
 		mes "Moo..";
 		next;
@@ -15081,8 +10586,7 @@ OnTouch:
 		next;
 		mes "- The cow seems surprised, jumps and tries to attack you !! -";
 		next;
-		set .@russ_cow01,rand(1,4);
-		if (.@russ_cow01 == 3) {
+		if (rand(1,4) == 3) {
 			mes "- You almost get hit and dodge its attack and cast the spell !! -";
 			next;
 			input .@input$;
@@ -15095,7 +10599,7 @@ OnTouch:
 				donpcevent "Cow#rus35::OnDisable";
 				donpcevent "Cow#rus35::OnEnable";
 				next;
-			}else{
+			} else {
 				mes "["+ strcharinfo(0) +"]";
 				mes ""+ .@input$ +" !!!";
 				next;
@@ -15103,35 +10607,19 @@ OnTouch:
 				mes "...Moo...";
 				emotion 9;
 				next;
-				set .@run_cow01,rand(1,2);
-				if (.@run_cow01 == 1) {
-					mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
-					donpcevent "Cow#rus35::OnDisable";
-					donpcevent "Cow#rus35::OnEnable";
-					close;
-				}else{
-					mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
-					donpcevent "Cow#rus35::OnDisable";
-					donpcevent "Cow#rus35::OnEnable";
-					close;
-				}
-			}
-		}else{
-			mes "["+ strcharinfo(0) +"]";
-			mes "Akkkk?! Eh!? The s-spell...";
-			next;
-			set .@run_cow02,rand(1,2);
-			if (.@run_cow02 == 1) {
-				mes "- You hesitate, the cow, seems to gibe at you, passes by you and runs to bushes !! -";
-				donpcevent "Cow#rus35::OnDisable";
-				donpcevent "Cow#rus35::OnEnable";
-				close;
-			}else{
-				mes "- You hesitate, the cow, seems to gibe at you, passes by you and runs to bushes !! -";
+				mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
 				donpcevent "Cow#rus35::OnDisable";
 				donpcevent "Cow#rus35::OnEnable";
 				close;
 			}
+		} else {
+			mes "["+ strcharinfo(0) +"]";
+			mes "Akkkk?! Eh!? The s-spell...";
+			next;
+			mes "- You hesitate, the cow, seems to gibe at you, passes by you and runs to bushes !! -";
+			donpcevent "Cow#rus35::OnDisable";
+			donpcevent "Cow#rus35::OnEnable";
+			close;
 		}
 		mes "["+ strcharinfo(0) +"]";
 		mes "What a surprise. The cow is bad like its owner.";
@@ -15140,8 +10628,7 @@ OnTouch:
 		mes "Ok, then. Let's get back to Baba Yaga...";
 		set rhea_rus_main,41;
 		close;
-	}
-	else if (rhea_rus_main == 41) {
+	} else if (rhea_rus_main == 41) {
 		mes "[Cow]";
 		mes "Moo...";
 		next;
@@ -15151,11 +10638,9 @@ OnTouch:
 		mes "I must return to Baba Yaga...";
 		close;
 	}
-	else {
-		mes "[Cow]";
-		mes "Moo...";
-		close;
-	}
+	mes "[Cow]";
+	mes "Moo...";
+	close;
 }
 
 mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
@@ -15166,8 +10651,7 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 		mes "[Noisy Coffin]";
 		mes "Don't you want to exchange lives with me? Exchange with me, exchange!";
 		close;
-	}
-	else if (rhea_rus_main > 15 && rhea_rus_main < 19) {
+	} else if (rhea_rus_main > 15 && rhea_rus_main < 19) {
 		mes "[Noisy Coffin]";
 		mes "Isn't it good to be alive? Isn't it to live?";
 		next;
@@ -15199,7 +10683,7 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 					mes "Heek, heeee! Heeeeeek!";
 					set rhea_rus_main,18;
 					next;
-				}else{
+				} else {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...I'll pray.";
 					next;
@@ -15213,7 +10697,6 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 					mes "["+ strcharinfo(0) +"]";
 					mes "......................................";
 					next;
-					break;
 				}
 				break;
 			case 2:
@@ -15231,7 +10714,7 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 					mes "Heek, heeee! Heeeeeek!";
 					set rhea_rus_main,19;
 					next;
-				}else{
+				} else {
 					mes "["+ strcharinfo(0) +"]";
 					mes "Hmm, hmm! I'll sing a hymn. The first phrase 'Good looks down at us'!!";
 					next;
@@ -15247,11 +10730,10 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 					mes "["+ strcharinfo(0) +"]";
 					mes "......................................";
 					next;
-					break;
 				}
 				break;
 			case 3:
-				if (countitem(523) > 0) {
+				if (countitem(523)) {
 					if (rhea_rus_main == 16) {
 						mes "["+ strcharinfo(0) +"]";
 						mes "If you don't shut up, I will pour Holy Water on you!";
@@ -15264,7 +10746,7 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 						delitem 523,1;
 						set rhea_rus_main,17;
 						next;
-					}else{
+					} else {
 						mes "["+ strcharinfo(0) +"]";
 						mes "If you don't shut up, I will pour Holy Water on you!";
 						next;
@@ -15278,9 +10760,8 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 						mes "["+ strcharinfo(0) +"]";
 						mes "......................................";
 						next;
-						break;
 					}
-				}else{
+				} else {
 					mes "["+ strcharinfo(0) +"]";
 					mes "Yeah, where's the Holy water?";
 					next;
@@ -15290,7 +10771,6 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 					mes "["+ strcharinfo(0) +"]";
 					mes "......................................";
 					next;
-					break;
 				}
 				break;
 			case 4:
@@ -15306,8 +10786,7 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 					specialeffect EF_HOLYHIT;
 					set rhea_rus_main,20;
 					next;
-					break;
-				}else{
+				} else {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...If you don't shut up...";
 					mes "......I will kick you!!";
@@ -15321,8 +10800,8 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 					mes "["+ strcharinfo(0) +"]";
 					mes "......................................";
 					next;
-					break;
 				}
+				break;
 			}
 		}
 		if (rhea_rus_main < 20) {
@@ -15330,22 +10809,7 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 			mes "... Not effective...";
 			set rhea_rus_main,16;
 			close;
-		}else{
-			mes "["+ strcharinfo(0) +"]";
-			mes ".............If you make noise once more, you will see more than you imagine...";
-			next;
-			mes "[Noisy Coffin]";
-			mes "................................";
-			emotion 9;
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "Hu, the job has been done.";
-			mes "Let's get back to Baba Yaga.";
-			set rhea_rus_main,42;
-			close;
 		}
-	}
-	else if (rhea_rus_main == 20) {
 		mes "["+ strcharinfo(0) +"]";
 		mes ".............If you make noise once more, you will see more than you imagine...";
 		next;
@@ -15358,8 +10822,7 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 		mes "Let's get back to Baba Yaga.";
 		set rhea_rus_main,42;
 		close;
-	}
-	else if (rhea_rus_main == 42) {
+	} else if (rhea_rus_main == 20) {
 		mes "["+ strcharinfo(0) +"]";
 		mes ".............If you make noise once more, you will see more than you imagine...";
 		next;
@@ -15370,21 +10833,27 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 		mes "["+ strcharinfo(0) +"]";
 		mes "Hu, the job has been done.";
 		mes "Let's get back to Baba Yaga.";
+		set rhea_rus_main,42;
 		close;
-	}
-	else {
+	} else if (rhea_rus_main == 42) {
+		mes "["+ strcharinfo(0) +"]";
+		mes ".............If you make noise once more, you will see more than you imagine...";
+		next;
 		mes "[Noisy Coffin]";
-		mes ".............................";
+		mes "................................";
+		emotion 9;
+		next;
+		mes "["+ strcharinfo(0) +"]";
+		mes "Hu, the job has been done.";
+		mes "Let's get back to Baba Yaga.";
 		close;
 	}
+	mes "[Noisy Coffin]";
+	mes ".............................";
+	close;
 }
 
 treasure01,165,58,0	script	Old Treasure Box#rus37	111,{
-	if (checkweight(1201,1) == 0) {
-		mes "You are carrying too much!";
-		mes "Lose some weight and try again.";
-		close;
-	}
 	if ((MaxWeight-Weight) < 3500) {
 		mes "You are carrying too much!";
 		mes "Lose some weight and try again.";
@@ -15393,8 +10862,7 @@ treasure01,165,58,0	script	Old Treasure Box#rus37	111,{
 	if (rhea_rus_main > 20 && rhea_rus_main < 25) {
 		mes "- It is locked -";
 		close;
-	}
-	else if (rhea_rus_main == 25) {
+	} else if (rhea_rus_main == 25) {
 		mes "- Around the locked box, a women having snakes on her head is engraved -";
 		next;
 		mes "["+ strcharinfo(0) +"]";
@@ -15403,15 +10871,14 @@ treasure01,165,58,0	script	Old Treasure Box#rus37	111,{
 		select("Insert the key into the lock");
 		mes "- As soon as you insert the key into the lock, the eyes of the woman moves and she looks at you -";
 		next;
-		if (countitem(747) > 0) {
-			mes "- Her eyes are made from jewels !! -";
+		mes "- Her eyes are made from jewels !! -";
+		if (countitem(747)) {
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "Arrrrrk? What is this!!";
 			specialeffect EF_FLASHER;
 			next;
-		}else{
-			mes "- Her eyes are made from jewels !! -";
+		} else {
 			sc_start SC_BLIND,60000,0;
 			donpcevent "Old Treasure Box#rus37::OnCall";
 			close2;
@@ -15427,14 +10894,11 @@ treasure01,165,58,0	script	Old Treasure Box#rus37	111,{
 		set rhea_rus_main,43;
 		getitem 7880,1;
 		close;
-	}
-	else if (rhea_rus_main == 43) {
+	} else if (rhea_rus_main == 43) {
 		mes "- The treasure box where you found the silver spoons -";
 		close;
 	}
-	else {
-		end;
-	}
+	end;
 
 OnInit:
 	enablenpc "Old Treasure Box#rus37";
@@ -15479,26 +10943,26 @@ treasure01,24,39,0	script	Old Bed#rus38	111,{
 		mes "- An old bed covered with dust and must -";
 		next;
 		switch(select("On the bed:Under the bed:Bed sheet")) {
-		case 1:
-			mes "- Mushrooms grow on the bed -";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "...Life......";
-			close;
-			break;
-		case 2:
-			mes "- You look at the under the bed -";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "Ouch?!";
-			specialeffect2 EF_HIT2;
-			percentheal -5,0;
-			next;
-			mes "- Something unidentified bites your hand !! -";
-			close;
-			break;
-		case 3:
-			break;
+			case 1:
+				mes "- Mushrooms grow on the bed -";
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "...Life......";
+				close;
+				break;
+			case 2:
+				mes "- You look at the under the bed -";
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "Ouch?!";
+				specialeffect2 EF_HIT2;
+				percentheal -5,0;
+				next;
+				mes "- Something unidentified bites your hand !! -";
+				close;
+				break;
+			case 3:
+				break;
 		}
 		mes "- You raise the dirty sheet that has many holes -";
 		next;
@@ -15528,63 +10992,49 @@ treasure01,24,39,0	script	Old Bed#rus38	111,{
 		close2;
 		warp "treasure01",68,28;
 		end;
-	}
-	else if (rhea_rus_main > 21 && rhea_rus_main < 26) {
+	} else if (rhea_rus_main > 21 && rhea_rus_main < 26) {
 		mes "- An old bed covered with dust and must -";
 		next;
 		switch(select("On the bed:Under the bed:Bed sheet")) {
-		case 1:
-			mes "- Mushrooms grow on the bed -";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "...Life......";
-			close;
-			break;
-		case 2:
-			mes "- You look at the under the bed -";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "Ouch?!";
-			specialeffect2 EF_HIT2;
-			percentheal -5,0;
-			next;
-			mes "- Something unidentified bites your hand !! -";
-			close;
-			break;
-		case 3:
-			break;
+			case 1:
+				mes "- Mushrooms grow on the bed -";
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "...Life......";
+				close;
+				break;
+			case 2:
+				mes "- You look at the under the bed -";
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "Ouch?!";
+				specialeffect2 EF_HIT2;
+				percentheal -5,0;
+				next;
+				mes "- Something unidentified bites your hand !! -";
+				close;
+				break;
+			case 3:
+				break;
 		}
 		mes "- While running in a hurry, the sheet is a bit torn -";
 		close;
 	}
-	else {
-		end;
-	}
+	end;
 }
 
 treasure01,98,119,0	script	Dirty Wall#rus39	111,{
-	if (rhea_rus_main == 22) {
+	if (rhea_rus_main == 22 || (rhea_rus_main > 22 && rhea_rus_main < 26)) {
 		mes "- Something is engraved on the wall -";
 		next;
 		mes "- ^ff0000Her... careful.. Mermaid's song.. sleeping.. the eyes.. protect your.. mirror^000000 -";
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "...What is this talking about...?";
-		set rhea_rus_main,23;
+		if (rhea_rus_main == 22) set rhea_rus_main,23;
 		close;
 	}
-	else if (rhea_rus_main > 22 && rhea_rus_main < 26) {
-		mes "- Something is engraved on the wall -";
-		next;
-		mes "- ^ff0000Her... careful.. Mermaid's song.. sleeping.. the eyes.. protect your.. mirror^000000 -";
-		next;
-		mes "["+ strcharinfo(0) +"]";
-		mes "...What is this talking about...?";
-		close;
-	}
-	else {
-		end;
-	}
+	end;
 }
 
 treasure01,61,183,0	script	Old_Wooden_Box#rus40	111,{
@@ -15592,27 +11042,22 @@ treasure01,61,183,0	script	Old_Wooden_Box#rus40	111,{
 		mes "- Something is glimmering inside of the box -";
 		next;
 		select("Put hand inside the box");
-		set .@russ_key01,rand(1,7);
-		if (.@russ_key01 == 4) {
+		if (rand(1,7) == 4) {
 			mes "- You take out something glimmering from the box -";
 			next;
 			mes "- ^0000ffYou find the handle of a broken key !!^000000 -";
 			set rhea_rus_main,24;
 			close;
-		}else{
-			mes "- You try to put your hand inside it but the gap is too small to do it -";
-			next;
-			mes "- You ruin the box a little -";
-			close;
 		}
-	}
-	else if (rhea_rus_main > 23 && rhea_rus_main < 26) {
+		mes "- You try to put your hand inside it but the gap is too small to do it -";
+		next;
+		mes "- You ruin the box a little -";
+		close;
+	} else if (rhea_rus_main > 23 && rhea_rus_main < 26) {
 		mes "- The old box that contained the handle of a broken key -";
 		close;
 	}
-	else {
-		end;
-	}
+	end;
 }
 
 treasure01,27,115,0	script	Opened Treasure Chest#41	111,{
@@ -15628,52 +11073,18 @@ treasure01,27,115,0	script	Opened Treasure Chest#41	111,{
 		mes "...!? What is this?!";
 		next;
 		set .@russ_key02,rand(1,7);
-		if (.@russ_key02 == 3) {
+		if (rand(1,7) == 3) {
 			mes "- ^0000ffYou find the handle of a broken key in the junk !!^000000 -";
 			next;
-		}
-		else if (.@russ_key02 == 1) {
-			mes "- You find the cuticle of Kukre !! -";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "W, what is this!?";
-			emotion 23,1;
-			close;
-		}
-		else if (.@russ_key02 == 2) {
-			mes "- You find the egg of a Theif Bug !! -";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "W, what is this!?";
-			emotion 23,1;
-			close;
-		}
-		else if (.@russ_key02 == 4) {
-			mes "- You find something that seems to be a banana before !! -";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "W, what is this!?";
-			emotion 23,1;
-			close;
-		}
-		else if (.@russ_key02 == 5) {
-			mes "- You find the tentacles of a Jelly Fish !! -";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "W, what is this!?";
-			emotion 23,1;
-			close;
-		}
-		else if (.@russ_key02 == 6) {
-			mes "- You find pieces of cloth with must on it !! -";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "W, what is this!?";
-			emotion 23,1;
-			close;
-		}
-		else {
-			mes "- You find a bone !! -";
+		} else {
+			switch (.@russ_key02) {
+				Case 1: mes "- You find the cuticle of Kukre !! -"; break;
+				Case 2: mes "- You find the egg of a Theif Bug !! -"; break;
+				Case 4: mes "- You find something that seems to be a banana before !! -"; break;
+				Case 5: mes "- You find the tentacles of a Jelly Fish !! -"; break;
+				Case 6: mes "- You find pieces of cloth with must on it !! -"; break;
+				Case 7: mes "- You find a bone !! -"; break;
+			}
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "W, what is this!?";
@@ -15686,23 +11097,14 @@ treasure01,27,115,0	script	Opened Treasure Chest#41	111,{
 		mes "- You adjust the piece of the broken key with the its handle and they make a sound and become a key !!-";
 		set rhea_rus_main,25;
 		close;
-	}
-	else if (rhea_rus_main > 24 && rhea_rus_main < 26) {
+	} else if (rhea_rus_main > 24 && rhea_rus_main < 26) {
 		mes "- The junk box containig the piece of the broken key -";
 		close;
 	}
-	else {
-		end;
-	}
+	end;
 }
 
 amatsu,233,234,3	script	Momotoro Publisher#rus42	757,{
-	if (checkweight(1201,1) == 0) {
-		mes "[Momotoro Publisher]";
-		mes "What on earth do you have in your bag?";
-		mes "Are you training for something?";
-		close;
-	}
 	if ((MaxWeight-Weight) < 3500) {
 		mes "[Momotoro Publisher]";
 		mes "What on earth do you have in your bag?";
@@ -15716,8 +11118,7 @@ amatsu,233,234,3	script	Momotoro Publisher#rus42	757,{
 		mes "[Momotoro Publisher]";
 		mes "Someone ordered a book but did not pick it up.";
 		close;
-	}
-	else if (rhea_rus_main == 26) {
+	} else if (rhea_rus_main == 26) {
 		mes "[Momotoro Publisher]";
 		mes "Did you order a book?";
 		next;
@@ -15738,7 +11139,7 @@ amatsu,233,234,3	script	Momotoro Publisher#rus42	757,{
 			mes "[Momotoro Publisher]";
 			mes ""+ .@input$ +" ... Ah, here it is.";
 			next;
-		}else{
+		} else {
 			mes "["+ strcharinfo(0) +"]";
 			mes "I am "+ .@input$ +" ";
 			next;
@@ -15757,7 +11158,7 @@ amatsu,233,234,3	script	Momotoro Publisher#rus42	757,{
 			mes "[Momotoro Publisher]";
 			mes "Eh, yep this is 5,000 Zeny.";
 			next;
-		}else{
+		} else {
 			mes "[Momotoro Publisher]";
 			mes "You don't have enough money?";
 			mes "Check it again and come to me, please";
@@ -15769,20 +11170,17 @@ amatsu,233,234,3	script	Momotoro Publisher#rus42	757,{
 		set rhea_rus_main,27;
 		getitem 7881,1;
 		close;
-	}
-	else if (rhea_rus_main > 26 && rhea_rus_main < 31) {
+	} else if (rhea_rus_main > 26 && rhea_rus_main < 31) {
 		mes "[Momotoro Publisher]";
 		mes "Thank you for buying our books. If you need more books, contact us please.";
 		close;
 	}
-	else {
-		mes "[Momotoro Publisher]";
-		mes "Did you order a book?";
-		next;
-		mes "[Momotoro Publisher]";
-		mes "Someone ordered a book but did not pick it up.";
-		close;
-	}
+	mes "[Momotoro Publisher]";
+	mes "Did you order a book?";
+	next;
+	mes "[Momotoro Publisher]";
+	mes "Someone ordered a book but did not pick it up.";
+	close;
 }
 
 mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
@@ -15811,8 +11209,7 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 		monster "mosk_dun02",60,220,"Thief Bug Male",1054,1,"House Ghost Jar#rus43::OnMyMobDead";
 		donpcevent "House Ghost Jar#rus43::OnDisable";
 		close;
-	}
-	else if (rhea_rus_main == 32) {
+	} else if (rhea_rus_main == 32) {
 		mes "["+ strcharinfo(0) +"]";
 		mes "Ehh.. you, what are you doing!!";
 		next;
@@ -15837,7 +11234,7 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 			mes "[House Ghost]";
 			mes "Ehhh, are you sure?";
 			next;
-		}else{
+		} else {
 			mes "[House Ghost]";
 			mes "Hmm, can you do something for me? It won't take much time.";
 			next;
@@ -15846,8 +11243,7 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 		mes "What about a card game? I was good at those games! Ah, where are my cards? Wait here! I'll find them!";
 		set rhea_rus_main,33;
 		close;
-	}
-	else if (rhea_rus_main == 33) {
+	} else if (rhea_rus_main == 33) {
 		mes "[House Ghost]";
 		mes "Hehe, what about a card game? I have an Angeling, Ghostring and a Poring Card.";
 		mes "All you have to do is just guess which card I pick up!";
@@ -15909,12 +11305,9 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 					set .@ruuser_score01,.@ruuser_score01+1;
 					cutin "",255;
 					next;
-				}
-				else {
-					if (.@rucard_game01 == 2)
-						cutin "¿£Á©¸µÄ«µå.bmp",4;
-					else
-						cutin "°í½ºÆ®¸µÄ«µå.bmp",4;
+				} else {
+					if (.@rucard_game01 == 2) cutin "?�ꨢ??��??��?.bmp",4;
+					else cutin "�㨪?o???��??��?.bmp",4;
 					emotion 0;
 					emotion 23,1;
 					next;
@@ -15935,7 +11328,7 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 				mes "One! Two! Three!!";
 				next;
 				if (.@rucard_game01 == 2) {
-					cutin "¿£Á©¸µÄ«µå.bmp",4;
+					cutin "?�ꨢ??��??��?.bmp",4;
 					emotion 0;
 					emotion 5,1;
 					next;
@@ -15946,12 +11339,9 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 					set .@ruuser_score01,.@ruuser_score01+1;
 					cutin "",255;
 					next;
-				}
-				else{
-					if (.@rucard_game01 == 1)
-						cutin "Poring_Card.bmp",4;
-					else
-						cutin "°í½ºÆ®¸µÄ«µå.bmp",4;
+				} else {
+					if (.@rucard_game01 == 1) cutin "Poring_Card.bmp",4;
+					else cutin "�㨪?o???��??��?.bmp",4;
 					emotion 0;
 					emotion 23,1;
 					next;
@@ -15972,7 +11362,7 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 				mes "One! Two! Three!!";
 				next;
 				if (.@rucard_game01 == 3) {
-					cutin "°í½ºÆ®¸µÄ«µå.bmp",4;
+					cutin "�㨪?o???��??��?.bmp",4;
 					emotion 0;
 					emotion 5,1;
 					next;
@@ -15983,11 +11373,9 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 					set .@ruuser_score01,.@ruuser_score01+1;
 					cutin "",255;
 					next;
-				}else{
-					if (.@rucard_game01 == 1)
-						cutin "Poring_Card.bmp",4;
-					else
-						cutin "¿£Á©¸µÄ«µå.bmp",4;
+				} else {
+					if (.@rucard_game01 == 1) cutin "Poring_Card.bmp",4;
+					else cutin "?�ꨢ??��??��?.bmp",4;
 					emotion 0;
 					emotion 23,1;
 					next;
@@ -16005,16 +11393,14 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 			mes "You are better than I thought.";
 			set rhea_rus_main,34;
 			close;
-		}else{
-			mes "["+ strcharinfo(0) +"]";
-			mes "I was not thinking correctly! Let's do it again!";
-			next;
-			mes "[House Ghost]";
-			mes "Huhu, ok. Let's do it again?";
-			close;
 		}
-	}
-	else if (rhea_rus_main == 34) {
+		mes "["+ strcharinfo(0) +"]";
+		mes "I was not thinking correctly! Let's do it again!";
+		next;
+		mes "[House Ghost]";
+		mes "Huhu, ok. Let's do it again?";
+		close;
+	} else if (rhea_rus_main == 34) {
 		mes "[House Ghost]";
 		mes "Ah, it was fun. It has been a long time since I've been able to play a game like that.";
 		next;
@@ -16024,11 +11410,11 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 		mes "["+ strcharinfo(0) +"]";
 		mes "Oh and by the way, I have a present for you!";
 		next;
-		if (countitem(519) > 0) {
+		if (countitem(519)) {
 			mes "["+ strcharinfo(0) +"]";
 			mes "You said you like milk. Here, take this.";
 			next;
-		}else{
+		} else {
 			mes "["+ strcharinfo(0) +"]";
 			mes "You said you like milk. Here, take.. Eh?";
 			next;
@@ -16047,8 +11433,7 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 		mes "I will never forget your kindness of entertaining me.";
 		set rhea_rus_main,45;
 		close;
-	}
-	else if (rhea_rus_main == 45) {
+	} else if (rhea_rus_main == 45) {
 		mes "[House Ghost]";
 		mes "Thank you so much!!";
 		mes "I promise I wil be quiet now. I will be the acting guardian for this house!";
@@ -16057,9 +11442,7 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 		mes "I will never forget your kindness of entertaining me.";
 		close;
 	}
-	else {
-		end;
-	}
+	end;
 
 OnInit:
 	enablenpc "House Ghost Jar#rus43";
@@ -16093,8 +11476,7 @@ payon,65,119,0	script	Broom Grandma#rus44	78,{
 		mes "[Broom Grandma]";
 		mes "It is so good that even ghosts want only a Payon broom.";
 		close;
-	}
-	else if (rhea_rus_main == 36) {
+	} else if (rhea_rus_main == 36) {
 		mes "[Broom Grandma]";
 		mes "A broom from Payon is best!";
 		next;
@@ -16117,8 +11499,7 @@ payon,65,119,0	script	Broom Grandma#rus44	78,{
 		mes "Ah.. What should I do...";
 		set rhea_rus_main,37;
 		close;
-	}
-	else if (rhea_rus_main > 36 && rhea_rus_main < 41) {
+	} else if (rhea_rus_main > 36 && rhea_rus_main < 41) {
 		mes "[Broom Grandma]";
 		mes "There are ghosts inside the dungeon of Payon. There is a tree there where the ghosts is hiding.";
 		next;
@@ -16128,8 +11509,7 @@ payon,65,119,0	script	Broom Grandma#rus44	78,{
 		mes "[Broom Grandma]";
 		mes "Ah.. What should I do...";
 		close;
-	}
-	else if (rhea_rus_main == 46) {
+	} else if (rhea_rus_main == 46) {
 		mes "[Broom Grandma]";
 		mes "Ah, you have taken them back. You are a great adventurer.";
 		next;
@@ -16137,14 +11517,12 @@ payon,65,119,0	script	Broom Grandma#rus44	78,{
 		mes "You can have that broom. I believe it is its destiny.";
 		close;
 	}
-	else {
-		mes "[Broom Grandma]";
-		mes "A broom from Payon is the best!";
-		next;
-		mes "[Broom Grandma]";
-		mes "It is so good that even ghosts want only a Payon broom.";
-		close;
-	}
+	mes "[Broom Grandma]";
+	mes "A broom from Payon is the best!";
+	next;
+	mes "[Broom Grandma]";
+	mes "It is so good that even ghosts want only a Payon broom.";
+	close;
 }
 
 pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
@@ -16177,8 +11555,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 		mes "Eh.. Let's see. This will be a good start! Let's get started if you are ready!";
 		set rhea_rus_main,38;
 		close;
-	}
-	else if (rhea_rus_main == 38) {
+	} else if (rhea_rus_main == 38) {
 		mes "[Ghost Tree]";
 		mes "First question. Listen to me carefully and answer the question!";
 		next;
@@ -16213,7 +11590,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 			mes "["+ strcharinfo(0) +"]";
 			mes ""+ .@input$ +" !!";
 			next;
-		}else{
+		} else {
 			set .@rus_kafra01,.@rus_kafra01;
 			mes "["+ strcharinfo(0) +"]";
 			mes ""+ .@input$ +"!!";
@@ -16228,7 +11605,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 			mes "["+ strcharinfo(0) +"]";
 			mes ""+ .@input$ +" !!";
 			next;
-		}else{
+		} else {
 			set .@rus_kafra01,.@rus_kafra01;
 			mes "["+ strcharinfo(0) +"]";
 			mes ""+ .@input$ +"!!";
@@ -16243,7 +11620,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 			mes "["+ strcharinfo(0) +"]";
 			mes ""+ .@input$ +" !!";
 			next;
-		}else{
+		} else {
 			set .@rus_kafra01,.@rus_kafra01;
 			mes "["+ strcharinfo(0) +"]";
 			mes ""+ .@input$ +"!!";
@@ -16258,7 +11635,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 			mes "["+ strcharinfo(0) +"]";
 			mes ""+ .@input$ +" !!";
 			next;
-		}else{
+		} else {
 			set .@rus_kafra01,.@rus_kafra01;
 			mes "["+ strcharinfo(0) +"]";
 			mes ""+ .@input$ +"!!";
@@ -16273,7 +11650,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 			mes "["+ strcharinfo(0) +"]";
 			mes ""+ .@input$ +" !!";
 			next;
-		}else{
+		} else {
 			set .@rus_kafra01,.@rus_kafra01;
 			mes "["+ strcharinfo(0) +"]";
 			mes ""+ .@input$ +"!!";
@@ -16283,7 +11660,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 			mes "[Ghost Tree]";
 			mes "Ho, you are good!";
 			next;
-		}else{
+		} else {
 			mes "[Ghost Tree]";
 			mes "Ah, you are wrong, wrong!";
 			mes "Do you really think that you can take the brooms back?";
@@ -16300,8 +11677,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 		mes "Gear yourself up!";
 		set rhea_rus_main,39;
 		close;
-	}
-	else if (rhea_rus_main == 39) {
+	} else if (rhea_rus_main == 39) {
 		mes "[Ghost Tree]";
 		mes "The second question. Listen carefully and answer!";
 		next;
@@ -16338,7 +11714,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 			mes "["+ strcharinfo(0) +"]";
 			mes ""+ .@input$ +" !!";
 			next;
-		}else{
+		} else {
 			mes "["+ strcharinfo(0) +"]";
 			mes ""+ .@input$ +"!!";
 			next;
@@ -16361,8 +11737,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 		mes "Gear yourself up and come to me again!";
 		set rhea_rus_main,40;
 		close;
-	}
-	else if (rhea_rus_main == 40) {
+	} else if (rhea_rus_main == 40) {
 		mes "[Ghost Tree]";
 		mes "Kuhuhu, you did good until now. If you win over me, I will give the brooms as promisied.";
 		next;
@@ -16385,42 +11760,11 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 			specialeffect EF_STUNATTACK;
 			next;
 			set .@tree_dice01,rand(1,6);
-			if (.@tree_dice01 == 1) {
-				mes "[Ghost Tree]";
-				mes "I've got ^0000ffNumber 1^000000.";
-				emotion 58;
-				next;
-			}
-			else if (.@tree_dice01 == 2) {
-				mes "[Ghost Tree]";
-				mes "I've got ^0000ffNumber 2^000000.";
-				emotion 59;
-				next;
-			}
-			else if (.@tree_dice01 == 3) {
-				mes "[Ghost Tree]";
-				mes "I've got ^0000ffNumber 3^000000.";
-				emotion 60;
-				next;
-			}
-			else if (.@tree_dice01 == 4) {
-				mes "[Ghost Tree]";
-				mes "I've got ^0000ffNumber 4^000000.";
-				emotion 61;
-				next;
-			}
-			else if (.@tree_dice01 == 5) {
-				mes "[Ghost Tree]";
-				mes "I've got ^0000ffNumber 5^000000.";
-				emotion 62;
-				next;
-			}
-			else if (.@tree_dice01 == 6) {
-				mes "[Ghost Tree]";
-				mes "I've got ^0000ffNumber 6^000000.";
-				emotion 63;
-				next;
-			}
+			setarray .@emo[1], 58,59,60,61,62,63;
+			mes "[Ghost Tree]";
+			mes "I've got ^0000ffNumber "+.@tree_dice01+"^000000.";
+			emotion .@emo[.@tree_dice01];
+			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "Ok, it is my turn?";
 			next;
@@ -16431,61 +11775,10 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 			mes "["+ strcharinfo(0) +"]";
 			mes "Let's see...";
 			next;
-			if (.@rus_dice01 == 1) {
-				emotion 58,1;
-				mes "["+ strcharinfo(0) +"]";
-				if (.@rus_dice01 == .@tree_dice01) {
-					mes "Let's see... Wow, I got it! I've got ^0000ffNumber 1^000000!";
-				}else{
-					mes "Let's see................... It is ^0000ff 1 ^000000...";
-				}
-			}
-			else if (.@rus_dice01 == 2) {
-				emotion 59,1;
-				mes "["+ strcharinfo(0) +"]";
-				if (.@rus_dice01 == .@tree_dice01) {
-					mes "Let's see... Wow, I got it! I've got ^0000ffNumber 2^000000!";
-				}else{
-					mes "Let's see................... It is ^0000ff 2 ^000000...";
-				}
-			}
-			else if (.@rus_dice01 == 3) {
-				emotion 60,1;
-				mes "["+ strcharinfo(0) +"]";
-				if (.@rus_dice01 == .@tree_dice01) {
-					mes "Let's see... Wow, I got it! I've got ^0000ffNumber 3^000000!";
-				}else{
-					mes "Let's see................... It is ^0000ff 3 ^000000...";
-				}
-			}
-			else if (.@rus_dice01 == 4) {
-				emotion 61,1;
-				mes "["+ strcharinfo(0) +"]";
-				if (.@rus_dice01 == .@tree_dice01) {
-					mes "Let's see... Wow, I got it! I've got ^0000ffNumber 4^000000!";
-				}else{
-					mes "Let's see................... It is ^0000ff 4 ^000000...";
-				}
-			}
-			else if (.@rus_dice01 == 5) {
-				emotion 62,1;
-				mes "["+ strcharinfo(0) +"]";
-				if (.@rus_dice01 == .@tree_dice01) {
-					mes "Let's see... Wow, I got it! I've got ^0000ffNumber 5^000000!";
-				}else{
-					mes "Let's see................... It is ^0000ff 5 ^000000...";
-				}
-			}
-			else if (.@rus_dice01 == 6) {
-				emotion 63,1;
-				mes "["+ strcharinfo(0) +"]";
-				if (.@rus_dice01 == .@tree_dice01) {
-					mes "Let's see... Wow, I got it! I've got ^0000ffNumber 6^000000!";
-				}else{
-					mes "Let's see................... It is ^0000ff 6 ^000000...";
-				}
-			}
+			emotion .@emo[.@rus_dice01],1;
+			mes "["+ strcharinfo(0) +"]";
 			if (.@rus_dice01 == .@tree_dice01) {
+				mes "Let's see... Wow, I got it! I've got ^0000ffNumber "+.@rus_dice01+"^000000!";
 				emotion 0;
 				next;
 				mes "[Ghost Tree]";
@@ -16493,7 +11786,8 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 				set .@rustree_turn01,.@rustree_turn01+1;
 				set .@rususer_score01,.@rususer_score01+1;
 				next;
-			}else{
+			} else {
+				mes "Let's see................... It is ^0000ff "+.@rus_dice01+" ^000000...";
 				mes "[Ghost Tree]";
 				mes "Huuu...";
 				emotion 18;
@@ -16501,7 +11795,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 				next;
 			}
 		}
-		if (.@rususer_score01 > 0) {
+		if (.@rususer_score01) {
 			mes "[Ghost Tree]";
 			mes "Ah. I lost, but it was fun.";
 			next;
@@ -16514,24 +11808,20 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 			mes "- ^0000ff You receive the best broom from Payon !!^000000 - ";
 			set rhea_rus_main,46;
 			close;
-		}else{
-			mes "[Ghost Tree]";
-			mes "Kuhuhu, nobody is worse than you. Remember that you have to win over me to get what you want";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "I was not what I am! Let's do it again!";
-			next;
-			mes "[Ghost Tree]";
-			mes "Ok, let's play again. If prepared, try again?";
-			close;
 		}
-	}
-	else if (rhea_rus_main == 46) {
+		mes "[Ghost Tree]";
+		mes "Kuhuhu, nobody is worse than you. Remember that you have to win over me to get what you want";
+		next;
+		mes "["+ strcharinfo(0) +"]";
+		mes "I was not what I am! Let's do it again!";
+		next;
+		mes "[Ghost Tree]";
+		mes "Ok, let's play again. If prepared, try again?";
+		close;
+	} else if (rhea_rus_main == 46) {
 		mes "[Ghost Tree]";
 		mes "Kuhuhu, I can say that you are fun. If possible, play with me again.";
 		close;
 	}
-	else {
-		end;
-	}
-}
+	end;
+}
\ No newline at end of file