Updated Amatsu NPCs, Quests, and Warps.

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

7 files changed, 2515 insertions, 2009 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index adf3da992..d48eb4734 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2007/12/11
+	* Rev. 11886 Updated Amatsu NPCs, Quests, and Warps. [L0ne_W0lf]
 2007/12/09
 	* Fixed a bug in r11633 always spawning only 1 chest type [ultramage]
 2007/12/08
@@ -18,7 +20,7 @@ Date		Added
 	* Corrected some broken warp points. (bugreport:497) [Samuray22]
 	* Corrected a bug on Sample Dynamic Shop. (bugreport:421) [Samuray22]
 2007/11/26
-	& Rev. 11815 Fixed a bad warp in ice dungeon. [L0ne_W0lf]
+	* Rev. 11815 Fixed a bad warp in ice dungeon. [L0ne_W0lf]
 	* Rev. 11814 Updated the Soul Linker job quest. [L0ne_W0lf]
 	* Rev. 11813 Updated the Taekwon Master quest. [L0ne_W0lf]
 	* Rev. 11811 Fixed some minor guild script related bugs. [L0ne_W0lf]
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index d1b3fad59..b6fd867fb 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -3,113 +3,85 @@
 //===== By: ================================================== 
 //= Some people & eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= Any eAthena Version; Niflheim Required
 //===== Description: ========================================= 
-//= Amatsu Town NPCs : Revision 2 (Fox quest fix)
-//= Translated by Makenshi and dj
-//= Revisions and edits by Valaris and Darkchild
-//= 1.01 event_sushi -> ama_sushi fixed
-//=      and other fixes, thanks to Shinomori
-//= 1.02 Fixed & Spell Checked [massdriller]
-//= 1.03 Fixed 2 NPC names, slight optimization [Lupus]
-//= 1.04 Fixed a few typos [Nexon]
-//= 1.05 Changed all breaks to ends. [Skotlex]
-//= 1.06 The Captain now uses iRO dialog [MasterOfMuppets]
-//= 1.07 Implemented a missing NPC [MasterOfMuppets]
-//= 1.08 Removed Duplicates [Silent]
-//= 1.1 Split quests into quests/quests_amatsu.txt [Evera]
-//= 1.2	Fixed missing name [Evera]
-//=====================================================================
-alberta,245,93,4	script	Sea Captain#01	709,{
+//= 1.3 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
+//=	Moved elemental stone trader to 'elemental_trader.txt'
+//============================================================
+
+// Amatsu Transportation
+//=====================================================
+alberta,245,93,3	script	Sea Captain#ama1	709,{
 	mes "[Walter Moers]";
 	mes "Hey, there.";
 	mes "Have you ever heard that there";
 	mes "are totally different countries";
 	mes "than the Rune-Midgard Kingdom?";
 	next;
-	menu "About Amatsu...",L1,"Go to Amatsu",L2,"Cancel",-;
-		mes "[Walter Moers]";
-		mes "If you are tired of your daily";
-		mes "life, take a trip to a distant";
-		mes "country across the ocean.";
-		mes "Someplace like, oh I don't know,";
-		mes "Amatsu~";
-		close;
-	L1:
+	switch(select("About Amatsu...:Go to Amatsu:Cancel")) {
+	case 1:
 		mes "[Walter Moers]";
 		mes "I heard that a drifting ship";
-		mes "accidently discovered it...";
+		mes "accidentally discovered it...";
 		mes "The ship was totally destroyed";
 		mes "by a raging storm in heavy fog.";
+		mes " ";
 		next;
 		mes "[Walter Moers]";
 		mes "Anyway, the ship was wrecked";
 		mes "on the beach. It was there";
-		mes "he arrived at a town called";
-		mes "Amatsu.";
+		mes "he arrived at a town called Amatsu.";
 		next;
 		mes "[Walter Moers]";
 		mes "The towners took pity on him";
-		mes "and took care of this wounds.";
-		mes "He lived there until he finished";
-		mes "making a map.";
+		mes "and took care of his wounds.";
+		mes "He lived there until he finished making a map.";
 		next;
 		mes "[Walter Moers]";
 		mes "He passed away when he returned";
 		mes "to Rune-Midgard. Fortunately,";
-		mes "the map was given to our king,";
-		mes "Tristan III";
+		mes "the map was given to our king, Tristan III.";
 		next;
 		mes "[Walter Moers]";
 		mes "King Tristan III announced";
 		mes "that he would reward any";
-		mes "person brave enough to venture to";
-		mes "Amatsu, and spread copies of this";
-		mes "map.";
+		mes "person brave enough to venture to Amatsu, and spread copies of this map.";
 		next;
 		mes "[Walter Moers]";
-		mes "Many Brave and adventurous";
+		mes "Many brave and adventurous";
 		mes "sea captains took the";
 		mes "challenge. Great fortune could";
-		mes "be made in trade with Amatsu, as";
-		mes "well as the rewards from King";
-		mes "Tristan III";
+		mes "be made in trade with Amatsu, as well as the rewards from King Tristan III...";
 		next;
 		mes "[Walter Moers]";
 		mes "However, they all failed!";
 		mes "To overcome various currents";
 		mes "and bad weather, lots of";
-		mes "experience is required. But they";
-		mes "were all blinded by their greed...";
+		mes "experience is required. But they were all blinded by their greed...";
 		next;
 		mes "[Walter Moers]";
 		mes "Finally, a great man discovered";
 		mes "the perfect sealane to Amatsu...";
 		mes "Right! That is me. Sir Walter";
-		mes "Moers. I started the trade with";
-		mes "Amatsu! Hahaha! Well, that's all";
-		mes "about Amatsu.";
+		mes "Moers. I started the trade with Amatsu! Hahaha! Well, that's all about Amatsu.";
 		next;
 		mes "[Walter Moers]";
 		mes "I made good money from trades";
 		mes "for years, and now I'm interested";
-		mes "in tourism. If you want to go to";
-		mes "Amatsu, let me know~!";
+		mes "in tourism. If you want to go to Amatsu, let me know~!";
 		close;
-	L2:
+	case 2:
 		mes "[Walter Moers]";
 		mes "Oh yeah? It's a long way to";
 		mes "Amatsu. That's why we are";
-		mes "charging a fare. You don't think";
-		mes "that crossing oceans and currents";
-		mes "is easy, do you?";
+		mes "charging a fare. You don't think that crossing oceans and currents is easy, do you?";
 		next;
 		mes "[Walter Moers]";
 		mes "10,000 zeny for a round-trip! I've";
 		mes "got a stately room in a sturdy and";
-		mes "safe trade ship for you. It is a";
+		mes "safe trade ship for you. It is a ";
 		mes "reasonable fare when you consider";
 		mes "that this isn't a one way trip.";
 		next;
@@ -117,45 +89,45 @@ alberta,245,93,4	script	Sea Captain#01	709,{
 		mes "Shall we go now? You didn't forget";
 		mes "the fare, right? Let's go.";
 		next;
-		menu "Yes",Lgo,"No",-;
-			mes "[Walter Moers]";
-			mes "If you are an adventurer,";
-			mes "this is a great chance";
-			mes "to experience a different";
-			mes "culture...Well, it is up to you.";
-			close;
-		Lgo:
-			if (Zeny < 10000) {
+		if (select("All Aboard!:Cancel") == 1) {
+			if (Zeny > 9999) {
 				mes "[Walter Moers]";
-				mes "Did you forget what I said?";
-				mes "10,000 zeny. If you can't come up with enough zeny,";
-				mes "hunt around the Sunken Ship,";
-				mes "and hope for some luck hunting treasure...";
-				mes "and get enough zeny";
-				close;
+				mes "Alright, I will start the engine!";
+				close2;
+				set zeny,zeny-10000;
+				warp "amatsu",197,83;
+				end;
 			}
-			set Zeny, Zeny-10000;
 			mes "[Walter Moers]";
-			mes "Alright, I will start the engine!";
-			close2;
-			warp "amatsu",197,83;
-			end;		
+			mes "Were you even listening to me?";
+			mes "10,000 zeny. If you got";
+			mes "nothing, find some treasure";
+			mes "somewhere, like in a wrecked ship...Show me the money!";
+			close;
+		}
+		mes "[Walter Moers]";
+		mes "If you are an adventurer,";
+		mes "this is a great chance";
+		mes "to experience a different culture...Well, it is up to you.";
+		close;
+	case 3:
+		mes "[Walter Moers]";
+		mes "If you are tired of your daily";
+		mes "life, take a trip to a distant";
+		mes "country across the ocean.";
+		mes "Someplace like, oh I don't know, Amatsu~";
+		close;
+	}
 }
-//=====================================================================
-amatsu,194,79,4	script	Sea Captain#02	709,{
+
+amatsu,194,79,5	script	Sea Captain#ama2	709,{
 	mes "[Walter Moers]";
 	mes "You came... Did you enjoy";
 	mes "your trip to Amatsu...?";
 	mes "Alright, I will take you";
 	mes "back to Alberta.";
 	next;
-	menu "Back to Alberta",L1,"Cancel",-;
-		mes "[Walter Moers]";
-		mes "Well, take your time.";
-		mes "The ship to Alberta is";
-		mes "always ready to depart...";
-		close;
-	L1:
+	if (select("Back to Alberta:Cancel") == 1) {
 		mes "[Walter Moers]";
 		mes "Let's go then. You must have";
 		mes "so many things to talk about,";
@@ -163,765 +135,465 @@ amatsu,194,79,4	script	Sea Captain#02	709,{
 		close2;
 		warp "alberta",243,91;
 		end;
+	}
+	mes "[Walter Moers]";
+	mes "Well, take your time.";
+	mes "The ship to Alberta is";
+	mes "always ready to depart...";
+	close;
+}
+
+// Generic Amatsu NPCs
+//=====================================================
+amatsu,230,160,3	script	Well-side Maiden#ama	757,{
+	mes "[Yuuko]";
+	mes "I usually come to this well to";
+	mes "draw water, but never when it's";
+	mes "foggy or rainy. For some reason";
+	mes "whenever the weather is a";
+	mes "certain way, I feel like...";
+	next;
+	mes "[Yuuko]";
+	mes "...someone...or some thing is";
+	mes "struggling to crawl out from";
+	mes "the bottom of this well...";
+	mes "It really gives me the creeps.";
+	close;
 }
-//=====================================================================
-// Amatsu Citizen
-//=====================================================================
-amatsu,179,107,4	script	John	86,{
+	
+amatsu,179,107,4	script	John#ama	86,{
 	mes "[John]";
-	mes "Hey.";
-	mes "You seem like me,";
-	mes "not a native of Amatsu";
+	mes "Yo~";
+	mes "You're not from around here.";
+	mes "Heh, another outsider.";
+	mes "Just like me...";
 	next;
 	mes "[John]";
-	mes "I have been here";
-	mes "doing business for almost 5 years";
+	mes "It's been five long years";
+	mes "since I've started doing";
+	mes "business here...";
 	next;
-	mes "Even during the first time ";
-	mes "the kingdom of Rune-Midgard";
-	mes "traded with Amatsu.";
-	mes "I thought of the 'Lucky Bum'!";
+	mes "[John]";
+	mes "Af first, I thought, 'What";
+	mes "a great chance!' when the";
+	mes "trade between the Rune-Midgard";
+	mes "Kingdom and Amatsu started.";
 	next;
 	mes "[John]";
-	mes "I want to start something";
-	mes "unique that the others won't do.";
+	mes "I wanted to do something great";
+	mes "and make the most of this";
+	mes "new opportunity.";
 	next;
 	mes "[John]";
-	mes "So I decided";
-	mes "to come to Amatsu";
-	mes "and learn how to make the food here,";
-	mes "then return home";
-	mes "so everyone can enjoy the exotic food.";
+	mes "And so, I decided to go to";
+	mes "Amatsu so I could learn to make";
+	mes "Amatsu cuisine. Then, I could";
+	mes "return to my hometown and make";
+	mes "this exotic food for everyone.";
 	next;
 	mes "[John]";
-	mes "But in the end";
-	mes "I became attached to this place.";
-	mes "Even after 5 years";
-	mes "I am still here";
+	mes "But, I fell in love with Amatsu";
+	mes "and I ended up sticking around";
+	mes "here for the last five years.";
+	mes "During all that time, I've";
+	mes "been learning Amatsu cuisine,";
 	next;
 	mes "[John]";
-	mes "Anyhow, from then on I just stayed here.";
-	mes "Just chat and gossip with the villagers,";
-	mes "and relax";
+	mes "and cooking these dishes for";
+	mes "the towners, and enjoying myself";
+	mes "by talking to the locals,";
+	mes "transfixed in this very spot.";
 	next;
 	mes "[John]";
-	mes "Some time ago a famous sushi chef";
-	mes "lived across the street, and ever since";
-	mes "I have only seen flies around my place.";
+	mes "But recently, across the street,";
+	mes "the Sushi Master opened his shop.";
+	mes "...";
+	mes "Now, my only customers are flies.";
 	next;
 	mes "[John]";
-	mes "In this life, my happiness in life";
-	mes "has been found here already.";
-	mes "Now it seems like it is about to end as well.";
+	mes "I was hoping to fulfill my";
+	mes "dream of becoming a renowned chef";
+	mes "in Amatsu, but...";
+	mes "I guess it's over...";
 	close;
 }
-//=====================================================================
-amatsu,185,116,4	script	Drunken Man	765,{
-	mes "[Ralph]";
-	mes "Cough. I'm old and useless.";
-	mes "Only brute strength. Cough.";
-	mes "This time I really cough won't go back home. Cough.";
-	next;
-	menu "Please stop drinking and go home.",L1,"Let's get wasted!",L2;
-L2:
-	mes "[Ralph]";
-	mes "Hahaha! A good young man.";
-	mes "Cough, but but, cough";
-	mes "I can't give you my drink, cough.";
-	next;
-	mes "[Ralph]";
-	mes "If you want to buy me a drink, I'll think about it.";
-	mes "Haha! Cough.";
-	close;
-L1:
-	mes "[Ralph]";
-	mes "What?!";
-	mes "You want me to be like my wife, to be beaten by iron fists?";
-	mes "Cough. You won't know it until you see it";
-	mes "When she was young,";
-	mes "she wrestled and caught tigers.";
-	next;
-	mes "[Ralph]";
-	mes "I was in Co..Comudo whatever town it was.";
-	mes "I just lost a little, and he";
-	mes "beat me up like that. Cough.";
-	next;
-	mes "[Ralph]";
-	mes "Lacking life.";
-	mes "What the hell are zeny??";
-	mes "Cough.. Cough..";
-	mes "...........................";
-	mes "........Cough..............";
-	close;
-}
-//=====================================================================
-amatsu,217,179,0	script	Old Women	760,{
-	mes "[Hashey]";
-	mes "My husband is so into gambling, it worries me to death.";
-	mes "Went to that town that's really far away, lost a lot of zeny again.";
-	mes "Come back..";
-	next;
-	mes "[Hahsey]";
-	mes "Because I was angry, I got irrational again.";
-	mes "Don't know if he's drinking at home again.";
-	mes "What a miser.. sobs.";
-	close;
-}
-//=====================================================================
-amatsu,205,163,4	script	Mimi	759,{
+	
+amatsu,205,163,3	script	Mimi#ama	759,{
 	mes "[Mimi]";
-	mes "Phew..";
-	mes "Did you see the Ms. Amatsu besides the dock?";
-	mes "Very pretty, no?";
+	mes "Puhuhu~!";
+	mes "Did you see Miss Amatsu near";
+	mes "the Harbor? Isn't she";
+	mes "preeeetty?";
 	next;
 	mes "[Mimi]";
-	mes "When I grow up I also want to enter the competition.";
+	mes "I'm going to enter the Miss";
+	mes "Amatsu Contest when I'm older.";
 	next;
 	mes "[Mimi]";
-	mes "Although I look like this, I am still the most beautiful woman in town..";
-	mes "Women always need to watch their appearance, whoohoohoohooo.";
-	close;
-}
-//=====================================================================
-amatsu,230,160,4	script	Lady	757,{
-	mes "[Yoruko]";
-	mes "Although I come to the well for water everyday,";
-	mes "if it's misty or rainy,";
-	mes "I will not come out here.";
-	next;
-	mes "[Yoruko]";
-	mes "Seems like deep within the well,";
-	mes "someone is trying to";
-	mes "climb up on the wall of the well.";
-	mes "It gives me goosebumps.";
-	close;
-}
-//=====================================================================
-amatsu,119,164,4	script	Guard Soldier#03	767,{
-	mes "[Guard Soldier]";
-	mes "Are you from Rune-Midgard?";
-	mes "Welcome to the town of Amatsu.";
-	mes "After entering the city,";
-	mes "please pay a visit to the Master of Amatsu";
-	mes "before leaving!";
-	next;
-	mes "[Guard Soldier]";
-	mes "He is a really great guy.";
-	mes "He did a lot of investments for the town";
-	mes "from all over the other continents.";
-	mes "He handles all sorts of things.";
-	close;
-}
-//=====================================================================
-amatsu,112,164,4	script	Guard Soldier#04	767,{
-	mes "[Guard Soldier]";
-	mes "This is the best castle in Amatsu,";
-	mes "called the East Lake Castle.";
-	mes "Normally people are not permitted";
-	mes "to come in and out.";
-	next;
-	mes "[Guard Soldier]";
-	mes "From your clothes, it looks like you are from another continent.";
-	mes "In the past, the Master specifically";
-	mes "permitted the travelers to come in and out.";
-	mes "Now you may go in.";
-	close;
-}
-
-//=====================================================================
-ama_in02,207,40,6	script	Guard Soldier#05	767,{
-	mes "[Guard Soldier]";
-	mes "Welcome,";
-	mes "The Master specifically allowed";
-	mes "the guests from the continent to enter and leave.";
-	next;
-	mes "[Guard Soldier]";
-	mes "When you are have visited everywhere, please rest here";
-	mes "before leaving.";
-	close;
-}
-//=====================================================================
-ama_in02,207,49,6	script	Guard Soldier#06	767,{
-	mes "[Guard Soldier]";
-	mes "The master is really a great guy.";
-	mes "Who would have thought that anyone could";
-	mes "turn this small town into what it is today?";
-	next;
-	mes "[Guard Soldier]";
-	mes "He even accepted worthless trash like me.";
-	mes "I am really grateful.";
-	mes "But I don't know what has happened recently.";
-	mes "His expressions";
-	mes "look different from before.";
-	close;
-}
-//=====================================================================
-ama_in02,187,57,2	script	Soldier#01	767,{
-	mes "[Ichiro]";
-	mes "Welcome, our master";
-	mes "has already prepared a place";
-	mes "for the guests to retire in.";
-	next;
-	mes "[Ichiro]";
-	mes "If you have any needs,";
-	mes "please contact us, and ";
-	mes "just thank our master later.";
-	mes "All of these preparations";
-	mes "were ordered by the Master.";
-	close;
-}
-//=====================================================================
-ama_in02,37,157,4	script	Soldier#03	767,{
-	mes "[Sbarro]";
-	mes "This is our soldier's";
-	mes "training ground.";
-	mes "Feel free to take a look around...";
-	next;
-	mes "[Sbarro]";
-	mes "But recently there's a strange atmosphere.";
-	mes "The solders aren't as lively as before.";
-	mes "How to describe it? Also seem depressed.";
-	mes "And some soldiers have gone missing...";
-	mes "Maybe they moved to other continents.";
-	next;
-	mes "[Sbarro]";
-	mes "And I also frequently see strange people.";
-	mes "I've heard that the customers upstairs are";
-	mes "from far away, but because of their";
-	mes "auspicious behaviors.  I already command the soldiers";
-	mes "to monitor their movements...";
-	next;
-	mes "[Sbarro]";
-	mes "Of course, the master must have his own thoughts";
-	mes "and base his decisions on those.";
-	mes "Haha, it seems like I'm speaking too much.";
-	mes "See you later...";
-	close;
-}
-//=====================================================================
-ama_in02,32,51,6	script	Shiro	767,{
-	mes "[Shiro]";
-	mes "Cough cough, cough cough, what... leave me alone";
-	mes "Go visit another place...";
-	mes "Cough cough, cough cough... ouch, my throat";
-	next;
-	mes "[Shiro]";
-	mes "That fraud doctor's medicine";
-	mes "did not work at all!";
-	mes "Shouldn't trust those people from the continent...";
-	mes "Cough cough, cough cough...";
-	next;
-	mes "[Shiro]";
-	mes "What the hell?!? My body is getting weaker and weaker...";
-	mes "No energy at all... Is";
-	mes "a flu really this bad?";
-	mes "Cough cough... cough cough...";
-	close;
-}
-//=====================================================================
-ama_in02,40,167,3	script	Soldier#04	767,{
-	mes "[Kuro]";
-	mes "Shh... customer, please be quiet.";
-	mes "I will tell you a story";
-	next;
-	mes "[Kuro]";
-	mes "In Amatsu there is this rumor.";
-	mes "The truth is the current master";
-	mes "is not the real master of the town... shh, quiet!";
-	mes "Don't panic, please continue to listen.";
-	next;
-	mes "[Kuro]";
-	mes "Behind this benign Master,";
-	mes "there is a real master,";
-	mes "scheming all kinds of plots,";
-	mes "using the current master as a puppet,";
-	mes "hidden in some corner";
-	mes "controlling everything that happens in the town.";
-	next;
-	mes "[KurO]";
-	mes "Doubt me?,";
-	mes "It's real! I saw it,";
-	mes "the other master's face";
-	mes "watching the town across";
-	mes "the river with an evil smile!!";
-	mes "But what I have said today";
-	mes "is a secret, ok?";
-	close;
-}
-//=====================================================================
-ama_in02,32,167,5	script	Kukuro	767,{
-	mes "[Kukuro]";
-	mes "That guy is always rambling";
-	mes "some gibberish, saying that our master";
-	mes "might be a farce.";
-	mes "Not funny at all";
-	next;
-	mes "[Kukuro]";
-	mes "Although, it is true";
-	mes "that some strange";
-	mes "events happened recently,";
-	mes "right now the interior of";
-	mes "the castle is still off limits...";
-	next;
-	mes "[Kukuro]";
-	mes "Occasionally you can also hear";
-	mes "a really scary sound. I don't know";
-	mes "what's wrong with his mother,";
-	mes "and many doctors have already visited.";
-	mes "Doesn't seem to be much hope...";
-	close;
-}
-//=====================================================================
-ama_in02,42,34,2	script	Soldier#05	767,{
-	mes "[Hakiro]";
-	mes "Rest for a while before leaving,";
-	mes "master has already prepared";
-	mes "a few empty room for the visitors.";
-	next;
-	mes "[Hakiro]";
-	mes "If there are any questions,";
-	mes "come to me at any time.";
-	mes "And, please do not disturb";
-	mes "the other visitors...";
-	next;
-	mes "[Hakiro]";
-	mes "Then, good day to you";
-	close;
-}
-
-//=====================================================================
-ama_in02,203,156,4	script	Soldier#06	767,{
-	mes "[Hakiro]";
-	mes "Master is in there.";
-	mes "If you want to go greet him,";
-	mes "silently walk in and talk to him";
-	next;
-	mes "[Hakiro]";
-	mes "Master is not in a good mood right now.";
-	mes "Don't do or say anything insulting.";
-	mes "Normally, he will happily see visitors.";
-	mes "Don't know what happened today.....";
-	close;
-}
-
-//=====================================================================
-ama_in02,195,156,4	script	Soldier#07	767,{
-	mes "[Kuro]";
-	mes "Damn, maybe the master";
-	mes "is having a hard time right now.";
-	mes "Usually he's a very nice guy...";
-	next;
-	mes "[Kuro]";
-	mes "There are strange rumors going around,";
-	mes "but I still trust my master,";
-	mes "because he was the one who";
-	mes "transformed our town. So I became";
-	mes "a soldier to serve him";
+	mes "I'm sure that I'm the prettiest";
+	mes "in this town but...";
+	mes "A lady can always use a little more makeup.";
 	close;
 }
-
-ama_in01,169,173,0	script	Miko	769,{
-	mes "[Tokari]";
-	mes "I'm not a real shrine maiden."; 
-	mes "my friend, Takikuwi told me to try on";
-	mes "this cloth... and he brought me";
-	mes "to this shrine";
-	next;
-	mes "[Tokari]";
-	mes "Although he asks for weird shit sometimes";
-	mes "he is still a funny friend!";
-	mes "Sometimes I don't know what he's thinking";
-	mes "but He is still a good friend";
-	next;
-	mes "[Tokari]";
-	mes "If you have any questions";
-	mes "go ask Takihuwi first";
-	mes "even stuff that now one knows";
-	mes "no matter how weird or strange";
-	mes "He knows... He always does!";
+	
+amatsu,185,115,3	script	Drunken Man#ama	765,{
+	mes "[Kosake]";
+	mes "*Hiccup*...My wife is just like,";
+	mes "...like a man...*Hiccup*...";
+	mes "I'm going to really...*Hiccup*...not go home this time...Hiccup";
+	next;
+	if (select("Stop drinking and go home:Let's drink together") == 1) {
+		mes "[Kosake]";
+		mes "What?! Do you want me to get";
+		mes "hit by my wife's big fist?";
+		mes "That's right! I said 'big fist!'";
+		next;
+		mes "[Kosake]";
+		mes "Sad to say, I married a woman";
+		mes "with man hands...";
+		mes "Big, strong hands that can kill a tiger.";
+		next;
+		mes "[Druken Man]";
+		mes "It was in Ko...Koko-something";
+		mes "town. She hit me because I";
+		mes "lost some money...*Hiccup*";
+		next;
+		mes "[Druken Man]";
+		mes "Life~~ is~~ nothing~~~";
+		mes "What is zeny~~~~ ";
+		mes "*Hiccup*...... *Hiccup*.......";
+		mes ".......................";
+		mes "........Z.z..z...zzz...";
+		close;
+	}
+	mes "[Kosake]";
+	mes "Heh heh... nice lad...";
+	mes "But you know *Hiccup*";
+	mes "I can't give you any of mine! Heheheh...";
+	next;
+	mes "[Kosake]";
+	mes "If you buy me a drink, I will think about it...Hehehe...*Hiccup*..";
 	close;
 }
-
-amatsu,269,221,1	script	Proposing Girl	758,{
-	mes "[Hutari Sioko]";
-	mes "Nice to meet you";
-	mes "my name is Hutari Sioko,";
-	mes "my hobby is listening to music,";
-	mes "and I usually listen to classical music";
-	next;
-	mes "[Hutari Sioko]";
-	mes "There is a legend";
-	mes "about the large hill in our town";
-	mes "do you know anything about it?";
-	next;
-	mes "[Hutari Sioko]";
-	mes "According to the legend, if you propose";
-	mes "to your lover under that tree";
-	mes "the couple will live happily ever forever";
-	next;
-	mes "[Hutari Sioko]";
-	mes "But the proposal cannot be done on any time";
-	mes "it has to be on the Saturday Night.";
-	mes "or else it won't hold true";
-	next;
-	mes "[Hutari Sioko]";
-	mes "Furthermore, the proposal has to be answered";
-	mes "prior to Sunday night after";
-	next;
-	emotion e_lv;
-	mes "[Hutari Sioko]";
-	mes "If you have a secret admirer...";
-	mes "why not meet under that tree";
-	mes "and propose?";
-	mes "I bet something good will happen";
+	
+amatsu,217,179,1	script	Grandma#ama	760,{
+	mes "[Hatsue]";
+	mes "I'm worried about my husband.";
+	mes "He lost a lot of money in some distant town today.";
+	next;
+	mes "[Hatsue]";
+	mes "I got so mad at him, he ran off in";
+	mes "fear! I'm worried...what if he";
+	mes "went to the bar and starts drinking again? The man just doesn't have any backbone. *Phew*";
 	close;
 }
-
-amatsu,287,266,3	script	Jyaburo	766,{
+	
+amatsu,287,266,3	script	Jyaburo#ama	766,{
 	mes "[Jyaburo]";
-	mes "This is a special place";
-	mes "for my wife and me";
+	mes "This place is special to me.";
+	mes "It's filled with memories of my wife.";
 	next;
 	mes "[Jyaburo]";
-	mes "..When I was here proposing";
-	mes "to her here under the tree..";
-	mes "I didn't know that she";
-	mes "liked me as well";
+	mes "It was under that big tree where";
+	mes "I first told her I loved her. At";
+	mes "the time, I really didn't know that she also had feelings for me.";
 	next;
 	mes "[Jyaburo]";
-	mes "After that, we talked a lot here under this tree,";
-	mes "this is the ideal location";
-	mes "because of its tranquility and harmony,";
-	mes "an everlasting moment of happiness";
+	mes "After that day, we had many";
+	mes "conversations here. Quiet";
+	mes "and peaceful, this was our";
+	mes "favorite place to be together.";
 	next;
 	mes "[Jyaburo]";
-	mes "Even now, when I close my eye, I can clearly remember";
-	mes "the sweet memories of the past";
-	mes "as if it happened yesterday...";
+	mes "When I close my eyes here, I";
+	mes "can picture our good times,";
+	mes "and it feels like it all happened yesterday.";
+	mes "...";
 	next;
 	mes "[Jyaburo]";
-	mes "Even though she passed away some times ago";
-	mes " I always come here alone now,";
-	mes "Every time I come here it is as if my wife is just besides me,";
-	mes "And my depressed and broken heart is gone";
+	mes "My wife passed away...";
+	mes "So now I only come here by";
+	mes "myself...But I feel like I'm with her whenever I'm here.";
 	next;
 	mes "[Jyaburo]";
-	mes "After hearing my rambling,";
-	mes "Can you think of anyone?";
-	mes "If you can, stop the hesitation and the delay,";
-	mes "And love her with all your heart";
-	next;
-	mes "[Jyakuro]";
-	mes "What does it mean to be human?";
-	mes "Smile, and live your life to the fullest";
-	mes "Even though life might be sure,";
-	mes "Forget the worries and pains";
-	mes "Always try to live a happy life";
+	mes "Do you have anyone that you";
+	mes "think about? If you have a";
+	mes "special someone, don't hesitate";
+	mes "or hold back. Be sure to treat";
+	mes "that person specially.";
+	next;
+	mes "[Jyaburo]";
+	mes "Human beings live such short";
+	mes "lives. But we're able to laugh";
+	mes "throughout life and forget the";
+	mes "sadness.";
+	mes "...Always be happy.";
 	close;
 }
 
-amatsu,274,178,0	script	Vet	735,{
-	mes "[Sakura Seiichi]";
-	mes "Oww... I'm not a suspicious guy,";
-	mes "please don't be surprised, I am just";
-	mes "A regular vet,";
-	mes "making a living but";
-	mes "curing sick animals";
+// Legendary Tree
+//=====================================================
+amatsu,269,221,1	script	Propose Girl#ama	758,{
+	set jap_tree,1;
+	mes "[Hutari Shioko]";
+	mes "It is a pleasure to meet you.";
+	mes "My name is Hutari Shioko.";
+	mes "My hobby is listening to music.";
+	mes "I'm an avid fan of classical music.";
+	next;
+	mes "[Hutari Shioko]";
+	mes "There is an old story about";
+	mes "the hill in our town.";
+	mes "Have you heard this story before?";
+	next;
+	mes "[Hutari Shioko]";
+	mes "It is said that if you propose";
+	mes "under that tree, you and your";
+	mes "lover will live a happy life for all eternity.";
+	next;
+	mes "[Hutari Shioko]";
+	mes "However, the proposal can not be";
+	mes "done at any given time. The legend states that it can only be done on Saturday evenings.";
+	next;
+	mes "[Hutari Shioko]";
+	mes "After the proposal, the reply must";
+	mes "be answered before Sunday evening. This is the most crucial part of it.";
+	next;
+	emotion e_lv2;
+	mes "[Hutari Shioko]";
+	mes "If you like someone...";
+	mes "You should try proposing";
+	mes "under that tree. I'm sure ";
+	mes "happy things will happen, if you do.";
+	close;
+}
+	
+amatsu,243,202,3	script	Drama Teacher#ama	760,{
+	set jap_tree,2;
+	mes "[Garakame sensei]";
+	mes "This is a beautiful place";
+	mes "with everlasting cherry blossoms.";
+	mes "Also, this town is the origin of";
+	mes "legendary play, 'White Dryad.' ";
+	next;
+	if (Sex) {
+		mes "[Garakame sensei]";
+		mes "If you know a girl who is";
+		mes "talented in acting, please";
+		mes "bring her to me. I have been";
+		mes "searching for a girl who could";
+		mes "play the role as the 'White Dryad.'";
+		next;
+		mes "[Garakame sensei]";
+		mes "The 'White Dryad' is a nymph of";
+		mes "cherry tree... It has been hard to";
+		mes "find a girl who can perform";
+		mes "as the 'White Drayd...'";
+		close;
+	}
+	emotion e_gasp;
+	mes "[Garakame sensei]";
+	mes "Are you interested in acting?";
+	mes "I need someone who sees";
+	mes "the passion in acting and";
+	mes "can understand my vision.";
+	next;
+	mes "[Garakame sensei]";
+	mes "When you stand on the stage,";
+	mes "you need to become the";
+	mes "character. Your acting needs";
+	mes "to touch the hearts of the";
+	mes "audience and touch their souls.";
+	next;
+	mes "[Garakame sensei]";
+	mes "Everyone's life is like a ";
+	mes "drama, right? Enjoy your life";
+	mes "as what you are and find me";
+	mes "someday when you are ready.";
+	close;
+}
+	
+amatsu,283,203,1	script	Bonubonu#ama1	1323,{
+	end;
+}
+
+amatsu,283,203,1	script	Bonubonu#ama2	111,{
+	set jap_tree,3;
+	emotion e_swt2;
+	mes "[Bonubonu]";
+	mes "That tree on the hill is";
+	mes "a very old tree. It is a big";
+	mes "cherry tree with everlasting blossoms.";
 	next;
-	mes "[Sakura Seiichi]";
-	mes "But... Did you know?";
-	mes "about the sakura tree on the hill";
-	mes "and its story... Maybe this is the";
-	mes "first time you've heard?!";
+	emotion e_swt2;
+	mes "[Bonubonu]";
+	mes "There is something about this";
+	mes "tree that makes me forget about";
+	mes "all the troubles in my life when I sit under it.";
+	next;
+	emotion e_swt2;
+	mes "[Bonubonu]";
+	mes "Everything about this tree is";
+	mes "simply wonderful...";
+	mes "I can't really describe how";
+	mes "I feel when I look at it...";
+	mes "It just leaves me breathless...";
 	next;
+	emotion e_swt2;
+	mes "[Bonubonu]";
+	mes "You should visit the tree and";
+	mes "spend some time there.";
+	mes "It is really a miraculous and gracious tree...";
+	close;
+}
+	
+amatsu,274,178,7	script	Veterinarian#ama	735,{
+	set jap_tree,4;
 	mes "[Sakura Seiichi]";
-	mes "The reason that tree can maintain";
-	mes "its everlasting  youth and beauty";
-	mes "lies within its secret...";
-	mes "that is... Because below the tree";
-	mes "dead people are buried...";
+	mes "Ah... I'm not a weirdo so";
+	mes "don't panic. I'm just an ordinary";
+	mes "veterinarian. My job is curing";
+	mes "sick animals.";
+	mes " ";
 	next;
-	menu "Can buried people feel the pain?",-,"Speaking of bullshit...",L2;
-
 	mes "[Sakura Seiichi]";
-	mes "... Maybe...";
-	mes "Anyway, do you believe me or not";
-	mes "want to make a bet...?";
+	mes "By the way... Do you know?";
+	mes "The story about the cherry tree";
+	mes "on the hill...I guess you haven't heard about it...";
 	next;
-	emotion e_dots;
 	mes "[Sakura Seiichi]";
-	mes "What if I...";
-	mes "............";
-	mes "............";
-	next;
-	mes "^6633FFHer laugh gradually fades^000000";
-	mes "^6633FFAway in the wind,^000000";
-	mes "^6633FFUntil nothing can be heard any more,^000000";
-	mes "^6633FFCannot even remember what^000000";
-	mes "^6633FFHe was about to say...^000000";
-	close;
-L2:
+	mes "That tree has a secret of";
+	mes "keeping its beauty and whiteness.";
+	mes "The secret is...";
+	mes "There are corpses buried under...";
+	mes "that tree...";
+	next;
+	if (select("How horrible!:You have got to be kidding.") == 1) {
+		mes "[Sakura Seiichi]";
+		mes "Kuhuhu... They could be...";
+		mes "By the way, do you want";
+		mes "make a bet on it...?";
+		next;
+		emotion e_dots;
+		mes "[Sakura Seiichi]";
+		mes "If I..........";
+		mes "............";
+		mes ".........";
+		next;
+		mes "^3355FFHis voice was getting lower";
+		mes "and lower as the wind blew.";
+		mes "Finally, I couldn't even hear his voice. I can't even recall what he was trying to tell me...^000000";
+		close;
+	}
 	mes "[Sakura Seiichi]";
-	mes "So entranced, I suppose you are all right...";
-	mes "be careful, one day that kind of things";
-	mes "Will happen to you as well..";
+	mes "I can't help it if you think that way. But one day, you too could be buried underneath...";
 	next;
 	emotion e_dots;
 	mes "[Sakura Seiichi]";
-	mes "Hahaha... Hahahaha.....";
+	mes "Haha... Hahaha.....";
 	mes "...............";
 	mes "...........";
 	next;
-	mes "^6633FFHer laugh gradually fades^000000";
-	mes "^6633FFAway in the wind,^000000";
-	mes "^6633FFUntil nothing can be heard any more,^000000";
-	mes "^6633FFI don't understand why she told^000000";
-	mes "^6633FFMe that...^000000";
+	mes "^3355FFHis laugh was getting lower";
+	mes "and lower as the wind blew.";
+	mes "Finally, I couldn't even hear anything. I can't even recall what he was trying to tell me...^000000";
 	close;
 }
-
-amatsu,283,203,1	script	PokePoke	738,{
-	emotion e_swt2;
-	mes "[Pokepoke]";
-	mes "The tree on this hill";
-	mes "has existed for a long time, a deep-rooted";
-	mes "and ever-blooming Sakura Tree King";
-	next;
-	emotion e_swt2;
-	mes "[Pokepoke]";
-	mes "And I am very thankful of this tree,";
-	mes "whenever I feel any sorrow or sadness";
-	mes "I always go sit under that tree";
-	next;
-	emotion e_swt2;
-	mes "[Pokepoke]";
-	mes "That way no matter what happened";
-	mes "I can forget it all....";
-	mes "this tree will sooth us";
-	mes "and make us forget sad things";
-	mes "a magic tree";
-	next;
-	emotion e_swt2;
-	mes "[Pokepoke]";
-	mes "If you feel any sadness or sorrow";
-	mes "you can try to sit under this tree";
-	mes "a really magical and thankful tree...";
-	close;
-}
-
-amatsu,261,197,4	script	Legendary Sakura Tree	111,{
-	mes "^0000FFJust as she said";
-	mes "this tree is famous because";
-	mes "many couples confessed their love here";
-	mes "Sometimes you can still see a few people";
-	mes "Drawing a heart with the lover's";
-	mes "Name within it.^000000";
-	next;
-	mes "^0000FFThey are not only here for lover's confessions,";
-	mes "sometimes they will meet here too";
-	mes "talk about some important matters,";
-	mes "in such a beautiful place";
-	mes "no matter what they are discussing";
-	mes "they always reach an agreement^000000";
-	close;
-}
-
-ama_in02,61,27,6	script	Alchemist#amatsu	749,{
-	mes "[Laspuchin Gregory]";
-	mes "KeekeekeeKeheheh.";
-	mes "This is amazing!";
-	mes "The results are extraordinary!!";
-	next;
-	mes "[Laspuchin Gregory]";
-	mes "Using my skills in this distant";
-	mes "land was unexpected...";
-	mes "Keheheh... The lord of this";
-	mes "palace was quite accomodating.";
-	next;
-	mes "[Laspuchin Gregory]";
-	mes "Ooops, I better be careful...";
-	mes "If the guild finds out my";
-	mes "location, stupid Myster will";
-	mes "get mad at me. Kehehehkeh...";
-	next;
-	mes "[Laspuchin Gregory]";
-	mes "What? Wanna say something?";
-	mes "If you are here for tourism,";
-	mes "enjoy your day off, then go back to";
-	mes "your hometown. Keekeekee...";
-	mes "Or else, I will let you taste my";
-	mes "bottle...!";
-	next;
-	menu "Please, excuse me",-,"Do you need help?",s_Help;
-
-	mes "[Laspuchin Gregory]";
-	mes "Keheheh... Did you hear";
-	mes "what I said? It would be";
-	mes "better to forget...";
-	mes "Keekeekeekeekee...";
-	close;
-
-s_Help:
-	mes "[Laspuchin Gregory]";
-	mes "Help, eh?...";
-	mes "Now that I think about it..";
-	mes "I need some items right now...";
-	mes "Keeheeheekeehee...";
-	next;
-	mes "[Laspuchin Gregory]";
-	mes "Sir Laspuchin needs some";
-	mes "enchant stones for an experiment.";
-	mes "I will use it efficiently...";
-	mes "Do you have them now?";
-	next;
-	menu "Nope",-,"I got some",s_Got;
-
-	mes "[Laspuchin Gregory]";
-	mes "Then, find 8 stones of one kind.";
-	mes "If you bring 8 of one kind of";
-	mes "enchant stones, I will change it";
-	mes "to a better one...";
-	next;
-	mes "[Laspuchin Gregory]";
-	mes "Then, find 8 stones of one kind.";
-	mes "not the round gemstones but";
-	mes "the enchant stones. If you bring";
-	mes "the wrong stones, I will throw";
-	mes "a flame bottle at you!";
-	next;
-	mes "[Laspuchin Gregory]";
-	mes "Bring me stones, slave~!!";
-	mes "And keep your promise!";
-	mes "Kehehehkehkeh...";
-	close;
-
-s_Got:
-	mes "[Laspuchin Gregory]";
-	mes "Uh-uh, what did you bring?";
-	next;
-	switch( select( "Mystic Frozen:Great Nature:Flame Heart:Rough Wind" ) ){
-		case 1:
-			set @stoneID,995;
-			set @stoneStr$,"Mystic Frozen";
-		break;
-
-		case 2:
-			set @stoneID,997;
-			set @stoneStr$,"Great Nature";
-		break;
-
-		case 3:
-			set @stoneID,994;
-			set @stoneStr$,"Flame Heart";
-		break;
-
-		case 4:
-			set @stoneID,996;
-			set @stoneStr$,"Rough Wind";
-		break;
-
+	
+amatsu,262,197,1	script	Legendary Tree	111,{
+	if (jap_tree == 1) {
+		mes "^3355FFAs she mentioned, this tree";
+		mes "seems to be a famous place";
+		mes "for proposing lovers.";
+		mes "There were several carved symbols";
+		mes "of hearts and initials of lovers";
+		mes "on the bark.^000000";
+		next;
+		mes "^3355FFBesides proposals, people";
+		mes "gather under this tree when";
+		mes "they discuss important";
+		mes "matters. I could listen to";
+		mes "all kinds of stories";
+		mes "in this magnificent place.^000000";
+		close;
 	}
-	if(countitem(@stoneID) < 8){
-		mes "[Laspuchin Gregory]";
-		mes "Keheheh~ Check your pockets";
-		mes "before you tell me";
-		mes "how foolish you are.....";
+	else if (jap_tree == 2) {
+		mes "^3355FFThe legendary play, 'White Dryad'.....";
+		mes "I never heard about that title but";
+		mes "it sounds familiar.";
+		mes "Nymph of cherry tree... What would";
+		mes "be her position in the play?^000000";
 		next;
-		mes "[Laspuchin Gregory]";
-		mes "Bring me stones! You said you";
-		mes "were going to help me!";
-		mes "Keep your promises!";
-		mes "Kehehehkehkeh...";
+		if (Sex) {
+			mes "^3355FFI would like to find";
+			mes "a person who is talented";
+			mes "in acting and help her until";
+			mes "she performs the play. However,";
+			mes "it seems to be easier said than done.^000000";
+			close;
+		}
+		mes "^3355FFI might have talent in";
+		mes "acting which hasn't been discovered yet. I thought, 'If I dress up, I should perform as the 'White Dryad...'^000000";
 		close;
 	}
-	mes "[Laspuchin Gregory]";
-	mes "Kehekeh. I see you brought";
-	mes "enough stones! What kind of";
-	mes "stone do you want me to change";
-	mes "them into? Kehehehe.";
-	next;
-	if(@stoneID == 995)menu "Great Nature",s_Great,"Flame Heart",s_Flame,"Rough Wind",s_Rough;
-	if(@stoneID == 996)menu "Great Nature",s_Great,"Flame Heart",s_Flame,"Mystic Frozen",s_Frozen;
-	if(@stoneID == 997)menu "Mystic Frozen",s_Frozen,"Flame Heart",s_Flame,"Rough Wind",s_Rough;
-	if(@stoneID == 994)menu "Great Nature",s_Great,"Mystic Frozen",s_Frozen,"Rough Wind",s_Rough;
-
-s_Great:
-	mes "[Laspuchin Gregory]";
-	mes "Then I will now change";
-	mes "your " + @stoneStr$ + "s into";
-	mes "a Great Nature... Kehehe~";
-	mes "Any objections?";
-	next;
-	menu "No",-,"Yes",s_No;
-	delitem @stoneID,8;
-	getitem 997,1;
-	mes "[Laspuchin Gregory]";
-	mes "Kehehe... It was a success!";
-	mes "Come back anytime if you";
-	mes "want me to change your";
-	mes "enchanted stones into";
-	mes "another kind.. Keheh~";
-	close;
-
-s_Flame:
-	mes "[Laspuchin Gregory]";
-	mes "Then I will now change";
-	mes "your " + @stoneStr$ + "s into";
-	mes "a Flame Heart... Kehehe~";
-	mes "Any objections?";
-	next;
-	menu "No",-,"Yes",s_No;
-	delitem @stoneID,8;
-	getitem 994,1;
-	mes "[Laspuchin Gregory]";
-	mes "Kehehe... It was a success!";
-	mes "Come back anytime if you";
-	mes "want me to change your";
-	mes "enchanted stones into";
-	mes "another kind.. Keheh~";
-	close;
-
-s_Rough:
-	mes "[Laspuchin Gregory]";
-	mes "Then I will now change";
-	mes "your " + @stoneStr$ + "s into";
-	mes "a Rough Wind... Kehehe~";
-	mes "Any objections?";
-	next;
-	menu "No",-,"Yes",s_No;
-	delitem @stoneID,8;
-	getitem 996,1;
-	mes "[Laspuchin Gregory]";
-	mes "Kehehe... It was a success!";
-	mes "Come back anytime if you";
-	mes "want me to change your";
-	mes "enchanted stones into";
-	mes "another kind.. Keheh~";
-	close;
-
-s_Frozen:
-	mes "[Laspuchin Gregory]";
-	mes "Then I will now change";
-	mes "your " + @stoneStr$ + "s into";
-	mes "a Mystic Frozen... Kehehe~";
-	mes "Any objections?";
-	next;
-	menu "No",-,"Yes",s_No;
-	delitem @stoneID,8;
-	getitem 995,1;
-	mes "[Laspuchin Gregory]";
-	mes "Kehehe... It was a success!";
-	mes "Come back anytime if you";
-	mes "want me to change your";
-	mes "enchanted stones into";
-	mes "another kind.. Keheh~";
-	close;
-
-s_No:
-	mes "[Laspuchin Gregory]";
-	mes "Keheh~ You make me want";
-	mes "to throw flame bottles";
-	mes "at you. Kehehehehe...";
-	mes "KEHEHEHEHEHEHE!";
+	else if (jap_tree == 3) {
+		mes "^3355FFUnlike other cherry trees,";
+		mes "this tree has a strong fragnance.";
+		mes "I just fell into a relaxed";
+		mes "mood. The fragnance eased";
+		mes "my burdens and I felt";
+		mes "very comfortable.^000000";
+		next;
+		mes "^3355FFIt was just for a few moments";
+		mes "but I could forget the";
+		mes "burdens of life. I wish to";
+		mes "come back again and";
+		mes "sit under this tree...^000000";
+		close;
+	}
+	else if (jap_tree == 4) {
+		mes "^3355FFThis strong fragnance";
+		mes "is making me dizzy. Not like";
+		mes "other cherry trees, this tree's";
+		mes "shimmering white petals";
+		mes "felt strange.^000000";
+		next;
+		mes "^3355FFIt feels as if my soul is";
+		mes "being drained if I stay here";
+		mes "longer. After a glimpse of";
+		mes "the cherry tree, I thought to";
+		mes "mayself, 'I must get out of here quickly.'^000000";
+		close;
+	}
+	mes "^3355FFThere was a cherry tree";
+	mes "on the hill. It doesn't look";
+	mes "like the other trees.";
+	mes "This tree seems to have";
+	mes "a long history...^000000";
+	next;
+	mes "^3355FFAre there any people";
+	mes "who live here? I took";
+	mes "a look around and found";
+	mes "someone down the hill.";
+	mes "I better ask her about this tree.^000000";
 	close;
 }
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= Amatsu Town NPCs : Revision 2 (Fox quest fix)
+//= Translated by Makenshi and dj
+//= Revisions and edits by Valaris and Darkchild
+//= 1.01 event_sushi -> ama_sushi fixed
+//=      and other fixes, thanks to Shinomori
+//= 1.02 Fixed & Spell Checked [massdriller]
+//= 1.03 Fixed 2 NPC names, slight optimization [Lupus]
+//= 1.04 Fixed a few typos [Nexon]
+//= 1.05 Changed all breaks to ends. [Skotlex]
+//= 1.06 The Captain now uses iRO dialog [MasterOfMuppets]
+//= 1.07 Implemented a missing NPC [MasterOfMuppets]
+//= 1.08 Removed Duplicates [Silent]
+//= 1.1 Split quests into quests/quests_amatsu.txt [Evera]
+//= 1.2	Fixed missing name [Evera]
+//============================================================
\ No newline at end of file
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index 4bd960bca..67668eb9f 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -5,1347 +5,2177 @@
 //===== Current Version: ===================================== 
 //= 1.2
 //===== Compatible With: ===================================== 
-//= eAthena 7.15 +
+//= eAthena SVN
 //===== Description: ========================================= 
-//= Momotaro event, Sushi Quest, Amatsu Event
+//= [Aegis Conversion]
+//= Momotaro Event
+//= Sushi Quest
+//= Dungeon Quest
 //===== Additional Comments: ================================= 
-//= 1.0 Rewrote parts of other/momotaro.txt to make it work.
-//=	I'm sorry for the mess, I couldn't do much better with
-//=	the current code I had.
-//= 1.1 Added Sushi Quest and Amatsu Event from cities/ [Evera]
-//= 1.2 Fixed Momotaro Quest, thanks to .~Abism0~. [Lupus]
+//= 1.3 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
 //============================================================ 
 
-amatsu,223,235,4	script	Publisher	763,{
-	if (event_momo > 4) goto Lfin;
-	if ((event_momo >= 1) && (event_momo <= 4)) goto Lget;
-	mes "[Publisher]";
-	mes "Hello~~!!";
-	mes "Our ^00B6FFScroll Publishing Company^000000";
-	mes "is professionally publishing";
-	mes "tales.";
-	next;
-	mes "[Publisher]";
-	mes "We established";
-	mes "^3366FFMomotaro Field Trip^000000";
-	mes "to celebrate ^00B6FF<Momotaro Story>^000000";
-	mes "selling over a million copies.";
-	next;
-	mes "[Publisher]";
-	mes "Become Momotaro and eliminate";
-	mes "Dokebis, just like in the story!";
-	mes "There will also be rewards.";
-	next;
-	menu "What is Momotaro Story?!",-,"I want to try!",L1,"I'm busy right now...",L2;
-		mes "[Publisher]";
-		mes "Eh~!? How can you not know about";
-		mes "Momotaro? Don't they have this";
-		mes "tale in Rune-Midgard?? Well...";
-		mes "Let me tell you the story.";
-		next;
-		mes "[Publisher]";
-		mes "Long ago, there lived an old";
-		mes "married couple. They were happy,";
-		mes "but didn't have any children.";
-		next;
-		mes "[Publisher]";
-		mes "One day, while old lady was doing";
-		mes "the laundry, she found a humongous";
-		mes "peach. She cut it in half and...";
-		mes "'Poof!' There was a baby inside!";
-		next;
-		mes "[Publisher]";
-		mes "The old man and lady were shocked.";
-		mes "They decided to adopt that baby,";
-		mes "and give him their love...";
-		next;
+// Momotaro Event
+//============================================================ 
+amatsu,223,236,3	script	Publisher#ama	763,{
+	//if (max_max_c == 1) {
+	//	mes "- Wait a moment!! -";
+	//	mes "- Currently you are carrying -";
+	//	mes "- too many items with you. -";
+	//	mes "- Please store some items into your Kafra storage -";
+	//	mes "- and try again. -";
+	//	close;
+	//}
+	if (event_momo < 2) {
 		mes "[Publisher]";
-		mes "That baby grew so fast, like that";
-		mes "beanstalk from 'Jack and";
-		mes "Beanstalk' and became a strong boy";
-		mes "in only a few days.";
+		mes "Hello~!!";
+		mes "Our ^009CFFScroll Publishing Company^000000";
+		mes "is professionally publishing";
+		mes "tales.";
+		mes " ";
 		next;
 		mes "[Publisher]";
-		mes "That's boy's name was...";
-		mes "<Momotaro>!!!";
-		mes "Momotaro traveled to eliminate";
-		mes "dokebis that were harassing";
-		mes "the towners.";
+		mes "We established";
+		mes "^3163FFMomotaro Field Trip^000000";
+		mes "to celebrate ^009CFF<Momotaro Story>^000000 selling over a million copies.";
 		next;
 		mes "[Publisher]";
-		mes "He became friends with";
-		mes "^3151FFYoyo, Picky, and Desert Wolf^000000";
-		mes "and eliminated all of the Dokebis.";
-		mes "then he lived happily ever after";
-		mes "with the old couple.";
+		mes "Become Momotaro and eliminate";
+		mes "Dokebis, just like in the story!";
+		mes "There will also be rewards.";
 		next;
+		switch(select("What is Momotaro Story?:I want to try!:I'm busy right now...")) {
+		case 1:
+			mes "[Publisher]";
+			mes "Eh~!? How can you not know about";
+			mes "Momotaro? Don't they have this";
+			mes "tale in Rune-Midgard?? Well...";
+			mes "Let me tell you the story.";
+			next;
+			mes "[Publisher]";
+			mes "Long ago, there lived an old married couple. They were happy, but didn't have any children.";
+			next;
+			mes "[Publisher]";
+			mes "One day, while old lady was doing the laundy, she found a humongous";
+			mes "peach. She cut it in half and...";
+			mes "'Poof!' There was a baby inside!";
+			next;
+			mes "[Publisher]";
+			mes "The old man and lady were shocked.";
+			mes "They decided to adopt that baby,";
+			mes "and give him their love...";
+			next;
+			mes "[Publisher]";
+			mes "That baby grew so fast, like that beanstalk from 'Jack and Beanstalk,' and became a strong boy in only a few days.";
+			mes " ";
+			next;
+			mes "[Publisher]";
+			mes "That boy's name was...";
+			mes "<Momotaro>!!!";
+			mes "Momotaro traveled to eliminate";
+			mes "dokebis that were harassing";
+			mes "the towners.";
+			next;
+			mes "[Publisher]";
+			mes "He became friends with";
+			mes "^3163FFYoyo, Picky, and Desert Wolf^000000";
+			mes "and eliminated all of the Dokebis. Then he lived happily ever after with the old couple.";
+			next;
+			mes "[Publisher]";
+			mes "How was it?";
+			mes "Great, right?";
+			mes "I mean, this story sold a million copies!";
+			close;
+		case 2:
+			if (BaseLevel > 29) {
+				mes "[Publisher]";
+				mes "Yay-! You look excited!";
+				mes "You'll be ready to go soon.";
+				mes "Please fill out this registration card.";
+				next;
+				mes "[Publisher]";
+				mes "....................";
+				mes "......Mm.....Let's see.....";
+				mes ".............Good!";
+				mes "Alright, then!";
+				mes "Let it begin~~~!!!!!!!!!";
+				mes "<Momotaro Field Trip>~!";
+				next;
+				warp "ama_test",52,35;
+				end;
+			}
+			mes "[Publisher]";
+			mes "Hmm~";
+			mes "Why don't you train yourself more";
+			mes "and come back?";
+			close;
+		case 3:
+			mes "[Publisher]";
+			mes "Eh?";
+			mes "...But there are sweet rewards waiting...";
+			close;
+		}
+	}
+	else if (event_momo == 4) {
 		mes "[Publisher]";
-		mes "How was it?";
-		mes "Great, right?";
-		mes "I mean, this story sold a million";
-		mes "copies!";
+		mes "Ah~ What nice weather!";
+		mes "This is the perfect weather to do some reading.";
 		close;
-L1:
+	}
+	else if (event_momo > 1) {
 		mes "[Publisher]";
-		mes "Yay-! You look excited!";
-		mes "You'll be ready to go soon.";
-		mes "Please fill out this registration";
-		mes "card.";
+		mes "How was it? Did you have fun?";
+		mes "I hope you had a good time";
+		mes "during the field trip.";
+		mes " ";
+		mes " ";
 		next;
 		mes "[Publisher]";
-		mes ".................";
-		mes "......Mm.....Let's see.....";
-		mes ".............Good!";
-		mes "Alright, then!";
-		mes "Let it begin~~~!!!!!!!!!";
-		mes "<Momotaro Field Trip>~!";
-		close2;
-		warp "ama_test",52,35;
-		end;
-L2:
-		mes "[Publisher]";
-		mes "Eh?";
-		mes "...But there are sweet rewards";
-		mes "waiting...";
-		close;
-Lget:
-	mes "[Publisher]";
-	mes "How was it? Did you enjoy the event?";
-	mes "I hope the arrangements at the event hall allowed you to spend an enjoyable time there.";
-	next;
-	if (event_momo >= 1 && event_momo < 4)
-	{
-		switch(rand(1,10))
-		{
-		case 1: getitem 622,1; break; //rainbow carrot
-		case 2: getitem 627,1; break; //sweet milk
-		case 3: getitem 629,1; break; //singing flower
-		case 4: getitem 632,1; break; //fatty chubby earthworm
-		case 5: getitem 623,1; break; //earthworm the dude
-		case 6: getitem 619,1; break; //unripe apple
-		case 7: getitem 621,1; break; //bitter herb
-		case 8: getitem 620,1; break; //orange juice
-		case 9: getitem 625,1; break; //rusty iron
-		case 10: getitem 624,1; break; //rotten fish
+		mes "This is your reward for you.";
+		mes "Please continue to enjoy stories~";
+		mes " ";
+		if (event_momo == 3) {
+			set event_momo,4;
+			set .@gift_1,rand(1,10);
+			if (.@gift_1 == 1) {
+				getitem 659,1; //Heart_Of_Her
+			}
+			if (.@gift_1 == 2) {
+				getitem 633,1; //Baked_Yam
+			}
+			if (.@gift_1 == 3) {
+				getitem 634,1; //Tropical_Banana
+			}
+			if (.@gift_1 == 4) {
+				getitem 639,1; //Armlet_Of_Obedience
+			}
+			if (.@gift_1 == 5) {
+				getitem 636,1; //No_Recipient
+			}
+			if (.@gift_1 == 6) {
+				getitem 628,1; //Well_Dried_Bone
+			}
+			if (.@gift_1 == 7) {
+				getitem 637,1; //Old_Broom
+			}
+			if (.@gift_1 == 8) {
+				getitem 635,1; //Horror_Of_Tribe
+			}
+			if (.@gift_1 == 9) {
+				getitem 626,1; //Monster_Juice
+			}
+			if (.@gift_1 == 10) {
+				getitem 641,1; //Contracts_In_Shadow
+			}
 		}
-	}
-
-//Am Mut successful finish unknown
-	if (event_momo == 4)
-	{
-		switch(rand(1,10))
-		{
-		case 1: getitem 659,1; break; //her heart
-		case 2: getitem 633,1; break; //sweet potato
-		case 3: getitem 634,1; break; //tropical banana
-		case 4: getitem 639,1; break; //armlet of obedience
-		case 5: getitem 636,1; break; //no recipient
-		case 6: getitem 628,1; break; //well-dried bone
-		case 7: getitem 637,1; break; //old broom
-		case 8: getitem 635,1; break; //orc trophy
-		case 9: getitem 626,1; break; //monster juice
-		case 10: getitem 641,1; break; //contract in shadow
+		else {
+			set event_momo,4;
+			set .@gift_2,rand(1,10);
+			if (.@gift_2 == 1) {
+				getitem 622,1; //Rainbow_Carrot
+			}
+			if (.@gift_2 == 2) {
+				getitem 627,1; //Sweet_Milk
+			}
+			if (.@gift_2 == 3) {
+				getitem 629,1; //Singing_Flower
+			}
+			if (.@gift_2 == 4) {
+				getitem 632,1; //Fatty_Chubby_Earthworm
+			}
+			if (.@gift_2 == 5) {
+				getitem 623,1; //Earthworm_The_Dude
+			}
+			if (.@gift_2 == 6) {
+				getitem 619,1; //Unripe_Apple
+			}
+			if (.@gift_2 == 7) {
+				getitem 621,1; //Bitter_Herb
+			}
+			if (.@gift_2 == 8) {
+				getitem 620,1; //Orange_Juice
+			}
+			if (.@gift_2 == 9) {
+				getitem 625,1; //Lusty_Iron
+			}
+			if (.@gift_2 == 10) {
+				getitem 624,1; //Rotten_Fish
+			}
 		}
+		close;
 	}
-	set event_momo,5;
-	mes "[Publisher]";
-	mes "Well then, I will give you a small present which I have prepared.";
-	mes "May the legend be widely loved also in the future......";
-	close;
-Lfin:
-	mes "[Publisher]";
-	mes "We have a nice weather today, don't we...... It is a perfect day to dry the futon.";
-	close;
 }
-//=====================================================================
-ama_test,50,44,4	script	Event Hall Staff	109,{
-	mes "[Satoshi]";
-	mes "Welcome to <Momotaro Field Trip>";
-	next;
-	mes "[Satoshi]";
-	mes "I'm Satoshi who is in charge of the";
-	mes "waiting room in <Momotaro Field";
-	mes "Trip>.";
-	next;
-	mes "[Satoshi]";
-	mes "Originally, I was working for the";
-	mes "publishing company, but we lacked";
-	mes "workers for the Field Trip...";
-	mes "But working here is much better!";
-	mes "Now I just watch people trying to";
-	mes "accomplish the mission. Heh hehe~";
-	next;
-	mes "[Satoshi]";
-	mes "..............";
-	mes "Just kidding";
-	mes "^111111*Wipes away sweat*^000000";
-	next;
-	mes "[Satoshi]";
-	mes "Well, let me explain";
-	mes "about the rules in the Field Trip";
-	next;
-	mes "[Satoshi]";
-	mes "First of all...Did you hear";
-	mes "about the story from the";
-	mes "publisher?";
-	next;
-	menu "Yes",L1,"No",-;
+	
+ama_test,52,44,3	script	Assistant#ama	109,{
+	if (event_momo == 0) {
+		mes "[Satoshi]";
+		mes "Welcome to <Momotaro Field Trip>";
+		mes " ";
+		next;
 		mes "[Satoshi]";
+		mes "I'm Satoshi who is in charge of the waiting room in <Momotaro Field Trip>.";
+		next;
+		mes "[Satoshi]";
+		mes "Originally, I was working for the publishing company, but we lacked workers for the Field Trip...";
+		mes "But working here is much better!";
+		mes "Now I just watch people trying to accomplish the mission. Heh hehe~";
+		next;
+		mes "[Satoshi]";
+		mes "................";
+		mes "Just kidding";
+		mes "*Wipes away sweat*";
+		next;
+		mes "[Satoshi]";
+		mes "Well, let me explain";
+		mes "about the rules in the Field Trip.";
+		mes " ";
+		next;
+		mes "[Satoshi]";
+		mes "First of all...Did you hear";
+		mes "about the story from the publisher?";
+		next;
+		if (select("Yes:No") == 1) {
+			mes "[Satoshi]";
+			mes "Hehe...Good.";
+			mes "Momotaro Story is our";
+			mes "pride. It's the best story EVER.";
+			mes "Hahahah!!!";
+			next;
+			mes "[Satoshi]";
+			mes "...Hmmhmm.";
+			next;
+			mes "[Satoshi]";
+			mes "The Field Trip is simple.";
+			mes "Go inside and eliminate";
+			mes "Dokebis bravely!!!";
+			mes "Just like Momotaro!!!";
+			mes "Understand? Bravely!!!";
+			next;
+			mes "[Satoshi]";
+			mes "In addition, there are three";
+			mes "things you need to know.";
+			next;
+			mes "[Satoshi]";
+			mes "First....";
+			mes "You can't come back once you clear the field trip. Keep that in mind.";
+			next;
+			mes "[Satoshi]";
+			mes "Secondly....";
+			mes "Q-pet is prohibited";
+			mes "inside of the field trip.";
+			mes "If you are with a pet,";
+			mes "please change it to egg status.";
+			next;
+			mes "[Satoshi]";
+			mes "And finally...";
+			mes "One person can be on the";
+			mes "field trip for 6 minutes.";
+			next;
+			mes "[Satoshi]";
+			mes "Well then, please";
+			mes "wait your turn";
+			mes "in the waiting room.";
+			mes "Good luck in fighting!!";
+			close;
+		}
+		mes "[Assistant]";
 		mes "Eh? You can't just";
 		mes "skip the story";
-		mes "when you enter the field";
-		mes "trip! I can't allow you to";
-		mes "do that as a Momotaro's";
-		mes "fan!!!";
+		mes "when you enter field trip!!";
+		mes "I can't allow you to do that";
+		mes "as Momotaro's fan!!!";
 		next;
-		mes "[Satoshi]";
+		mes "[Assistant]";
 		mes "Please listen to the story";
 		mes "from the publisher.";
 		mes "Thank you.";
 		mes "Bye~~";
-		close2;
+		next;
 		warp "amatsu",223,230;
 		end;
-L1:
-		mes "[Satoshi]";
-		mes "Hehe...Good.";
-		mes "Momotaro's Story is our";
-		mes "pride. It's the best story EVER.";
-		mes "Hahaha!!!";
-		next;
-		mes "[Satoshi]";
-		mes "...Hmmhmm.";
-		next;
+	}
+	else if (event_momo == 1) {
 		mes "[Satoshi]";
-		mes "The Field Trip is simple.";
-		mes "Go inside and eliminate";
-		mes "Dokebis bravely!!!";
-		mes "Just like Momotaro!!!";
-		mes "Understand? Bravely!!!";
+		mes "Oh my...Are you alright?";
+		mes "I thought it was entertaining but maybe it was too hard for you?";
 		next;
 		mes "[Satoshi]";
-		mes "In addition, there are three";
-		mes "things you need to know.";
+		mes "Now what are you going to do?";
+		mes "Do you want to go in again?";
 		next;
+		if (select("Yes:No, I want to go back") == 1) {
+			mes "[Satoshi]";
+			mes "The more effort you put into this, the sweeter victory will taste.";
+			mes "Good luck in fighting!";
+			close;
+		}
 		mes "[Satoshi]";
-		mes "First....";
-		mes "You can't come back once you clear";
-		mes "the field trip. Keep that in mind.";
+		mes "Well, I guess the reality of the situation is that you just can't fulfill the role of Momotaro...";
+		mes "Still, don't be depressed.";
 		next;
 		mes "[Satoshi]";
-		mes "Secondly...";
-		mes "Q-pet is prohibited";
-		mes "inside of the field trip.";
-		mes "if you are with a pet,";
-		mes "please change it to egg status.";
+		mes "I think you've gained enough experience from the field trip.";
 		next;
+		mes "[Assistant]";
+		mes "If you hear a good story,";
+		mes "Please, contact our";
+		mes "publishing company.";
+		mes "Bye-";
+		close2;
+		percentheal 100,0;
+		set event_momo,0;
+		warp "amatsu",223,230;
+		end;
+	}
+	else if (event_momo == 2) {
 		mes "[Satoshi]";
-		mes "And finally...";
-		mes "One person can be on the";
-		mes "field trip for 6 minutes.";
+		mes "Woohoo~ Congratulations!!";
+		mes "You were so great!";
 		next;
 		mes "[Satoshi]";
-		mes "Well then, Please";
-		mes "wait for you turn";
-		mes "in the waitiSng room.";
-		mes "Good luck in fighting!!";
-		close;
-OnInit:
-	waitingroom "Event Hall Waiting Room",1,"Event Hall Staff::OnMax";
-OnInitCopy:
-	enablewaitingroomevent "Event Hall Staff";
-	areawarp "ama_test",30,78,68,120,"amatsu",223,230;
-	disablenpc "Manager#Momotaro";
-	enablenpc "Grandpa#Momotaro";
-	enablenpc "Grandma#Momotaro";
-	donpcevent "#MomotaroTimer::OnStopTimer";
-	killmonsterall "ama_test";
-	end;
-OnMax:
-	warpwaitingpc "ama_test",51,85;
-	disablewaitingroomevent "Event Hall Staff";
-	disablenpc "Manager#Momotaro";
-	enablenpc "Grandpa#Momotaro";
-	enablenpc "Grandma#Momotaro";
-	donpcevent "#MomotaroActivator::OnMomoInit";
+		mes "It is time to say good bye.";
+		mes "If you hear a good story,";
+		mes "Please, contact our";
+		mes "publishing company.";
+		mes "Bye-";
+		close2;
+		percentheal 100,0;
+		warp "amatsu",223,230;
+		end;
+	}
+	mes "[Satoshi]";
+	mes "Woohoo~ Congratulations!!";
+	mes "You were so great!!";
+	mes "Even though your finish was kind of weak...";
+	next;
+	mes "[Satoshi]";
+	mes "It is time to say good bye.";
+	mes "If you hear a good story,";
+	mes "Please, contact our";
+	mes "publishing company.";
+	mes "Bye-";
+	close2;
+	warp "amatsu",223,230;
 	end;
-}
 
-ama_test,1,1,0	script	#MomotaroTimer	-1,{
-OnStartTimer:
-	initnpctimer;
-	end;
-OnTimer180000:
-	if(!isloggedin($MomotaroRID))goto s_Cleanup;
-	mapannounce "ama_test","Timer: 3 Minutes left.",8;
-	end;
-OnTimer300000:
-	if(!isloggedin($MomotaroRID))goto s_Cleanup;
-	mapannounce "ama_test","Timer: 1 Minute left.",8;
+OnInit:
+	waitingroom "Waiting Exhibit.",10,"Assistant#ama::OnStartArena",1;
+	enablewaitingroomevent "Assistant#ama";
 	end;
-OnTimer360000:
-	if(!isloggedin($MomotaroRID))goto s_Cleanup;
-	mapannounce "ama_test","Timer: Beep- Beep- Beep- Time's up.",8;
-OnTimer362500:
-	areawarp "ama_test",30,78,68,120,"amatsu",223,230;
-	goto s_Cleanup;
-
 
-OnTimer20000:
-OnTimer40000:
-OnTimer60000:
-OnTimer80000:
-OnTimer100000:
-OnTimer120000:
-OnTimer140000:
-OnTimer160000:
-OnTimer200000:
-OnTimer220000:
-OnTimer240000:
-OnTimer260000:
-OnTimer280000:
-OnTimer320000:
-OnTimer340000:
-	if(!isloggedin($MomotaroRID))goto s_Cleanup;
+OnStartArena:
+	disablenpc "Coach#ama";
+	disablenpc "Am Mut::Onreset";
+	donpcevent "Dokebi#ez::Onreset";
+	donpcevent "Dokebi#hd::Onreset";
+	enablenpc "Grandma#ama1";
+	enablenpc "Grandpa#ama";
+	warpwaitingpc "ama_test",50,83;
+	donpcevent "Timer#ama::OnEnable";
+	disablewaitingroomevent "Assistant#ama";
 	end;
 
-OnCleanUp:
-s_Cleanup:
-	stopnpctimer;
-	set $Momotaro,0;
-	set $MomoDokebi,0;
-	set $MomoDokebi2,0;
-	set $MomotaroRID,0;
-	mapannounce "ama_test","The current player has exited. The waiting room will now open again.",8;
-	disablenpc "Manager#Momotaro";
-	donpcevent "Event Hall Staff::OnInitCopy";
+Onreset:
+	enablewaitingroomevent "Assistant#ama";
 	end;
+}
 
-OnStopTimer:
-	stopnpctimer;
+ama_test,34,25,0	script	Hanako chan#ama	-1,2,2,{
+OnTouch:
+	mes "[Hanako chan]";
+	mes ".......Eeeeheeheehee";
+	mes ".....................";
+	next;
+	mes "[Hanako chan]";
+	mes "..Eeeeheeheeheeheeheehee";
+	mes "..........................";
+	next;
+	mes "[Hanako chan]";
+	mes "......................";
+	mes "...Want red toilet paper....";
+	mes ".....or bl-ue toilet paper.... ";
+	close;
+}
+	
+ama_test,49,93,4	script	Grandpa#ama	766,{
 	end;
 
+OnInit:
+	disablenpc "Grandpa#ama";
+	end;
 }
+	
+ama_test,50,93,4	script	Grandma#ama1	761,10,10,{
+	end;
 
-ama_test,51,85,0	script	#MomotaroActivator	139,1,1,{
-	if($Momotaro)end;
-	set $Momotaro,1;
-	set $MomotaroRID,getcharid(3);
-	areaannounce "ama_test",30,78,68,120,"Timer: The Timer has been activated. You have 6 minutes. Annihilate the monsters in time!",8;
-	donpcevent "#MomotaroTimer::OnStartTimer";
-	mes "[Grandpa]";
+OnInit:
+	disablenpc "Grandma#ama1";
+	end;
+
+OnTouch:
+	mes "[Grandma]";
 	mes "Arrrk!!!";
 	next;
 	mes "[Grandma]";
-	mes "Honey!! Someone hacked my account";
-	mes "and stole my equipment!!";
+	mes "Honey!! Someone hacked my account and stole my equipment!! ";
 	next;
 	mes "[Grandpa]";
-	mes "Hmm. The Chief said the Dokebi";
-	mes "earned 20 million zeny by hacking";
-	mes "other's accounts...";
+	mes "Hmm. The Chief said Dokebi earned 20 million zeny by hacking others' accounts...";
 	next;
 	mes "[Grandma]";
-	mes "Dohhhhhhh!!!!";
+	mes "Dohhhhhhh!!!! ";
 	next;
 	mes "[Grandpa]";
-	mes "...Huh I've heard that somewhere";
-	mes "before....";
+	mes "....Huh I've heard that somewhere.. ..... ";
 	next;
 	mes "[Grandpa]";
 	mes "Anyway, Momotaro...";
 	next;
 	mes "[Grandpa]";
-	mes "As you know, since we towners spends";
-	mes "our time sitting and chatting,";
-	mes "we can't kill Dokebis because we're";
-	mes "low levels, so...Please do it for";
-	mes "us.";
+	mes "As you know, since we towners spend our time sitting and chatting,";
+	mes "we can't kill Dokebis because we're low level, so...Please do it for us. ";
 	next;
 	mes "[Grandma]";
 	mes "Momotaro...";
 	mes "I really wanted to give you";
-	mes "a handmade ^3151FFYummiest Red Poiton in";
-	mes "the whole world^000000 ...but...";
+	mes "a handmade ^3163FFYummiest Red Potion in the whole world^000000 ...but...";
 	mes ".....I failed to make them ....";
 	next;
 	mes "[Grandma]";
-	mes "...I'm sorry. I should have been";
-	mes "leveling up before...^111111*Sob*";
+	mes "...I'm sorry. I should have been leveling up before...*Sob*";
 	next;
 	mes "[Grandma & Grandpa]";
 	mes "So...Do me this favor, kid~";
 	close2;
-	initnpctimer;
+	set event_momo,1;
+	if (countitem(9010) > 0 || countitem(9005) > 0 || countitem(9016) > 0) {
+		disablenpc "Grandpa#ama";
+		disablenpc "Grandma#ama1";
+		donpcevent "Dokebi#ez::OnEnable";
+	}
+	else {
+		disablenpc "Grandpa#ama";
+		disablenpc "Grandma#ama1";
+		donpcevent "Dokebi#hd::OnEnable";
+	}
+	end;
+}
+	
+ama_test,34,15,0	script	Dokebi#ez	-1,{
+OnInit:
+	disablenpc "Dokebi#ez";
 	end;
 
-OnTimer5000:
-	stopnpctimer;
-	set $MomoDokebi,0;
-	set $MomoDokebi2,0;
-	disablenpc "Grandpa#Momotaro";
-	disablenpc "Grandma#Momotaro";
-	monster "ama_test",47,101,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";
-	monster "ama_test",51,101,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";
-	monster "ama_test",55,101,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";
-	monster "ama_test",55,97,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";
-	monster "ama_test",55,93,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";
-	monster "ama_test",53,91,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";
-	monster "ama_test",49,91,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";
-	monster "ama_test",45,96,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";
-	monster "ama_test",45,99,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";
+OnEnable:
+	enablenpc "Dokebi#ez";
+	set .MyMobs,9;
+	monster "ama_test",45,95,"Dokebi",1110,1,"Dokebi#ez::OnMyMobDead";
+	monster "ama_test",45,99,"Dokebi",1110,1,"Dokebi#ez::OnMyMobDead";
+	monster "ama_test",47,101,"Dokebi",1110,1,"Dokebi#ez::OnMyMobDead";
+	monster "ama_test",51,101,"Dokebi",1110,1,"Dokebi#ez::OnMyMobDead";
+	monster "ama_test",55,101,"Dokebi",1110,1,"Dokebi#ez::OnMyMobDead";
+	monster "ama_test",55,97,"Dokebi",1110,1,"Dokebi#ez::OnMyMobDead";
+	monster "ama_test",55,93,"Dokebi",1110,1,"Dokebi#ez::OnMyMobDead";
+	monster "ama_test",53,91,"Dokebi",1110,1,"Dokebi#ez::OnMyMobDead";
+	monster "ama_test",49,91,"Dokebi",1110,1,"Dokebi#ez::OnMyMobDead";
+	end;
+
+Onreset:
+	killmonster "ama_test","Dokebi#ez::OnMyMobDead";
 	end;
 
+OnMyMobDead:
+	set .MyMobs,.MyMobs-1;
+	if (.MyMobs < 1) {
+		mapannounce "ama_test","I...I will be baaaack~~~~!!!",bc_map;
+		enablenpc "Coach#ama";
+		set event_momo,2;
+	}
+	else {
+		set .@dokebi_tel,rand(1,4);
+		if (.@dokebi_tel == 1) {
+			mapannounce "ama_test","!!IT'S A RAID!!!! RUN!!",bc_map;
+		}
+		else if (.@dokebi_tel == 2) {
+			mapannounce "ama_test"," Ow, Ouch!!! ",bc_map;
+		}
+		else if (.@dokebi_tel == 3) {
+			mapannounce "ama_test"," But I didn't even do anything Baaad~!!",bc_map;
+		}
+		else if (.@dokebi_tel == 4) {
+			mapannounce "ama_test"," I'm sorry~~ Waaaaah~~ ",bc_map;
+		}
+	}
+	end;
+}
+	
+ama_test,34,16,0	script	Dokebi#hd	-1,{
 OnInit:
-	set $Momotaro,0;
-	set $MomoDokebi,0;
-	set $MomoDokebi2,0;
-	set $MomotaroRID,0;
+	disablenpc "Dokebi#hd";
 	end;
 
+OnEnable:
+	enablenpc "Dokebi#hd";
+	set .MyMobs,9;
+	monster "ama_test",45,95,"Dokebi",1110,1,"Dokebi#hd::OnMyMobDead";
+	monster "ama_test",45,99,"Dokebi",1110,1,"Dokebi#hd::OnMyMobDead";
+	monster "ama_test",47,101,"Dokebi",1110,1,"Dokebi#hd::OnMyMobDead";
+	monster "ama_test",51,101,"Dokebi",1110,1,"Dokebi#hd::OnMyMobDead";
+	monster "ama_test",55,101,"Dokebi",1110,1,"Dokebi#hd::OnMyMobDead";
+	monster "ama_test",55,97,"Dokebi",1110,1,"Dokebi#hd::OnMyMobDead";
+	monster "ama_test",55,93,"Dokebi",1110,1,"Dokebi#hd::OnMyMobDead";
+	monster "ama_test",53,91,"Dokebi",1110,1,"Dokebi#hd::OnMyMobDead";
+	monster "ama_test",49,91,"Dokebi",1110,1,"Dokebi#hd::OnMyMobDead";
+	end;
+
+Onreset:
+	killmonster "ama_test","Dokebi#hd::OnMyMobDead";
+	end;
+
+OnMyMobDead:
+	set .MyMobs,.MyMobs-1;
+	if (.MyMobs < 1) {
+		mapannounce "ama_test"," I will be baaaack~~~~!!!",bc_map;
+		enablenpc "Coach#ama";
+		set event_momo,2;
+	}
+	else {
+		set .@dokebi_tel,rand(1,4);
+		if (.@dokebi_tel == 1) {
+			mapannounce "ama_test","!! IT'S A RAID!!!! RUN!!",bc_map;
+		}
+		if (.@dokebi_tel == 2) {
+			mapannounce "ama_test"," Ow, Ouch!!! ",bc_map;
+		}
+		if (.@dokebi_tel == 3) {
+			mapannounce "ama_test"," But I didn't even do anything Baaaaad~!",bc_map;
+		}
+		if (.@dokebi_tel == 4) {
+			mapannounce "ama_test"," I'm sorry~~! Waaaaah~~ ",bc_map;
+		}
+	}
+	end;
 }
+	
+ama_test,50,100,3	script	Coach#ama	762,15,15,{
+	mes "[Coach]";
+	mes "Hoho~ Good.";
+	mes "I've been watching you in the VIP room. You were really something.";
+	mes "I was truly amazed.";
+	next;
+	mes "[Coach]";
+	mes "I thought you were really";
+	mes "Momotaro in the story!";
+	mes "Hohohoho...";
+	next;
+	switch(select("Well, well. It is nothing~:It was boring.")) {
+	case 1:
+		mes "[Coach]";
+		mes "...Hohoho..";
+		mes "Don't be so proud of yourself.";
+		mes "When I was young like you,";
+		mes "I squashed Dokebi with";
+		mes "my little finger. Hohoho~";
+		next;
+		mes "[Coach]";
+		mes "..............";
+		mes "...Don't give me that look.";
+		mes "I was just joking. Hmmhmm.";
+		next;
+		mes "[Coach]";
+		mes "Now, the Momotaro story is over.";
+		mes "You can get your reward when you talk to the Publisher lady you saw first.";
+		next;
+		mes "[Coach]";
+		mes "Don't lose your high self-esteem";
+		mes "in the future. Farewell.";
+		close2;
+		donpcevent "Timer#ama::OnDisable";
+		warp "amatsu",223,230;
+		disablenpc "Coach#ama";
+		donpcevent "Assistant#ama::Onreset";
+		end;
+	case 2:
+		mes "[Coach]";
+		mes ".....!!!!!!";
+		mes "....Hohohoho..";
+		mes "You're pretty funny.";
+		mes "Alright, hot stuff.";
+		mes "Do you want to listen to my proposal?";
+		next;
+		mes "[Coach]";
+		mes "At this point I'm supposed to send you back...BUT!";
+		mes "I really want to know";
+		mes "what you are capable of. Hehe~";
+		mes "Hohoho~";
+		next;
+		mes "[Coach]";
+		mes "So, I will give you a chance.";
+		mes "But if you fail,";
+		mes "^3163FFyou can't take this challenge.^000000";
+		mes "Also, this mission will be pretty hard.";
+		next;
+		if (select("Nah.. I'm good.:Bring it on, foo'!") == 1) {
+			mes "[Coach]";
+			mes "Hoho~I understand...";
+			mes "You must be exhausted from the previous battle. It would have been a grand battle, though...";
+			next;
+			mes "[Coach]";
+			mes "Now, the Momotaro story is over.";
+			mes "You can get your reward";
+			mes "when you talk to";
+			mes "the Publisher lady you first spoke to.";
+			next;
+			mes "[Coach]";
+			mes "Don't lose your high self-esteem";
+			mes "in the future. Farewell.";
+			next;
+			warp "amatsu",223,230;
+			disablenpc "Coach#ama";
+			donpcevent "Timer#ama::OnDisable";
+			donpcevent "Assistant#ama::Onreset";
+			end;
+		}
+		mes "[Coach]";
+		mes "Hohoho~ I like your attitude.";
+		mes "Now, this is the last battle!";
+		mes "Show me what you got.";
+		mes "I'm looking forward to this.";
+		percentheal 70,0;
+		disablenpc "Coach#ama";
+		donpcevent "Am Mut#ama::OnEnable";
+		close;
+	}
 
-ama_test,49,95,4	script	Grandpa#Momotaro	766,{
+OnInit:
+	disablenpc "Coach#ama";
+	end;
 
-	mes "[Grandpa]";
-	mes "Zzzzzz......";
+OnTouch:
+	mes "[Coach]";
+	mes "Boom bam Boooom!!!";
+	mes "Tada~~~ !";
 	close;
 }
+	
+ama_test,34,17,0	script	Am Mut#ama	-1,{
+OnInit:
+	disablenpc "Am Mut#ama";
+	end;
 
-ama_test,51,95,4	script	Grandma#Momotaro	761,{
+OnEnable:
+	enablenpc "Am Mut#ama";
+	set .MyMobs,.MyMobs-1;
+	monster "ama_test",35,102,"Am Mut",1301,1,"Am Mut#ama::OnMyMobDead";
+	monster "ama_test",40,91,"Am Mut",1301,1,"Am Mut#ama::OnMyMobDead";
+	monster "ama_test",56,108,"Am Mut",1301,1,"Am Mut#ama::OnMyMobDead";
+	end;
 
-	mes "[Grandma]";
-	mes "Oh....!?";
-	close;
+Onreset:
+	killmonster "ama_test","Am Mut#ama::OnMyMobDead";
+	end;
 
+OnMyMobDead:
+	set .MyMobs,.MyMobs-1;
+	if (.MyMobs < 1) {
+		enablenpc "Coach#after";
+	}
+	else {
+		set .@am_mut_tel,rand(1,3);
+		if (.@am_mut_tel == 1) {
+			mapannounce "ama_test"," Augh!! I, I made mistake...!",bc_map;
+		}
+		if (.@am_mut_tel == 2) {
+			mapannounce "ama_test"," Ugh...How could I lose?!... ",bc_map;
+		}
+		if (.@am_mut_tel == 3) {
+			mapannounce "ama_test"," Mommmmy~~!!!",bc_map;
+		}
+	}
+	end;
 }
+	
+ama_test,50,100,3	script	Coach#after	762,5,5,{
+	end;
 
-ama_test,50,100,4	script	Manager#Momotaro	762,{
+OnInit:
+	disablenpc "Coach#after";
+	end;
 
-	if (event_momo >= 4) goto LSecondFin;
-	mes "[Manager]";
-	mes "Hoho, you did it...... I'm the manager here...... You are not an ordinary person, right? You did very well.";
-	next;
-	mes "[Manager]";
-	mes "The Momotaro from the legend appears in this world!";
-	mes "Hohohohoho!";
-	next;
-	menu "Is there some extra?",L1,"Thanks for nothing......",L2;
-L1:
-	mes "[Manager]";
-	mes "Hohoho......";
-	mes "This is maybe not really recomending......";
-	mes "I think in your current condition the small demons can twirl you lightly around their fingers.";
-	mes "......Hohoho......";
-	next;
-	mes "[Manager]";
-	mes "......";
-	mes "Just a joke.";
-	next;
-	mes "[Manager]";
-	mes "Well then, you enjoyed the Momotaro Event Hall?";
-	mes "Talk to the staff member, that you have met first, about our premium presents. He will give you some.";
-	next;
-	mes "[Manager]";
-	mes "Whatever you encounter, never loose that strong spirit!";
+OnTouch:
+	mes "[Coach]";
+	mes "( Clap- Clap- Clap- )";
+	close;
+	end;
+	mes "[Coach]";
+	mes "Hohoho~ You are really something.";
+	mes "You've got the moves, kiddo.";
+	mes "I'll give you that.";
+	next;
+	mes "[Coach]";
+	mes "Well, time's up so...";
+	mes "Let me show you the exit.";
+	mes "I had a great time...";
+	mes "Don't forget to get your reward~";
 	close2;
-	set $Momotaro,0;
-	set $MomoDokebi,0;
-	set $MomoDokebi2,0;
-	set $MomotaroRID,0;
-	set event_momo,1;
-	donpcevent "Event Hall Staff::OnInitCopy";
+	set event_momo,3;
 	warp "amatsu",223,230;
-	disablenpc "Manager#Momotaro";
+	disablenpc "Coach#after";
+	donpcevent "Assistant#ama::Onreset";
+	donpcevent "Timer#ama::OnDisable";
 	end;
-L2:
-	mes "[Manager]";
-	mes "!!!!!";
-	mes "......Ho...Hohoho......";
-	mes "You are an amusing fellow......";
-	mes "Well...... One little suggestion from me to you.";
-	next;
-	mes "[Manager]";
-	mes "Normally I would just kick you out, but...... I would like to see your true capabilities... Hohoho.";
-	mes "As if I would look at my own young self. Hohohoho.";
-	next;
-	mes "[Manager]";
-	mes "What do you think? I will give this one nonrecurring chance. It is the challenge of ^3355ffSecond Grade^000000 which is not officially available......";
-	mes "But I warn you, this one will be difficult.";
-	next;
-	menu "Na, it is enough",L2_1,"I take the challenge",L2_2;
-L2_1:
-	mes "[Manager]";
-	mes "Hoho......";
-	mes "You got tired from the last fight?";
-	mes "Well, ok...... Did you enjoy the Momotaro Event Hall? Talk to the staff member, that you have met first, about our premium presents. She will give you some.";
-	next;
-	mes "[Manager]";
-	mes "Whatever you encounter, never loose that strong spirit!";
-	next;
-	set event_momo,2;
-	goto LWarpOut;
-L2_2:
-	mes "[Manager]";
-	mes "Hohoho, You like it more and more, right? This will be the last decisive battle. Show your power without regrets!";
+}
+	
+ama_test,34,18,0	script	Timer#ama	-1,{
+OnInit:
+	disablenpc "Timer#ama";
+	end;
+
+OnEnable:
+	enablenpc "Timer#ama";
 	initnpctimer;
-	close;
-OnTimer5000:
+	end;
+OnDisable:
 	stopnpctimer;
-	if(!isloggedin($MomotaroRID)){ donpcevent "#MomotaroTimer::OnCleanUp"; end; }
-	attachrid($MomotaroRID);
-	monster "ama_test",35,103,"Am Mut",1301,1,"mobcount2#momotaro::OnMobDead";
-	monster "ama_test",56,111,"Am Mut",1301,1,"mobcount2#momotaro::OnMobDead";
-	monster "ama_test",40,91,"Am Mut",1301,1,"mobcount2#momotaro::OnMobDead";
-	misceffect 16;
-	set event_momo,3;
-	disablenpc "Manager#Momotaro";
 	end;
-LSecondFin:
-	mes "[Manager]";
-	mes "You are really strong... Wasn't it thrilling? Momotaro Event Hall can be really enjoyable, right?";
-	mes "Ok now, talk to the staff member, that you have met first, about our premium presents. She will give you some.";
-	close2;	
-	set event_momo,4;
-LWarpOut:
-	mes "[Manager]";
-	mes "Whatever you encounter, never loose that strong spirit!";
-	close2;
-	set $Momotaro,0;
-	set $MomoDokebi,0;
-	set $MomoDokebi2,0;
-	set $MomotaroRID,0;
-	warp "amatsu",223,230;
-	donpcevent "Event Hall Staff::OnInitCopy";
-	disablenpc "Manager#Momotaro";
+
+OnTimer1000:
+	mapannounce "ama_test"," The Timer has been activated. You have 6 minutes. Annihilate the monsters in time! ",bc_map;
 	end;
-OnStart:
-	misceffect 215;
-	if(!isloggedin($MomotaroRID)){ donpcevent "#MomotaroTimer::OnCleanUp"; end; }
-	attachrid($MomotaroRID);
-	mes "[Manager]";
-	mes "Hohoho......";
-	close;
 
-}
-//=======================================MobCount===============================-
-ama_test,0,1,0	script	mobcount#momotaro	-1,{
-OnMobDead:
-	if ($MomoDokebi >= 8){
-		areaannounce "ama_test",30,78,68,120,"Dokebi: I will be baaack~~~~!!!",8;
-		attachrid($MomotaroRID);
-		initnpctimer;
-		end;
-	}
-	set $MomoDokebi,$MomoDokebi+1;
-	set @mobrand,rand(4);
-	if (@mobrand == 1) goto Lrand1;
-	if (@mobrand == 2) goto Lrand2;
-	if (@mobrand == 3) goto Lrand3;
+OnTimer181000:
+	mapannounce "ama_test"," 3 minutes left. ",bc_map;
+	end;
 
-	areaannounce "ama_test",30,78,68,120,"Dokebi: I'm sorry~~! Waaaaah~~",8;
+OnTimer301000:
+	mapannounce "ama_test"," 1 minute left. ",bc_map;
 	end;
-Lrand1:
-	areaannounce "ama_test",30,78,68,120,"Dokebi: !! IT'S A RAID!!!! RUN!!",8;
+OnTimer361000:
+	mapannounce "ama_test","Beep- Beep- Beep- Time over.",bc_map;
 	end;
-Lrand2:
-	areaannounce "ama_test",30,78,68,120,"Dokebi: But I didn't even do anything baaaaad~!",8;
+
+OnTimer361500:
+	enablenpc "backwarp#ama";
 	end;
-Lrand3:
-	areaannounce "ama_test",30,78,68,120,"Dokebi: Ow, Ouch!!!",8;
+
+OnTimer362000:
+	disablenpc "backwarp#ama";
 	end;
-OnTimer5000:
-	donpcevent "mobcount2#momotaro::OnTimer5000";
+
+OnTimer362500:
+	donpcevent "Assistant#ama::Onreset";
+	donpcevent "Timer#ama::OnDisable";
 	end;
 }
-//=======================================MobCount2==============================-
-ama_test,50,101,0	script	mobcount2#momotaro	-1,{
-OnMobDead:
-	if ($MomoDokebi2 == 2) goto Lfin;
-	set $MomoDokebi2,$MomoDokebi2+1;
-	areaannounce "ama_test",30,78,68,120,"Am Mut: Ow, Ouch!!!",8;end;
-Lfin:
-	areaannounce "ama_test",30,78,68,120,"Am Mut: I'm sorry~~! Waaaaah~~",8;
-	set event_momo,4;
-	initnpctimer;
-	end;
-OnTimer5000:
-	stopnpctimer;
-	enablenpc "Manager#Momotaro";
-	donpcevent "Manager#Momotaro::OnStart";
+	
+ama_test,50,100,0	script	backwarp#ama	-1,25,25,{
+OnInit:
+	disablenpc "backwarp#ama";
 	end;
 
+OnTouch:
+	warp "amatsu",115,95;
+	end;
 }
 
-//============================================================
-//====================================================== Sushi
-//====================================================== Quest
-ama_in01,162,17,0	script	Iron Chef	765,{
-	if (ama_sushi == 1) goto LStart2;
-	mes "[ShabuShabu]";
-	mes "*Sighs* This is getting worse..";
-	mes "Everyday more customers come,";
-	mes "but I can never get";
-	mes "enough material, even today.";
-	mes "A lot of customers surely will be hungry?";
-	next;
-	mes "[ShabuShabu]";
-	mes "*Sigh*, a customer. Welcome.";
-	mes "As always, my homemade sashimi";
-	mes "focuses on the freshness. What do you need?";
-	next;
-	menu "I want to buy shrimp sushi",L1,"I want to buy sashimi",L2,"Need some help!",L3,"Keep up the good work",-;
-		mes "[ShabuShabu]";
-		mes "Alright then, my sashimi";
-		mes "are famous throughout the world! Their taste relies on its freshness, and no one else can make them.";
-		mes "If you have a chance, come try a little sashimi!";
+// Sushi Quest
+//============================================================ 
+ama_in01,162,17,1	script	Sushi Master#ama	765,{
+	set .@now_weight,MaxWeight-Weight;
+	if (.@now_weight < 5000) {
+		mes "[Magumagu]";
+		mes "Hey. You look really heavy.";
+		mes "Don't you have trouble walking?";
+		mes "I'm sorry, but there is no space";
+		mes "to put down your stuff in my shop.";
+		next;
+		mes "[Magumagu]";
+		mes "Put some of your stuff away somewhere.";
+		mes "Why are you carrying so much...?";
+		mes "Huhuhu...";
 		close;
-	L1:
-		mes "[ShabuShabu]";
-		mes "Alright! How much do you want?";
-		mes "Unit price 700 zeny, but if you only want a taste,";
-		mes "I'll give you a discount of 74 zeny,";
-		mes "If you like the taste come back and find me later.";
+	}
+	else if (ama_sushi == 4) {
+		mes "[Magumagu]";
+		mes "Training to slice raw fish";
+		mes "daily will make you a master sushi chef.";
+		mes "So don't waste your time in here, and learn what you are good at.";
+		mes " ";
+		close;
+	}
+	else if (fish_r == 1) {
+		if (countitem(529) > 9) {
+			mes "[Magumagu]";
+			mes "Oh! I really appreciate it.";
+			mes "Right on time!";
+			mes "I really need them to make a dessert.";
+			next;
+			mes "[Magumagu]";
+			mes "Thanks. It's nothing, but";
+			mes "I will give you my shop's special cuisine, Fish Slice, in return.";
+			next;
+			set fish_r,0;
+			delitem 529,10; //Candy
+			getitem 544,15; //Fish_Slice
+			mes "[Magumagu]";
+			mes "Here's 15 fish slices.";
+			mes "Please enjoy this food with your friends.";
+			mes "And come back whenever you miss the flavor of Amatsu cuisine.";
+			close;
+		}
+		mes "[Magumagu]";
+		mes "Oh man, you didn't prepare";
+		mes "what I asked for...";
+		mes "Do not forget what I asked.";
 		next;
-		menu "I want the 700 zeny piece!",L1_1,"I want the 74 zeny sample!",L1_2,"I'll come eat next time",-;
-			mes "[ShabuShabu]";
-			mes "Alright then, my shrimp sushi";
-			mes "are famous throughout the world! Their taste relies on its freshness, and no one else can make them.";
-			mes "If you have a chance, come try a little sashimi!";
+		mes "[Magumagu]";
+		mes "10 ^0000FFCandy^000000";
+		mes "You didn't forget it, right?";
+		mes "Bring me these supplies, please.";
+		close;
+	}
+	else if (fish_r == 2) {
+		if (countitem(964) > 9) {
+			mes "[Magumagu]";
+			mes "Oh! I really appreciate it.";
+			mes "Right on time!";
+			mes "I need them to make a sauce.";
+			next;
+			mes "[Magumagu]";
+			mes "Thanks. It is nothing, but";
+			mes "I will give you two sets of Sushi in return.";
+			next;
+			set fish_r,0;
+			delitem 964,10; //Crap_Shell
+			getitem 551,20; //Shusi
+			mes "[Magumagu]";
+			mes "Share it with your friends";
+			mes "and family members.";
+			mes "Please come again.";
 			close;
-		L1_1:
-			if (Zeny < 700) goto Lzeny;
-			set Zeny,Zeny-700;
-			getitem 551,10; //Sushi
-			mes "[If you have a chance, come try a little sashimi!]";
-			mes "Thank you very much";
+		}
+		mes "[Magumagu]";
+		mes "Oh man, you didn't prepare";
+		mes "what I asked for...";
+		mes "Do not forget what I asked.";
+		next;
+		mes "[Magumagu]";
+		mes "10 ^0000FFCrab Shells^000000...";
+		mes "You didn't forget it, right?";
+		mes "Bring me these supplies, please.";
+		close;
+	}
+	else if (fish_r == 3) {
+		if (countitem(961) > 9) {
+			mes "[Magumagu]";
+			mes "Oh! I really appreciate it.";
+			mes "Right on time!";
+			mes "I was preparing appetizers...";
+			next;
+			mes "[Magumagu]";
+			mes "Thanks. It is nothing but";
+			mes "I will give you several sets of Sushi in return.";
+			next;
+			set fish_r,0;
+			delitem 961,10; //Conch
+			getitem 551,30; //Shusi
+			mes "[Magumagu]";
+			mes "These are for three people,";
+			mes "so share them with your friends.";
+			mes "Come back again if you feel like helping out some more.";
 			close;
-		L1_2:
-			if (Zeny < 74) goto Lzeny;
-			set Zeny,Zeny-74;
-			getitem 551,1; //Sushi
-			mes "[If you have a chance, come try a little sashimi!]";
-			mes "Thank you very much";
+		}
+		mes "[Magumagu]";
+		mes "Oh man, you didn't prepare";
+		mes "what I asked for...";
+		mes "Do not forget what I asked.";
+		next;
+		mes "[Magumagu]";
+		mes "10 ^0000FFConches^000000";
+		mes "You didn't forget it, right?";
+		mes "Bring me these supplies, please.";
+		close;
+	}
+	else if (fish_r == 4) {
+		if (countitem(1023) > 9) {
+			mes "[Magumagu]";
+			mes "Oh! I really appreciate it.";
+			mes "Right on time!";
+			mes "I was decorating a platter.";
+			next;
+			mes "[Magumagu]";
+			mes "Thanks. It is nothing but";
+			mes "I will give you a large amount of food in return.";
+			next;
+			delitem 1023,10; //Fish_Tail
+			set fish_r,0;
+			getitem 544,20; //Fish_Slice
+			getitem 551,30; //Shusi
+			mes "[Magumagu]";
+			mes "You can feed your guild";
+			mes "with this food.";
+			mes "Come back with a friend.";
 			close;
-	L2:
-		mes "[ShabuShabu]";
-		mes "Alright! How much do you want?";
-		mes "Unit price 350 zeny, but if you only want a taste,";
-		mes "I'll just give you a discount of 37 zeny.";
-		mes "If you like the taste come back and find me later";
+		}
+		mes "[Magumagu]";
+		mes "Oh man, you didn't prepare";
+		mes "what I asked for...";
+		mes "Do not forget what I asked.";
 		next;
-		menu "I want the 350 zeny piece!",L2_1,"I want the 37 zeny sample",L2_2,"I'll come eat next time",-;
-			mes "[ShabuShabu]";
-			mes "Alright then, my sashimi";
-			mes "are famous throughout the world! Their taste relies on its freshness, and no one else can make them.";
-			mes "[If you have a chance, come try a little sashimi!]";
+		mes "[Magumagu]";
+		mes "10 ^0000FFFish Tails^000000";
+		mes "You didn't forget it, right?";
+		mes "Bring me these supplies, please.";
+		close;
+	}
+	else if (fish_r == 5) {
+		if (countitem(736) > 0) {
+			mes "[Magumagu]";
+			mes "Oh! I really appreciate it.";
+			mes "Right on time!";
+			mes "I didn't have a white platter.";
+			next;
+			mes "[Magumagu]";
+			mes "Thanks. It is nothing but";
+			mes "I will give you two sets of Sushi in return.";
+			next;
+			delitem 736,1; //White_Platter
+			set fish_r,0;
+			getitem 551,20; //Shusi
+			mes "[Magumagu]";
+			mes "Share it with your friends";
+			mes "and family members.";
+			mes "Please come again.";
 			close;
-		L2_1:
-			if (Zeny < 350) goto Lzeny;
-			set Zeny,Zeny-350;
-			getitem 544,10; //Raw Fish
-			mes "[ShabuShabu]";
-			mes "Thank you very much";
+		}
+		mes "[Magumagu]";
+		mes "Oh man, you didn't prepare";
+		mes "what I asked for...";
+		mes "Do not forget what I asked.";
+		next;
+		mes "[Magumagu]";
+		mes "I need a white platter:";
+		mes "1 ^0000FFChina^000000";
+		mes "You didn't forget it, right?";
+		mes "Bring it to me, okay?";
+		close;
+	}
+	else if (fish_r == 6) {
+		if (countitem(950) > 99) {
+			if (ama_sushi == 2) {
+				mes "[Magumagu]";
+				mes "..............................";
+				next;
+				mes "[Magumagu]";
+				mes "You are a really kind person.";
+				mes "You have brought everything";
+				mes "that I've asked you...";
+				next;
+				mes "[Magumagu]";
+				mes "You are not the first foreigner";
+				mes "I have encountered. Amatsu is getting more and more tourists.";
+				mes "I just wanted to test you.";
+				mes " ";
+				next;
+				mes "[Magumagu]";
+				mes "Your job was just errands but";
+				mes "I wanted to know...";
+				mes "how you devote yourself,";
+				mes "how serious you are about completing your job and not giving up.";
+				next;
+				mes "[Magumagu]";
+				mes "I was thinking,";
+				mes "'If there is a person like that,";
+				mes "I would give that person everything about cooking that I have mastered";
+				next;
+				mes "[Magumagu]";
+				mes "And.....";
+				mes "You...";
+				mes "You are the one.";
+				next;
+				mes "[Magumagu]";
+				mes "I'm old now. No one knows how long I can hold this knife. You have been chosen to inherit my culinary art...";
+				mes " ";
+				next;
+				delitem 950,100; //Heart_Of_Mermaid
+				set ama_sushi,4;
+				getitem 1144,1; //Sasimi
+				mes "[Magumagu]";
+				mes "Here, take my knife.";
+				mes "From now on, make fine cuisine with that knife.";
+				mes "...Learn how to slice a fish.";
+				mes " ";
+				mes " ";
+				next;
+				mes "[Magumagu]";
+				mes "From now on, I will no longer ask you favors and give you fish slices in return....";
+				mes "Practice your skill with that knife and teach mainlanders the pleasure of fine cuisine...";
+				close;
+			}
+			else {
+				mes "[Magumagu]";
+				mes "Wow...these are real hearts of";
+				mes "mermaid. The legends saying";
+				mes "that these could be found in another continent were true...";
+				mes " ";
+				next;
+				mes "[Magumagu]";
+				mes "Gathering all these must have been hard...Well, then.";
+				mes "Today, I will use all of my";
+				mes "ingredients to make a special cuisine for you!";
+				next;
+				mes "[Magumagu]";
+				mes "Give me a moment...";
+				mes "I shall show you my ^0000FFtrue culinary skill^000000.";
+				next;
+				delitem 950,20; //Heart_Of_Mermaid
+				getitem 551,20; //Shusi
+				mes "[Magumagu]";
+				mes "Try these first.";
+				mes "Made from the freshest ingredients.";
+				next;
+				delitem 950,20; //Heart_Of_Mermaid
+				getitem 544,20; //Fish_Slice
+				mes "[Magumagu]";
+				mes "Try these too.";
+				mes "My shop's fish slices are the best of the best!";
+				next;
+				delitem 950,20; //Heart_Of_Mermaid
+				getitem 551,20; //Shusi
+				mes "[Magumagu]";
+				mes "Have some more. Don't say no...!";
+				mes "Isn't it good? Huh? Isn't it good?";
+				next;
+				delitem 950,20; //Heart_Of_Mermaid
+				getitem 544,20; //Fish_Slice
+				mes "[Magumagu]";
+				mes "Haha~! Not done yet!";
+				mes "It's okay, have some more!";
+				next;
+				delitem 950,20; //Heart_Of_Mermaid
+				getitem 544,10; //Fish_Slice
+				getitem 551,10; //Shusi
+				mes "[Magumagu]";
+				mes "Take the leftovers.";
+				mes "You look stuffed...";
+				mes "Share the rest with your friends and family.";
+				next;
+				set ama_sushi,ama_sushi+1;
+				set fish_r,0;
+				mes "[Magumagu]";
+				mes "Thanks a lot for today! Haha!";
+				mes "Come back again when you feel like helping. Take care...!!!";
+				close;
+			}
+		}
+		mes "[Magumagu]";
+		mes "Oh man, you didn't prepare";
+		mes "what I asked for...";
+		mes "Do not forget what I asked.";
+		next;
+		mes "[Magumagu]";
+		mes "100 ^0000FFHearts of Mermaid^000000, okay?";
+		mes "You didn't forget it, right?";
+		mes "Bring me the supplies, please.";
+		close;
+	}
+	mes "[Magumagu]";
+	mes "Holy cow~";
+	mes "This is a problem.....";
+	mes "There are so many customers, but I can't get all the ingredients that I need...";
+	next;
+	mes "[Magumagu]";
+	mes "This is horrible...";
+	mes "Some of my customers will not get";
+	mes "the chance to eat fine Amatsu cuisine...";
+	mes " ";
+	next;
+	mes "[Magumagu]";
+	mes "Well, well. Are you a customer?";
+	mes "Welcome. As always, my shop";
+	mes "highly values the freshness of";
+	mes "fish slices. What brings you down here...?";
+	next;
+	switch(select("I would like to buy Sushi:I would like to buy fish slice:Do you need assistance?:Keep up the good work")) {
+	case 1:
+		mes "[Magumagu]";
+		mes "Alright...! How many?";
+		mes "A set of Sushi is 700z. If you";
+		mes "want just 1 Sushi. It is 74z.";
+		mes "If you want more, tell me.";
+		next;
+		switch(select("700z A set!:74z A piece!:I will try it later")) {
+		case 1:
+			if (Zeny < 700) {
+				mes "[Magumagu]";
+				mes "Oh man, you don't have enough money.";
+				mes "If you want to eat delicious fish slices, you better bring more money.";
+				close;
+			}
+			set zeny,zeny-700;
+			getitem 551,10; //Shusi
+			mes "[Magumagu]";
+			mes "There you go. If you like the taste, please order some more.";
 			close;
-		L2_2:
-			if (Zeny < 37) goto Lzeny;
-			set Zeny,Zeny-37;
-			getitem 544,1; //Raw Fish
-			mes "[ShabuShabu]";
-			mes "Thank you very much";
+		case 2:
+			if (Zeny < 74) {
+				mes "[Magumagu]";
+				mes "Oh man, you don't have enough money.";
+				mes "If you want to eat delicious Sushi,";
+				mes "you better bring more money.";
+				close;
+			}
+			set zeny,zeny-74;
+			getitem 551,1; //Shusi
+			mes "[Magumagu]";
+			mes "There you go. If you like the taste, please order some more.";
 			close;
-		Lzeny:
-			mes "[ShabuShabu]";
-			mes "You don't have enough zeny with you";
+		case 3:
+			mes "[Magumagu]";
+			mes "Up to you. My Sushi is";
+			mes "the best of the best! The taste";
+			mes "and freshness are the best in the";
+			mes "world. If you have time, try my Sushi.";
 			close;
-L3:
-		mes "[ShabuShabu]";
-		mes "Oh, any help is welcomed!!";
-		mes "I was just worrying about not having enough material everyday.";
-		mes "Do you want to hear my request?";
-		mes "Of course I will pay you to help me.";
-		next;
-
-		set ama_sushi,1;
-		mes "[ShabuShabu]";
-		mes "Crab Shell.";
-		mes "They are all out. I need them right now.";
-		mes "So please find ^0000FF10Crab shells^000000.";
-		mes "I can never find it when I need it.";
-		mes "I'll be counting on you.";
+		}
+	case 2:
+		mes "[Magumagu]";
+		mes "Alright...! How many?";
+		mes "A set of fish slices is 350z.";
+		mes "1 fish slice is 37z.";
+		mes "If you want more, tell me.";
 		next;
-		mes "[ShabuShabu]";
-		mes "Then, please hurry! I'll be here";
-		mes "waiting for you, please don't forget my request!";
+		switch(select("350z A set!:37z A piece!:I will try it later")) {
+		case 1:
+			if (Zeny < 350) {
+				mes "[Magumagu]";
+				mes "Oh man, you don't have enough money.";
+				mes "If you want to eat delicious fish slices, you better bring more money.";
+				close;
+			}
+			set zeny,zeny-350;
+			getitem 544,10; //Fish_Slice
+			mes "[Magumagu]";
+			mes "There you go. If you like the taste, please order some more.";
+			close;
+		case 2:
+			if (Zeny < 37) {
+				mes "[Magumagu]";
+				mes "Oh man, you don't have enough money.";
+				mes "If you want to eat delicious fish slice, you better bring more money.";
+				mes "";
+				close;
+			}
+			set zeny,zeny-37;
+			getitem 544,1; //Fish_Slice
+			mes "[Magumagu]";
+			mes "There you go. If you like the taste, please order some more.";
+			close;
+		case 3:
+			mes "[Magumagu]";
+			mes "Up to you. My fish slice is";
+			mes "the best of the best! The taste";
+			mes "and freshness are the best in the";
+			mes "world. If you have time, try my fish slices.";
+			close;
+		}
+	case 3:
+		if (BaseJob == Job_Novice) {
+			mes "[Magumagu]";
+			mes "Haha~ YOU are the one who needs";
+			mes "assistance! Help others";
+			mes "when you can take care of yourself.";
+			mes " ";
+			close;
+		}
+		else {
+			mes "[Magumagu]";
+			mes "Some help would be great~!!";
+			mes "I was worried because we always";
+			mes "run out of ingredients...";
+			mes "Will you do me a favor?";
+			mes "I will reward you.";
+			next;
+			set .@fish_m1,rand(1,10);
+			if (.@fish_m1 == 1 || .@fish_m1 == 2) {
+				set fish_r,1;
+				mes "[Magumagu]";
+				mes "I need some candies to make";
+				mes "a dessert for the customers.";
+				mes "Bring me ^0000FF10 Candy^000000.";
+				mes "It's not hard, right?";
+				mes " ";
+			}
+			else if (.@fish_m1 == 3 || .@fish_m1 == 4) {
+				set fish_r,2;
+				mes "[Magumagu]";
+				mes "I need some crab shells to make";
+				mes "a sauce for my cuisine...";
+				mes "If you bring me ^0000FF10 Crab Shells^000000,";
+				mes "I will reward you.";
+				mes "Okay?";
+			}
+			else if (.@fish_m1 == 5 || .@fish_m1 == 6) {
+				set fish_r,3;
+				mes "[Magumagu]";
+				mes "I have used all of my conches.";
+				mes "I need it to make an appetizer...";
+				mes "Please bring me ^0000FF10 Conches^000000.";
+				mes "It is hard to find conches around here...";
+				mes "Please do me this favor.";
+			}
+			else if (.@fish_m1 == 7 || .@fish_m1 == 8) {
+				set fish_r,4;
+				mes "[Magumagu]";
+				mes "Decorative fish tails are out of";
+				mes "stock. This is urgent...";
+				mes "Please bring me ^0000FF10 fish tails^000000.";
+				mes "They are always missing when I need them badly...";
+				mes "Please do me this favor.";
+			}
+			else if (.@fish_m1 == 9) {
+				set fish_r,5;
+				mes "[Magumagu]";
+				mes "We are missing a platter to serve";
+				mes "fish slices to customers.";
+				mes "This is horrible...";
+				mes "Will you buy me some fine porcelain ^0000FFChina^000000?";
+				mes "I can't just put food anywhere...";
+			}
+			else {
+				if (rand(1,10) == 1) {
+					set fish_r,6;
+					mes "[Magumagu]";
+					mes "Don't ask me why...";
+					mes "But, I need something special...";
+					mes "^0000FF100 Hearts of Mermaid^000000.....";
+					mes "I know that it sounds impossible, but it is really important to me...";
+					next;
+					mes "[Magumagu]";
+					mes "Don't ask any questions";
+					mes "about my request...";
+					mes "Just keep what I want in mind.";
+				}
+				else {
+					set fish_r,5;
+					mes "[Magumagu]";
+					mes "We are missing a platter to serve";
+					mes "fish slices to customers.";
+					mes "This is horrible...";
+					mes "Will you buy me some fine porcelain ^0000FFChina^000000? I can't just put food anywhere...";
+				}
+			}
+			next;
+			mes "[Magumagu]";
+			mes "Well, good luck to you...";
+			mes "I will be waiting for you.";
+			mes "Don't forget what I asked...";
+			close;
+		}
+	case 4:
+		mes "[Magumagu]";
+		mes "Haha, you won't forget the flavor of my fish slice once you've";
+		mes "tasted it. If you have time, try my fish slices.";
+		mes " ";
 		close;
-LStart2:
-	if (countitem(964)>=10) goto Lok;
-	mes "[ShabuShabu]";
-	mes "Man, don't have my materials ready?";
-	mes "Oh no, you didn't forget it did you?";
-	next;
-	mes "[ShabuShabu]";
-	mes "^0000FF10Crab shells^000000";
-	mes "Don't forget again.";
-	mes "You must help me find them!";
-	close;
-Lok:
-	delitem 964,10; //Clam Shell
-	getitem 551,20; //Sushi
-	mes "[ShabuShabu]";
-	mes "Hmm! Thank you so much";
-	next;
-	mes "[ShabuShabu]";
-	mes "Here is my thanks, take it!";
-	set ama_sushi,0;
-	close;
-
+	}
 }
 
-//============================================================
-//===================================================== Amatsu
-//====================================================== Event
-amatsu,189,166,4	script	Kouji	764,{
-	mes "[Kuruchi]";
-	mes "Lalala Lalala Lalalalalala..";
-	mes "Lalala Lalala Lalalalalala..";
-	next;
-	if (event_amatsu == 2) goto L1;
-	if ((event_amatsu == 3) || (event_amatsu == 4)) goto L2;
-	if (event_amatsu == 5) goto L3;
-	if (event_amatsu == 6) goto L4;
-L0:
-	mes "[Kuruchi]";
-	mes "Hanging Under the Blue Sky's Blue Roof";
-	mes "Shining on Blue Wall's Reflection on the Blue Lake";
-	mes "Blue Hearting Containing a Blue Desire";
-	mes "Blue, Blue Every thing's Blue";
-	next;
-	goto LEnd;
-L1:
-	mes "[Kuruchi]";
-	mes "Monk, Monk, the fox is following me";
-	mes "Because I have its favourite food";
-	mes "Ramen noodle, my favourite too";
-	mes "I can eat it three times a day";
-	set event_amatsu,3;
-	goto LEnd;
-L2:
-	mes "[Kuruchi]";
-	mes "Monk, Monk, The Fox Is Following Me";
-	mes "Shout At Him To Scare It Off!";
-	mes "Voice Too Small So It Didn't Run Off";
-	mes "Followed All The Way To North Side's Shrine!";
-	set event_amatsu,4;
-	goto LEnd;
-L3:
-	mes "[Kuruchi]";
-	mes "Monk, Monk, The Fox Is Following Me";
-	mes "Ramen noodles My Favorite";
-	mes "But Now I am No Longer Afraid?";
-	mes "I Shouted Loudly To Scare It Off!";
-	goto LEnd;
-L4:
-	mes "[Kuruchi]";
-	mes "The Town's Dock Has An Abandoned Boat!";
-	mes "Everyone Forget That In The Ship";
-	mes "Is Full Of Treasure And Gold";
-	mes "A Boat That Is Feared By Everyone";
-	goto LEnd;
-
-LEnd:
-	next;
-	mes "[Kuruchi]";
-	mes "Lalala Lalala Lalalalalala..";
-	mes "Lalala Lalala Lalalalalala..";
+// Dungeon Quest
+//============================================================ 
+amatsu,112,164,4	script	Gate Soldier#ama1	767,{
+	mes "[Gate Soldier]";
+	mes "This is the great palace,";
+	mes "Toukoujyo.";
+	mes "Locals are prohibited";
+	mes "from entering...";
+	next;
+	mes "[Gate Soldier]";
+	mes "Your attire looks unfamiliar.";
+	mes "Are you from another continent?";
+	mes "The lord has granted entrance to";
+	mes "tourists, so you can go in.";
+	mes " ";
 	close;
 }
-//=====================================================================
-amatsu,171,174,4	script	Guard Soldier#01	767,{
-	if ((event_amatsu == 0) || (event_amatsu == 1)) goto L0;
-	if (event_amatsu == 6) goto L1;
-	if (event_amatsu == 7) goto L2;
-	mes "[Guard Soldier]";
-	mes "This area is where";
-	mes "the Master's mother";
-	mes "Is here for her treatment.";
-	next;
-	mes "[Guard Soldier]";
-	mes "Although it's not much to talk about...";
-	mes "She has been sick here for several months";
-	mes "and started to live here";
+	
+amatsu,119,164,4	script	Gate Soldier#ama2	767,{
+	mes "[Gate Soldier]";
+	mes "Are you from Rune-Midgard?";
+	mes "Welcome to Amatsu.";
+	mes "Visit our lord in Chun-Su-Gak";
+	mes "when you go in.";
+	mes " ";
+	next;
+	mes "[Gate Soldier]";
+	mes "He is really kind.";
+	mes "He invested in various fields for";
+	mes "Amatsu, and intercontinental trade was his idea.";
 	close;
-L0:
-	mes "[Guard Soldier]";
-	mes "This is where the Master's mother stays at.";
-	mes "Please keep quiet, we are also";
-	mes "very worried watching this everyday";
-	next;
-	mes "[Guard Soldier]";
-	mes "Why does this happen";
-	mes "to our benign and wise Master...";
-	mes "I don't understand, *sobs*...";
+}
+	
+ama_in02,207,40,6	script	Gate Soldier#ama3	767,{
+	mes "[Gate Soldier]";
+	mes "Welcome. The lord of the palace";
+	mes "has specially allowed guests";
+	mes "from other continents.";
+	next;
+	mes "[Gate Soldier]";
+	mes "Look around and take your time.";
+	mes "Please enjoy your stay.";
 	close;
-L1:
-	mes "[Guard Soldier]";
-	mes "What? Seems like something";
-	mes "flew by...  Didn't you see? Oh...";
-	mes "And I heard a loud noise... Scared the shit out of me";
+}
+	
+ama_in02,207,49,6	script	Gate Soldier#ama4	767,{
+	mes "[Gate Soldier]";
+	mes "The lord is really nice guy.";
+	mes "Who would know that our town was";
+	mes "once a small village?";
+	next;
+	mes "[Gate Soldier]";
+	mes "I thank him for hiring me.";
+	mes "These days, he seems to have";
+	mes "troubles on his mind.";
+	mes "Lately, he's been looking pretty gloomy.";
+	mes " ";
 	close;
-L2:
-	mes "[Guard Soldier]";
-	mes "Our master should be alright now.";
-	mes "We are also greatly relieved.";
-	mes "You have no idea how worried we were... Phew.";
+}
+	
+amatsu,164,174,4	script	Gate Soldier#ama5	767,{
+	mes "[Gate Soldier]";
+	if (event_amatsu == 0) {
+		mes "You can't enter here.";
+		mes "The mother of our lord is resting in here. She needs her rest.";
+		next;
+		set event_amatsu,1;
+		mes "[Gate Soldier]";
+		mes "She has been sick for months.";
+		mes "That is why she is staying in here.";
+		mes "It's a pretty fearsome sickness...";
+	}
+	else if (event_amatsu == 1) {
+		mes "She should regain her health...";
+		mes "But still, my lord is worrying so much.";
+		mes " ";
+	}
+	else if (event_amatsu == 5) {
+		mes "Augh! I was suprised by that loud sound.";
+		mes "What happened? Huh?";
+		mes " ";
+	}
+	else if (event_amatsu == 6) {
+		mes "The mother of our lord hasn't";
+		mes "fully recovered her health.";
+		mes "Still, she is better than before.";
+		mes " ";
+	}
+	else {
+		mes "If you are sent by my lord,";
+		mes "it is okay to enter...";
+		mes "But you wouldn't be able to cure";
+		mes "her. Many others tried and failed.";
+	}
 	close;
 }
-//=====================================================================
-amatsu,164,174,4	script	Guard Soldier#02	767,{
-	if (event_amatsu == 0) goto LOnce;
-	if ((event_amatsu >= 2) && (event_amatsu <= 5)) goto L2;
-	if (event_amatsu == 6) goto L3;
-	if (event_amatsu == 7) goto L4;
-	mes "[Guard Soldier]";
-	mes "Hopefully she will return healthy soon...";
-	mes "The Master has spent a lot of time";
-	mes "taking care and worrying about her.";
+	
+amatsu,171,174,4	script	Gate Soldier#ama6	767,{
+	mes "[Gate Soldier]";
+	if (event_amatsu == 0) {
+		mes "You can't enter here.";
+		mes "The mother of our lord is resting in here.";
+		mes " ";
+		next;
+		set event_amatsu,1;
+		mes "[Gate Soldier]";
+		mes "She has been sick for months.";
+		mes "That is why she is staying in here.";
+		mes "...";
+	}
+	else if (event_amatsu == 1) {
+		mes "Please, be quiet.";
+		mes "The mother of the lord is staying in here. She needs to relax.";
+		next;
+		mes "[Gate Soldier]";
+		mes "Why is this happening";
+		mes "to my kind lord...";
+		mes "How can it be? *Sob*...";
+	}
+	else if (event_amatsu == 5) {
+		mes "Eh? Something was flying";
+		mes "in the sky... You didn't see? Ugh.";
+		mes "That sound suprised me.";
+	}
+	else if (event_amatsu == 6) {
+		mes "Now our lord is relieved.";
+		mes "We were so worrying about it so much.";
+		mes "Now, it is okay... *sob*.";
+	}
+	else {
+		mes "Oh...man. People from the other";
+		mes "continents are all doctors!";
+		mes "How many doctors have come to visit?! I can't even count anymore!";
+	}
 	close;
-LOnce:
-	mes "[Guard Soldier]";
-	mes "Do not enter here.";
-	mes "This is where the master's mother is";
-	mes "recuperating.";
-	next;
-	mes "[Guard Soldier]";
-	mes "Although it's not much to talk about.";
-	mes "But she has been sick here for several months";
-	mes "and started to live here.";
-	set event_amatsu,1;
+}
+	
+ama_in02,187,57,2	script	Soldier#ama1	767,{
+	mes "[Ichiro]";
+	mes "Welcome.";
+	mes "Our lord prepared guest rooms";
+	mes "for travelers like you.";
+	next;
+	mes "[Ichiro]";
+	mes "If you are having any problems,";
+	mes "tell me. I would appreciate it if you talk to our lord of the";
+	mes "palace. This is all provided by him.";
 	close;
-L2:
-	mes "[Guard Soldier]";
-	mes "If you are invited by the Master...";
-	mes "Please do come in.";
-	mes "Up till today, many doctors came to diagnose but";
-	mes "all their efforts seem futile.";
+}
+	
+ama_in02,170,62,4	script	Soldier#ama2	767,{
+	mes "[Jiro]";
+	mes "I'm Jiro, the administrator";
+	mes "of this Palace. What can I do for you?";
+	next;
+	switch(select("Issue me a Transit Permit:I want to live in Amatsu:Nothing")) {
+	case 1:
+		if (event_amatsu == 6) {
+			if (countitem(7160) > 0) {
+				mes "[Jiro]";
+				mes "You already have one...";
+				mes "You don't need to have two of them.";
+				close;
+			}
+			mes "[Jiro]";
+			mes "Did you lose your Transit Permit?";
+			mes "You need to pay 10,000 zeny as a tax";
+			mes "to issue another Transit Permit.";
+			next;
+			if (select("Issue one:Talk to you later") == 1) {
+				set zeny,zeny-10000;
+				getitem 7160,1; //Lord's_Passable_Ticket
+				mes "[Jiro]";
+				mes "There you go.";
+				mes "Don't lose it this time.";
+				close;
+			}
+			mes "[Jiro]";
+			mes "Okay, then...";
+			mes "Talk to me when you need help.";
+			close;
+		}
+		mes "[Gate Soldier]";
+		mes "The lord announced that";
+		mes "he grants guests from Rune-Midgard the right to go anywhere.";
+		mes "You don't need me to issue you a Transit Permit.";
+		close;
+	case 2:
+		mes "[Jiro]";
+		mes "That is impossible. You're free to";
+		mes "go anywhere in Amatsu, but my lord doesn't want to concern himself with immigration.";
+		mes "Instead of that, you can stay here as long as you want.";
+		close;
+	case 3:
+		mes "[Jiro]";
+		mes "Well then...";
+		mes "Talk to me when you need help.";
+		close;
+	}
+}
+	
+ama_in02,37,157,4	script	Soldier#ama3	767,{
+	mes "[Saburo]";
+	mes "This is the training ground for improving our battle skills.";
+	mes "Please look around...";
+	next;
+	mes "[Saburo]";
+	mes "By the way, recently I've felt";
+	mes "like the soldiers have changed";
+	mes "lately. How do I say it...";
+	mes "Their faces are gloomy and";
+	mes "some of them are no longer around.";
+	mes "Have they gone to Rune-Midgard??";
+	next;
+	mes "[Saburo]";
+	mes "In this job, I encounter";
+	mes "many strangers. But downstairs,";
+	mes "there's a guest from a distant land who seems suspicious...";
+	mes "I told my guards to watch him...";
+	next;
+	mes "[Saburo]";
+	mes "Of course, my lord precisely knows everything that's going on.";
+	mes "Haha, don't take what I said seriously~";
+	mes "See ya...";
 	close;
-L3:
-	mes "[Guard Soldier]";
-	mes" Hey!";
-	mes" What's that sound!?";
-	mes" Where did it come from!?";
+}
+	
+ama_in02,32,51,6	script	Soldier#ama4	767,{
+	mes "[Shiro]";
+	mes "*Cough, Cough* What...";
+	mes "Don't talk to me...";
+	mes "*Cough, Cough*... Oh, my freakin' neck.";
+	next;
+	mes "[Shiro]";
+	mes "That quack's cold medicine";
+	mes "is useless! I should never have trusted people from Rune-Midgard!";
+	mes "*Cough, Cough*...";
+	next;
+	mes "[Shiro]";
+	mes "I don't know why but...";
+	mes "I'm getting worse and worse...";
+	mes "What kind of cold is this?";
+	mes "*Cough*... *Cough*...";
 	close;
-L4:
-	mes "[Guard Soldier]";
-	mes "The master's mother still";
-	mes "hasn't fully recovered.. ";
-	mes "Although, it seems to have turned for the better.";
-	mes "But then again..";
+}
+	
+ama_in02,40,167,3	script	Soldier#ama5	767,{
+	mes "[Goro]";
+	mes "*Psst*... Please, be quiet.";
+	mes "I will tell you a story, okay?";
+	mes " ";
+	next;
+	mes "[Goro]";
+	mes "There is a rumor in Amatsu.";
+	mes "The lord of this palace isn't";
+	mes "real... *Psst*, Quiet!";
+	mes "Don't panic and listen to me.";
+	next;
+	mes "[Goro]";
+	mes "There is a real lord behind";
+	mes "the kind lord and he is scheming";
+	mes "something. He is controlling";
+	mes "our town in some hidden place.";
+	mes "...Our kind lord is just a figurehead~!";
+	next;
+	mes "[Goro]";
+	mes "It's for real! Trust me~";
+	mes "I saw him. The lord who was";
+	mes "laughing at the town on the";
+	mes "TenguGak!!";
+	mes "Just don't tell anyone that I've told you this, okay?";
 	close;
 }
-
-//=====================================================================
-ama_in01,22,111,0	script	Old Lady#01	761,{
-	if (event_amatsu == 5) goto LStart2;
-	if (event_amatsu == 6) goto LStart3;
-	if (event_amatsu == 7) goto LStart4;
-	mes "[...]";
-	mes "^FF6060Clang Clannng! Clang Clannng!  Stupid humans again!";
-	mes "Clang Clannng, Clang Clannng. Who is it? Is it human!?";
-	mes "What do you need here! Hurry up";
-	mes "Get out... Clang Clannng! Clang Clannng!^000000";
-	next;
-	mes "[...]";
-	mes "^FF6060I have decided to live here till";
-	mes "the Ishida Family line ends!";
-	mes "Stop bothering me and get out! Clang Clannng!^000000";
-	next;
-	warp "amatsu",167,197;
-	end;
-LStart2:
-	mes "[...]";
-	mes "^FF0066Clang Clannng! Clang Clannng! Here comes another one!";
-	mes "Stupid Humans! What do you want now";
-	mes "Throw me out of here!?^000000";
-	next;
-	mes "[...]";
-	mes "^FF0066Seems like you learned something somewhere,";
-	mes "That's about all you can do";
-	mes "You can't do anything to me!! Clang Clannng!^000000";
-	next;
-	menu "HAAAA!!",-;
-	set @which,rand(2);
-	if (@which == 1) goto Lfail;
-	mes "[...]";
-	mes "^FF0066Clang Clannng! Clang Clannng! Clang Clannng! This Bastard!";
-	mes "He threw me out like this!";
-	mes "Sick! Not fair!!^000000";
-	next;
-	mes "[...]";
-	mes "^FF0066That god-damned Ishida that rendered me to this.";
-	mes "I'll curse them forever! FOREVER!";
-	mes "Human, you better be careful too!^000000";
-	next;
-	monster "ama_in01",22,112,"Fox",1180,1;
-	killmonsterall "ama_in01";
-	getitem 1022,1; //Nine Tails
-	mes "[...]";
-	mes "^FF0066Everything that Paul Shinaku did";
-	mes "will sooner or later";
-	mes "Bring about my downfall...^000000";
-	mes "^CC3300Clangggggggggggg!!^000000";
-	set event_amatsu,6;
+	
+ama_in02,32,167,5	script	Soldier#ama6	767,{
+	mes "[Rokuro]";
+	mes "He always talks nonsense.";
+	mes "He says that our lord";
+	mes "is not real, but a fake.";
+	mes "It's not even funny.";
+	next;
+	mes "[Rokuro]";
+	mes "However, it is true that";
+	mes "recently, weird things are";
+	mes "happening. There were no";
+	mes "prohibited places before...";
+	next;
+	mes "[Rokuro]";
+	mes "I hear strange sounds sometimes.";
+	mes "The mother of the lord has been";
+	mes "visited by doctors several times.";
+	mes "I guess her health hasn't";
+	mes "improve after their visits...";
 	close;
-Lfail:
-	mes "[...]";
-	mes "^FF0066Clang Clannng! Haha! Clang Clannng! Hahahaha!";
-	mes "How dare you, wanting to throw me out!";
-	mes "Get out of here!! Clang Clannng!^000000";
-	next;
-	warp "amatsu",167,197;
-	end;
-LStart3:
-	mes "[Ishida Sauk]";
-	mes "...*Sigh* Where from young man...?";
-	mes "Did you get rid of the fox?";
-	mes "Somehow I feel so tired, *sigh*...";
-	next;
-	mes "[Ishida Sauk]";
-	mes "Thank you. Coming from another place";
-	mes "and still has to endure through this.";
-	mes "Very sorry... Sorry...";
-	next;
-	mes "[Ishida Sauk]";
-	mes "I need to find my son.";
-	mes "Tell him that I got rid of the fox...";
-	mes "Thank you.";
-	next;
-	mes "[Ishida Sauk]";
-	mes "Now I am getting very tired.";
-	mes "I need to rest now, young man.....";
-	mes "Go find my son...";
+}
+	
+ama_in02,42,34,2	script	Soldier#ama7	767,{
+	mes "[Shichiro]";
+	mes "Have a good time.";
+	mes "My lord prepared some";
+	mes "guest rooms.";
+	next;
+	mes "[Shichiro]";
+	mes "If you have any problems,";
+	mes "please call me. Also, try not to disturb the other guests.";
+	mes " ";
+	next;
+	mes "[Shichiro]";
+	mes "Have a good day.";
 	close;
-LStart4:
-	mes "[Ishida Sauk]";
-	mes "Oh, You are the you man who";
-	mes "got rid of the fox... welcome.";
-	mes "Sit here a while if you can...";
-	next;
-	mes "[Ishida Sauk]";
-	mes "To be possessed by that fox...";
-	mes "It is all my own fault...";
-	mes "I didn't teach my child properly... *sigh*";
-	mes "He was a good kid when he was small.";
-	mes "It's all because I wasn't strict enough...";
-	next;
-	mes "[Ishida Sauk]";
-	mes "Originally this town was small.";
-	mes "Without a castle of this size either.";
-	mes "But, my son got some zeny somehow";
-	mes "and just start bringing them to me.";
-	mes "Don't know what he did to get this zeny.";
-	mes "And has to hide the truth from even me...";
-	next;
-	mes "[Ishida Sauk]";
-	mes "Then starting building on the castle and town,";
-	mes "and treated the townspeople fairly and nicely...";
-	mes "If that was all, then there will be no problem.";
-	mes "The problem came after he did some strange things...";
-	next;
-	mes "[Ishida Sauk]";
-	mes "Yea, he angered the gods";
-	mes "learning some weird spells somewhere.";
-	mes "And started doing experimenting,";
-	mes "Capturing the monsters,";
-	mes "Doing bad things...";
-	next;
-	mes "[Ishida Sauk]";
-	mes "And now, the monsters";
-	mes "started to live in Amatsu...";
-	mes "The gods became so angry even ";
-	mes "the monks from the shrine";
-	mes "don't know what to do.....";
-	next;
-	mes "[Ishida Sauk]";
-	mes "They punished me as well...";
-	mes "and sent a fox here, ";
-	mes "hoping to give a warning,";
-	mes "but my son didn't stop.";
-	next;
-	mes "[Ishida Sauk]";
-	mes "If possible please stop my son.";
-	mes "I am old and almost dead.";
-	mes "I don't know what to do either...";
-	mes "Please guard this peaceful town.";
-	mes "I don't know what my son is smoking";
-	mes "doing that kind of stuff...";
+}
+	
+ama_in02,203,156,4	script	Soldier#ama8	767,{
+	mes "[Hachiro]";
+	mes "My lord is inside.";
+	mes "If you'd like to greet him, feel free to enter.";
+	next;
+	mes "[Hachiro]";
+	mes "Don't be rude in front of him.";
+	mes "He is somehow not feeling well.";
+	mes "Usually, he greets people from";
+	mes "other continents gladly, but...";
+	mes "What could have happened to him...?";
 	close;
 }
-//=====================================================================
-ama_in02,170,62,4	script	Soldier#02	767,{
-	mes "[Kyro]";
-	mes "My name is Kyro. In this town";
-	mes "I handle all the administrative work.";
-	mes "What type of service do you need?";
-	next;
-	menu "Please give me a pass",-,"I want to live here",L2,"Nothing",L3;
-
-	if (event_amatsu == 7) goto L1_1;
-		mes "[Kyro]";
-		mes "The master said that the guests from the continent";
-		mes "can move about freely,";
-		mes "Without any";
-		mes "permits or passes.";
+	
+ama_in02,195,156,4	script	Soldier#ama9	767,{
+	mes "[Kyuro]";
+	mes "This is not good.";
+	mes "My lord is really kind, but";
+	mes "recently he is not doing well...";
+	next;
+	mes "[Kyuro]";
+	mes "I've heard about the rumors";
+	mes "but I trust him. He made";
+	mes "Amatsu into a great town.";
+	mes "That is why I'm following";
+	mes "him as a soldier.";
+	close;
+}
+	
+ama_in02,115,177,7	script	Soldier#ama10	767,{
+	mes "[Jyuro]";
+	mes "What are you doing in here?";
+	mes "There is nothing interesting here.";
+	next;
+	if (select("That is true:Open the gate") == 1) {
+		mes "[Jyuro]";
+		mes "There are much better things to enjoy in town. Have a good time...";
 		close;
-L1_1:
-	if (countitem(7160) == 0) goto L1_2;
-		mes "[Kyro]";
-		mes "I have already given you a pass.";
+	}
+	if (event_amatsu == 6) {
+		if (countitem(7160) > 0) {
+			mes "[Jyuro]";
+			mes "You have the ticket...";
+			mes "Do you want me to send you now, or do you need a little instruction?";
+			next;
+			if (select("I will go in:Instruction, please") == 1) {
+				mes "[Jyuro]";
+				mes "I will open the gate.";
+				mes "Take care of yourself...";
+			}
+			else {
+				mes "[Jyuro]";
+				mes "The area beyond this gate is";
+				mes "protected by some kind of magic.";
+				mes "You may get killed by someone";
+				mes "or get lost.";
+				mes " ";
+				next;
+				mes "[Jyuro]";
+				mes "I can't tell you much.";
+				mes "I didn't go far inside and";
+				mes "and just took a quick look.";
+				mes " ";
+				mes " ";
+				next;
+				mes "[Jyuro]";
+				mes "First.....";
+				mes "'Do not trust what you are";
+				mes "seeing.' I don't know what";
+				mes "it means, but I guess you shouldn't believe everything before your eyes.";
+				next;
+				mes "[Jyuro]";
+				mes "Second.....";
+				mes "'There are certain rules in";
+				mes "magic.' Everything has a";
+				mes "reason to exist. Magic is not an exception. You can probably find the answer...";
+				next;
+				mes "[Jyuro]";
+				mes "Well, I will open this gate.";
+				mes "Take care of yourself...";
+			}
+			close2;
+			warp "ama_dun01",229,10;
+			end;
+		}
+		mes "[Jyuro]";
+		mes "I'm sorry.";
+		mes "You need a Transit Permit to go in.";
+		mes "Please, go back.";
 		close;
-L1_2:
-		mes "[Kyro]";
-		mes "Did you lose the pass?";
-		mes "If you want another pass";
-		mes "you need to pay 10,000 zeny for registration fees.";
-		next;
-		menu "Get the pass",L1_2_1,"Maybe next time",-;
-			mes "No problem!";
-			mes "If you need anything please come talk to me again!";
+	}
+	mes "[Jyuro]";
+	mes "What gate are you talking about?";
+	mes "A gate? On the top floor of the building??? Surely, you must been be mistaken.";
+	emotion e_swt;
+	next;
+	if (countitem(7160) > 0) {
+		if (select("Show him the ticket:Cancel") == 1) {
+			mes "[Jyuro]";
+			mes "What? That pass is...?";
+			mes "That Transit Permit is from";
+			mes "the lord but I guess it has";
+			mes "been issued to the wrong person.";
+			next;
+			delitem 7160,1; //Lord's_Passable_Ticket
+			mes "[Jyuro]";
+			mes "I will keep this ticket because";
+			mes "it was issued without permission.";
+			mes "This is a warning.";
+			mes "Be careful.";
 			close;
-L1_2_1:
-		if (Zeny < 10000) goto LError;
-		set Zeny,Zeny-10000;
-		getitem 7160,1; //Feudal Lord Permit
-		mes "[Kyro]";
-		mes "Come, this is it.";
-		mes "Please be careful and don't lose it again.";
-		close;
-LError:
-		mes "[Kyro]";
-		mes "You don't have enough zeny!";
-		close;
-L2:
-		mes "[Kyro]";
-		mes "This will be difficult, you can";
-		mes "freely move around, but the master";
-		mes "hasn't considered anything about immigration.";
-		mes "But, you can stay as long as you want";
-		close;
-L3:
-		mes "[Kyro]";
-		mes "Then that's it for now...";
-		mes "If there's anything else just tell me.";
+		}
+		mes "[Jyuro]";
+		mes "There are more things to enjoy in town. Have a good time...";
 		close;
-
+	}
+	mes "[Jyuro]";
+	mes "There are more things to enjoy in town. Have yourself a good time...";
+	close;
 }
-
-//=====================================================================
-ama_in02,115,177,7	script	Juro	767,{
-	mes "[Juro]";
-	mes "What are you here for?";
-	mes "There is nothing much over here.";
-	next;
-	menu "Oh, really",-,"Please open the door for me",L2;
-
-		mes "[Juro]";
-		mes "The town has much more stuff.";
-		mes "Have a wonderful time...";
+	
+ama_dun01,229,7,0	script	Soldier#ama11	767,{
+	mes "[Jyuro]";
+	mes "Do you want to go back?";
+	next;
+	if (select("Yes, I do:I will stay here") == 1) {
+		mes "[Jyuro]";
+		mes "Take care of yourself.";
+		close2;
+		warp "ama_in02",119,181;
+		end;
+	}
+	mes "[Jyuro]";
+	mes "Take care...";
+	close;
+}
+	
+ama_in02,200,176,4	script	Lord of Palace#ama	768,{
+	if (event_amatsu == 0) {
+		mes "[Ishida Yoshinaga]";
+		mes "What! A foreigner...? *Phew*";
+		mes "I'm sorry, but I'm not in";
+		mes "the mood to meet new people!";
+		next;
+		mes "[Ishida Yoshinaga]";
+		mes "Get out! I'm not interested";
+		mes "in who you are.";
+		mes "I'm not feeling well!";
 		close;
-L2:
-	if (event_amatsu != 7) goto Lnoflag;
-	if (countitem(7160) < 1) goto Llost;
-		mes "[Juro]";
-		mes "You already got the pass...";
-		mes "Do you want to go in directly? Or";
-		mes "Do you want me to explain first...?";
+	}
+	else if (event_amatsu == 1) {
+		mes "[Ishida Yoshinaga]";
+		mes "What! A foreigner? What brings";
+		mes "you here? If it is not urgent,";
+		mes "come to me another time...!";
 		next;
-		menu "Direct access",-,"Listen to explanation",L2_2;
-
-			mes "[Juro]";
-			mes "Then, I will open the door for you.";
-			mes "Please take care...";
+		switch(select("I heard about your mother...:Your last name is nice:Who are you?")) {
+		case 1:
+			mes "[Ishida Yoshinaga]";
+			mes "Oh...So you know about her disease?";
+			mes "I've heard that, in foreign lands,";
+			mes "the body of medical knowledge can";
+			mes "be quite amazing.";
 			next;
-			warp "ama_dun01",229,10;
-			end;
-L2_2:
-			mes "[Juro]";
-			mes "The inner space seems to be ";
-			mes "protected by special spells.";
-			mes "Those who wander in carelessly,";
-			mes "become lost and will be assaulted";
-			mes "mysteriously and die.";
+			mes "[Ishida Yoshinaga]";
+			mes "Welcome. As you know, I'm the";
+			mes "lord of Toukoujyo,";
+			mes "Ishida Yoshinaga. Nice to";
+			mes "meet you.";
 			next;
-			mes "[Juro]";
-			mes "What I can tell you";
-			mes "isn't all that much.";
-			mes "I have not been inside.";
-			mes "It's a mysterious place, its only proof is";
-			mes "of existence is from the";
-			mes "survivors that ventured inside";
+			mes "[Ishida Yoshinaga]";
+			mes "Let's get to the point.";
+			mes "My mother is not doing well recently. I know you are here because of that.";
+			mes "Can you cure her disease?";
 			next;
-			mes "[Juro]";
-			mes "First of all.....";
-			mes "'Don't believe in what you see.'";
+			mes "[Ishida Yoshinaga]";
+			mes "Until now, many famous doctors";
+			mes "have visited her, but they";
+			mes "all failed to cure her disease";
+			mes "and made it worse...";
+			mes "They disappointed me.";
 			next;
-			mes "[Juro]";
-			mes "Second of all.....";
-			mes "About the spells, they have their own rules.";
-			mes "Everything has its own purpose,";
-			mes "including the spells.";
-			mes "Will you find some";
-			mes "answers?";
+			mes "[Ishida Yoshinaga]";
+			mes "You, who hail from Rune-Midgard,";
+			mes "may be able to cure my mother's disease. I will reward you well if you succeed...";
 			next;
-			mes "[Juro]";
-			mes "Then, I'll open the door for you.";
-			mes "Please be careful...";
+			set event_amatsu,2;
+			mes "[Ishida Yoshinaga]";
+			mes "I beg you...Please.";
+			mes "My mother is living in a house outside of the palace.";
+			mes "Come to me when you finish your treatment.";
+			close;
+		case 2:
+			mes "[Ishida Yoshinaga]";
+			mes "Nice!? So What?!";
+			mes "Read my name until you get";
+			mes "tired of it! Darn it!";
 			next;
-			warp "ama_dun01",229,10;
-			end;
-Llost:
-		mes "[Juro]";
-		mes "You don't have the pass";
-		mes "so I cannot open the gate for you.";
-		mes "Please understand.";
-		close;
-Lnoflag:
-		mes "[Juro]";
-		mes "What door are you talking about?";
-		mes "In a place like this there won't";
-		mes "be any doors as far as I know.";
-		mes "You might have been mistaken.";
+			mes "[Ishida Yoshinaga]";
+			mes "Joking, even in this critical situation... *Phew*...";
+			mes "Please have a good time in Amatsu.";
+			mes "...Whatever!";
+			close;
+		case 3:
+			mes "[Ishida Yoshinaga]";
+			mes "...me? Don't you know? Huh?";
+			mes "I'm the lord of this palace.";
+			mes "If you don't know, talk to";
+			mes "the soldiers outside!";
+			close;
+		}
+	}
+	else if (event_amatsu == 5) {
+		if (countitem(1022) > 0) {
+			mes "[Ishida Yoshinaga]";
+			mes "I've hear the great news!";
+			mes "My mother seems to have gotten better. What was her disease?";
+			next;
+			mes "[Ishida Yoshinaga]";
+			mes "A fox? Is that so? Oh...";
+			mes "It wasn't a disease...!!";
+			mes "Why didn't I notice?!";
+			next;
+			mes "[Ishida Yoshinaga]";
+			mes "Darn fox. To run away and";
+			mes "take revenge on me in such a";
+			mes "way...Well, then. There's no chance of revenge now... Hahaha!";
+			next;
+			mes "[Ishida Yoshinaga]";
+			mes "Hmm, Mmm. Hmm...";
+			next;
+			mes "[Ishida Yoshinaga]";
+			mes "Anyway, thank you for helping me.";
+			mes "Mother will be okay now...";
+			mes "I want to reward you...";
+			mes "But what would be nice...?";
+			next;
+			mes "[Ishida Yoshinaga]";
+			mes "Alright, I will give you";
+			mes "a Transit Permit.";
+			mes "You can go anywhere";
+			mes "with this ticket.";
+			next;
+			set event_amatsu,6;
+			delitem 1022,1; //Fox_Tail
+			getitem 7160,1; //Lord's_Passable_Ticket
+			mes "[Ishida Yoshinaga]";
+			mes "This isn't a big reward but";
+			mes "someday it will be useful for you.";
+			mes "Ask my soldier, 'Jyuro' about the details.";
+			close;
+		}
+		mes "[Ishida Yoshinaga]";
+		mes "Hmm, I heard that my mother";
+		mes "got better...but";
+		mes "How can I know if you cured";
+		mes "her or not?";
+		next;
+		mes "[Ishida Yoshinaga]";
+		mes "Is there any evidence to prove";
+		mes "that you cured her?";
 		next;
-		mes "[Juro]";
-		mes "There are more to see in town.";
-		mes "I hope you have a good time...";
+		mes "[Ishida Yoshinaga]";
+		mes "Show me the evidence to prove";
+		mes "your treatment. I've been";
+		mes "meeting so many foreigners.";
+		mes "But not all of them are trustworthy.";
+		mes "Well... Have a good time.";
 		close;
+	}
+	else if (event_amatsu == 6) {
+		mes "[Ishida Yoshinaga]";
+		mes "*Chuckle* Have a good time";
+		mes "in Amatsu.....";
+		mes "Foreigners are always welcome.";
+		close;
+	}
+	mes "[Ishida Yoshinaga]";
+	mes "How is my mom's status?";
+	mes "If you find the name of the disease, please tell me.";
+	mes "I was worrying about";
+	mes "her all night.";
+	next;
+	mes "[Ishida Yoshinaga]";
+	mes "Because you carry with you";
+	mes "knowledge from Rune-Midgard,";
+	mes "I have faith in your ability.";
+	close;
 }
-ama_dun01,229,7,0	script	Soldier#08	767,{
-	mes "[Juro]";
-	mes "Ready to leave?";
-	next;
-	menu "Leave",-,"Wait a little more",L1;
-		mes "[Juro]";
-		mes "Gogo!!";
+	
+ama_in01,22,111,0	script	Grandma#ama2	761,{
+	if (event_amatsu == 4) {
+		mes "[....]";
+		mes "^FF6060Yelp, Yelp, a foolish human";
+		mes "again! What are you going to do";
+		mes "to get rid of me!?^000000";
 		next;
-		warp "ama_in02",119,181;
+		mes "[....]";
+		mes "^FF6060You look like you learned";
+		mes "something from somewhere, but";
+		mes "it won't harm me!! Yelp!^000000";
+		next;
+		select("Taaaah!!");
+		if ((BaseJob == Job_Priest || BaseJob != Job_Acolye && BaseJob != Job_Monk) || (countitem(523) < 1 || countitem(948) < 1 || countitem(1029) < 1)) {
+			if (rand(1,4) == 1)
+				set .@fox_kill,0;
+			else
+				set .@fox_kill,1;
+		}
+		else {
+			if (rand(1,2) == 1)
+				set .@fox_kill,0;
+			else
+				set .@fox_kill,1;
+		}
+		if (.@fox_kill == 1) {
+			mes "[....]";
+			mes "^FF6060Yelp! Yelp! Yelp! Human!";
+			mes "To expel me from this body like";
+			mes "this! Curse you! Darn you!!^000000";
+			next;
+			mes "[....]";
+			mes "^FF6060I will curse the Ishida family";
+			mes "who made me like this! Forever!";
+			mes "You better watch out, human!^000000";
+			next;
+			monster "ama_in01",22,111,"Nine Tails",1180,1;
+			killmonsterall "ama_in01";
+			set event_amatsu,5;
+			getitem 1022,1; //Fox_Tail
+			mes "[....]";
+			mes "^FF6060Everything that";
+			mes "Yoshinaga does will cause you";
+			mes "unhappiness...^000000";
+			mes "^FF0000Yaaaaaaaaaaaaap!!^000000";
+			close;
+		}
+		mes "[....]";
+		mes "^FF6060Yelp! Haha! Yelp! Hahaha!";
+		mes "Are you trying to expel me from this body!?";
+		mes "Shoo!! Yelp!^000000";
+		close2;
+		warp "amatsu",167,197;
 		end;
-L1:
-		mes "[Juro]";
-		mes "Take care of yourself!";
+	}
+	else if (event_amatsu == 5) {
+		mes "[Ishida Saoko]";
+		mes "...Huh? Why are you here...?";
+		mes "*Urrmmm* My head hurts...";
+		mes "But I'm starting to remember everything...";
+		next;
+		mes "[Ishida Saoko]";
+		mes "Thank you, traveler from a far off";
+		mes "land. I owe you a great debt... Thank you very much...";
+		next;
+		mes "[Ishida Saoko]";
+		mes "I will tell my son that";
+		mes "you exorcised the fox...";
+		mes "Thank you...";
+		next;
+		mes "[Ishida Saoko]";
+		mes "I should get some rest.";
+		mes "My head aches, Young one.....";
+		mes "Go to my son...";
 		close;
+	}
+	else if (event_amatsu == 6) {
+		mes "[Ishida Saoko]";
+		mes "Oh, Are you...? You are the one";
+		mes "who exorcised the fox... Welcome.";
+		mes "Please, have a seat...";
+		next;
+		mes "[Ishida Saoko]";
+		mes "When I think over, being possessed";
+		mes "by the fox was my fault. I raised";
+		mes "my son badly... Oh~";
+		mes "He was a good boy when he was";
+		mes "young. I wasn't strict to him...";
+		next;
+		mes "[Ishida Saoko]";
+		mes "Long ago, this town wasn't as big";
+		mes "as it is today. There was no big";
+		mes "palace like Toukoujyo. Then, one";
+		mes "day, my son brought great riches";
+		mes "to the village. He never told me what he did to earn that fortune...";
+		next;
+		mes "[Ishida Saoko]";
+		mes "He built the palace and helped";
+		mes "the towners and make the town bigger.";
+		mes "He was perfect until...";
+		mes "he started doing strange things.";
+		next;
+		mes "[Ishida Saoko]";
+		mes "Things...which angered God.";
+		mes "He learned forbidden magic,";
+		mes "performed experiments";
+		mes "in the palace, caged monsters,";
+		mes "did all sorts of horrible things...";
+		next;
+		mes "[Ishida Saoko]";
+		mes "That is the reason why there are";
+		mes "monsters in Toukoujyo... Finally,";
+		mes "God's wrath was unleashed. Even the Priest in the shrine couldn't help...";
+		next;
+		mes "[Ishida Saoko]";
+		mes "At last, the anger came toward";
+		mes "me...It seems God tried to warn my son with the fox.";
+		mes "However, my son won't stop.";
+		next;
+		mes "[Ishida Saoko]";
+		mes "If it is okay, please stop my son.";
+		mes "I don't have much time.";
+		mes "I don't know what to do...";
+		mes "Please save this peaceful village.";
+		mes "I beg you please...";
+		mes "What is he truly thinking...?";
+		close;
+	}
+	mes "[....]";
+	mes "^FF6060Yelp, Yelp, Another foolish human!";
+	mes "Yelp, Yelp, Who! Human!?";
+	mes "What are you doing!";
+	mes "Shoo... Yelp! Yelp!^000000";
+	next;
+	mes "[....]";
+	mes "^FF6060I will be in here until";
+	mes "the Ishida family line dies out!";
+	mes "Don't disturb me! Yelp!^000000";
+	close2;
+	warp "amatsu",167,197;
+	end;
 }
-
-//=====================================================================
-ama_in02,200,176,4	script	Castle Owner	768,{
-	if (event_amatsu == 1) goto LStart2;
-	if ((event_amatsu >= 2) && (event_amatsu <=5)) goto LStart3;
-	if (event_amatsu == 6) goto LStart4;
-	if (event_amatsu == 7) goto LStart5;
-	mes "[Ishida Yoshinake]";
-	mes "What! An outsider?";
-	mes "What do you need me for?? If it's nothing important";
-	mes "Talk to you later...!";
-	next;
-	mes "[Ishida Yoshinake]";
-	mes "Please leave! No matter who you are!!";
-	mes "Right now I am in a VERY bad mood!";
-	close;
-LStart2:
-	mes "[Ishida Yoshinaku]";
-	mes "What! A visitor...? Oh, sorry";
-	mes "But today I am not in the mood";
-	mes "of seeing a visitor!";
-	next;
-	menu "I heard your mother is sick...",L1,"What a beautiful castle",L2,"Who are you?",L3;
-L1:
-	mes "[Ishida Yoshinaku]";
-	mes "Oh... You are an expert pathologist?";
-	mes "Oh yea, if you are a foreign expert";
-	mes "I should be able to trust you...";
-	mes "I guess...";
-	next;
-	mes "[Ishida Yoshinaku]";
-	mes "Welcome, as you know";
-	mes "I am the owner of the East Lake Castle";
-	mes "My name is Ishida Yoshinaku,";
-	mes "Nice to meet you.";
-	next;
-	mes "[Ishida Yoshinaku]";
-	mes "To put it simple: my mother";
-	mes "is not very healthy,";
-	mes "of course you are here because of it";
-	mes "Can you cure my ailing mother??";
-	next;
-	mes "[Ishida Yoshinaku]";
-	mes "So many famous and talented";
-	mes "Doctors has visited her already,";
-	mes "But not only did they not cure her!!";
-	mes "They worsened her condition!!";
-	mes "so I kept feeling disappointed";
-	next;
-	mes "[Ishida Yoshinaku]";
-	mes "You, being a foreign expert,";
-	mes "may cure my mother's sickness!";
-	mes "if you do, I will give you lots of zeny and rewards...";
-	next;
-	mes "[Ishida Yoshinaku]";
-	mes "Please help her,";
-	mes "my mother lives in the mansion outside of the castle,";
-	mes "After you cure her";
-	mes "Come see me again";
-	set event_amatsu,2;
-	close;
-L2:
-	mes "[Ishida Yoshinaku]";
-	mes "Yes! Beautiful indeed! So what";
-	mes "Do you want to do! Leave when you get";
-	mes "bored of it! Man!";
-	next;
-	mes "[Ishida Yoshinaku]";
-	mes "At a pressing time like this... *Sobs*...";
-	mes "Leave when you become satisfied or bored!";
-	close;
-L3:
-	mes "[Ishida Yoshinaku]";
-	mes "...Talking about me? You don't know? Eh?";
-	mes "I am this castle's master!";
-	mes "Go ask around the soldiers outside";
-	mes "If you are not sure!";
-	next;
-	mes "[if you are not sure]";
-	mes "At a pressing time like this... *Sobs*...";
-	mes "Leave when you become satisfied or bored!";
-	close;
-LStart3:
-	mes "[Ishida Yushinaku]";
-	mes "How is my mother?";
-	mes "If you know the name of the sickness....";
-	mes "Please tell me immediately...";
-	mes "Argh... So worried!";
-	mes "I can't sleep at night any longer!";
-	next;
-	mes "[Ishida Yushinaku]";
-	mes "You are from the other continents,";
-	mes "so you must know....";
-	mes "now you are the only one I can trust";
-	close;
-LStart4:
-	mes "[Ishida Yushinaku]";
-	mes "WoW, you are great, I heard";
-	mes "My mother is getting better already,";
-	mes "Anyway, what sickness was it?";
-	next;
-	mes "[Ishida Yushinaku]";
-	mes "Fox? The fox is the reason? ho...";
-	mes "So it's not a sickness after all...!!";
-	mes "Why didn't I think of it earlier!!!";
-	next;
-	mes "[Ishida Yushinaku]";
-	mes "Damn fox, after it ran away,";
-	mes "it tried to revenge like this...";
-	mes "But now there is no other";
-	mes "Way... hahaha! Hahahaha!";
-	next;
-	mes "[Ishida Yushinaku]";
-	mes "Um, hmm, umm...";
-	next;
-	mes "[Ishida Yushinaku]";
-	mes "Anyway, Thanks for your help!";
-	mes "I think my mother will return to normal now...";
-	mes "I want to show you my gratitude...";
-	mes "What to do...";
-	next;
-	mes "[Ishida Yushinaku]";
-	mes "Alright, I will give you this pass.";
-	mes "As long as you have this pass,";
-	mes "you can get into ANYWHERE";
-	mes "In this town";
+	
+amatsu,189,166,5	script	Kouji#ama	764,{
+	mes "[Kouji]";
+	mes "Ralralrah Ralralrah Ralralrahralralrah~";
+	mes "Ralralrah Ralralrah Ralralrahralralrah~";
+	next;
+	mes "[Kouji]";
+	if (event_amatsu == 1) {
+		mes "When you're sick, rice cakes are no good~";
+		mes "Family is the best help, as it should~";
+		mes "When medicine doesn't help, that's when you'll see~";
+		mes "That Mommy's love is best for me~";
+	}
+	else if (event_amatsu == 2) {
+		set event_amatsu,3;
+		mes "Priest, Priest~";
+		mes "A fox is following me!";
+		mes "It's funny and a little absurd,";
+		mes "But I'll need noodles with fried bean curd!";
+	}
+	else if (event_amatsu == 3) {
+		mes "Priest, priest~";
+		mes "A fox is following me!";
+		mes "If he doesn't leave when I scream and shout!";
+		mes "The North Shrine Priest should help me out~";
+	}
+	else if (event_amatsu == 4) {
+		mes "Priest, priest~";
+		mes "A fox is following me.";
+		mes "If shouts alone don't make Fox scared,";
+		mes "I might need help from Tiger and Bear~!";
+		next;
+		mes "[Kouji]";
+		mes "Anything else I need in this fight???";
+		mes "Maybe some water from an Acolyte~!";
+	}
+	else if (event_amatsu == 5) {
+		mes "Scary scary harbor ship~";
+		mes "Empty of people, full of treasure~";
+		mes "But I don't remember~!";
+		mes "the rest of this...song???";
+	}
+	else {
+		mes "Blue roof under the blue sky";
+		mes "Blue wall on the blue lake";
+		mes "Blue wishes in the blue minds";
+		mes "Blue Blue Everything is Blue";
+	}
 	next;
-	set event_amatsu,7;
-	getitem 7160,1; //Feudal Lord Permit
-	mes "[Ishida Yushinaku]";
-	mes "Although it's not such a great gift, but";
-	mes "I believe you will have use for it someday...";
-	mes "talk to 'Juro' For the details";
-	close;
-LStart5:
-	mes "[Ishida Yushinaku]";
-	mes "Hey... I hope you have a";
-	mes "good time in Amatsu.....";
-	mes "We always welcome the foreigners!";
+	mes "[Kouji]";
+	mes "Ralralrah Ralralrah Ralralrahralralrah~";
+	mes "Ralralrah Ralralrah Ralralrahralralrah~";
 	close;
 }
-
-ama_in01,180,173,2	script	Fox Mask	762,{
-	if (event_amatsu == 4) goto LStart2;
-	if (event_amatsu == 5) goto LStart3;
-	mes "[Takikuwi]";
-	mes "Hiya, outsider, this";
-	mes "Shrine is left by a monk a long time ago.";
-	mes "Sometimes I come here to play";
-	mes "along with my friend Tokari";
-	next;
-	mes "[Takikuwi]";
-	mes "If you are here to hide from the monsters,";
-	mes "please do come in, no monsters";
-	mes "can ever come in here!";
-	mes "You can always take a short rest in here!";
-	close;
-LStart2:
-	mes "[Takikuwi]";
-	mes "Hiya, outsider, here to find me?";
-	mes "Because of the fox bothering you?";
-	mes "From your expression You seem to";
-	mes "have had quite a bit of trouble";
-	next;
-	mes "[Takikuwi]";
-	mes "Although usually the head monk";
-	mes "should come to help himself, this shrine";
-	mes "Has been deserted for a long time";
-	next;
-	mes "[Takikuwi]";
-	mes "It is very hard to get rid of a fox in a person's body";
-	mes "If there's alcohol and ramen noodle,";
-	mes "It might be a little easier,";
-	mes "But they are hard to find!";
-	next;
-	mes "[Takikuwi]";
-	mes "Good thing I know quite a bit";
-	mes "about the fox, I'll tell you";
-	mes "some words of advice, although foxes";
-	mes "are very tricky, and although they like to";
-	mes "make fun of humans... but it is seldom";
-	mes "for a fox to display hatred!";
-	next;
-	mes "[Takikuwi]";
-	mes "In another word, if there is hatred";
-	mes "human also did something wrong!!";
-	mes "Which will hurt self,";
-	mes "And sometimes unlucky things happen";
-	mes "and to friend and family as well!";
-	next;
-	mes "[Takikuwi]";
-	mes "Anyway, I've heard that when";
-	mes "there's a strong animal then a fox will chased,";
-	mes "away from the human.";
-	mes "So try hard, and try summoning the animal spirit!";
-	next;
-	menu "Haaaa!!",-;
-	mes "[Takikuwi]";
-	mes "Very good, just repeating it will";
-	mes "show the fox a strong spirit,";
-	mes "and show results, but the best thing is";
-	mes "to find out why the fox will enter the";
-	mes "person's body, but if you do this";
-	mes "it should help, more or less";
-	set event_amatsu,5;
-	close;
-LStart3:
-	mes "[Takikuwi]";
-	mes "Don't forget, when you try summoning";
-	mes "you must think about!";
-	mes "A monster that is stronger than a fox";
-	mes "or it would just be a futile effort!";
-	mes "Remember....... Stronger than a fox....";
+	
+ama_in01,169,173,1	script	Shaman#ama	769,{
+	mes "[Tokako]";
+	mes "Er, I'm not really a shaman...";
+	mes "My friend, Takehue-kun brought";
+	mes "me here and invited me to try on these clothes.";
+	next;
+	mes "[Tokako]";
+	mes "He asks me to do a lot of";
+	mes "weird stuff, but he is funny.";
+	mes "Sometimes, I don't know what";
+	mes "he is thinking. Still, he is a good friend.";
+	next;
+	mes "[Tokako]";
+	mes "If you are curious about,";
+	mes "something, ask Takehue-kun.";
+	mes "He knows stuff about";
+	mes "mysticism and the occult that other people don't know about.";
+	mes " ";
 	close;
 }
+	
+ama_in01,180,173,3	script	Kitsune Mask#ama	762,{
+	if (event_amatsu == 3) {
+		mes "[Takehue]";
+		mes "Eh, you are a foreigner.";
+		mes "I'm sure you visited me because";
+		mes "you are having fox troubles.";
+		mes "I can see that in your face.";
+		next;
+		mes "[Takehue]";
+		mes "Originally, the head priest should";
+		mes "help you, but this shrine has been";
+		mes "abandoned long ago.";
+		next;
+		mes "[Takehue]";
+		mes "It is hard to expel a fox from";
+		mes "a human body. If you have liquor";
+		mes "and noodles with fried bean curd,";
+		mes "it would be easy, but they are hard to find.";
+		next;
+		mes "[Takehue]";
+		mes "I know a little about foxes, so let me tell you something...";
+		mes "Foxes like to tease people but";
+		mes "it is rare for them to crave";
+		mes "vengeance.";
+		mes " ";
+		next;
+		mes "[Takehue]";
+		mes "If a fox is vengeful, it means that a human caused it harm.";
+		mes "The fox will take its revenge";
+		mes "against, you, your family,";
+		mes "even your close friends!";
+		next;
+		mes "[Takehue]";
+		mes "Anyway, a stronger spirit";
+		mes "will expel the fox from a human.";
+		mes "Come on, yell out and show me your spirit!";
+		mes " ";
+		next;
+		select("Taaaaah!!");
+		set event_amatsu,4;
+		mes "[Takehue]";
+		mes "Good. Show that spiritual";
+		mes "energy to the fox several times.";
+		mes "Sooner or later, you'll be successful.";
+		close;
+	}
+	else if (event_amatsu == 4) {
+		mes "[Takehue]";
+		mes "Don't forget. You also need the";
+		mes "the embodiment of animals stronger";
+		mes "than the fox. Without these, your";
+		mes "concentration will be of no use.";
+		close;
+	}
+	else {
+		mes "[Takehue]";
+		mes "Eh? A foreigner. This shrine";
+		mes "has been without priests for a";
+		mes "long time. My friend, Tokako and I come here to play around.";
+		next;
+		mes "[Takehue]";
+		mes "If you have been chased by";
+		mes "monsters, please relax.";
+		mes "Monsters cannot come here, so";
+		mes "take a rest in here.";
+		close;
+	}
+}
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.0 Rewrote parts of other/momotaro.txt to make it work.
+//=	I'm sorry for the mess, I couldn't do much better with
+//=	the current code I had.
+//= 1.1 Added Sushi Quest and Amatsu Event from cities/ [Evera]
+//= 1.2 Fixed Momotaro Quest, thanks to .~Abism0~. [Lupus]
+//============================================================ 
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index b8b3ea9d0..d56a01b91 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -57,6 +57,7 @@ npc: npc/merchants/socket_enchant.txt
 npc: npc/merchants/novice_exchange.txt
 npc: npc/merchants/gemstone.txt
 npc: npc/merchants/advanced_refiner.txt
+npc: npc/merchants/elemental_trader.txt
 // --------------------------------------------------------------
 // -------------------------- Airport ---------------------------
 npc: npc/airports/airships.txt
diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt
index 6a90860a6..3262f1692 100644
--- a/npc/warps/cities/amatsu.txt
+++ b/npc/warps/cities/amatsu.txt
@@ -1,49 +1,53 @@
 //===== eAthena Script =======================================
-//= Amatsu Warp Script
+//= Amatsu Warps Script
 //===== By: ==================================================
 //= Athena (1.0)
 //= Nana (1.1)
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
+//= [Aegis COnversion]
 //= Warp Points for Amatsu
 //===== Additional Comments: =================================
+//= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//=	Renamed warps for ease-of-reading.
+//============================================================
+
+amatsu,177,138,0	warp	ama_house1-1	1,1,ama_in01,28,176
+ama_in01,31,176,0	warp	ama_house1-2	1,1,amatsu,180,138
+amatsu,248,160,0	warp	ama_house2-1	1,1,ama_in01,79,178
+ama_in01,76,178,0	warp	ama_house2-2	1,1,amatsu,245,160
+amatsu,168,182,0	warp	ama_warrior1-1	1,1,ama_in01,34,99
+ama_in01,34,96,0	warp	ama_warrior1-2	1,1,amatsu,168,179
+amatsu,52,148,0	warp	ama_deluxe1-1	1,1,ama_in01,88,97
+ama_in01,88,94,0	warp	ama_deluxe1-2	1,1,amatsu,52,145
+amatsu,94,117,0	warp	ama_tools1-1	1,1,ama_in01,30,24
+ama_in01,33,24,0	warp	ama_tools1-2	1,1,amatsu,97,117
+amatsu,132,117,0	warp	ama_weapon1-1	1,1,ama_in01,89,23
+ama_in01,86,23,0	warp	ama_weapon1-2	1,1,amatsu,129,117
+amatsu,217,116,0	warp	ama_tavern1-1	1,1,ama_in01,162,25
+ama_in01,157,25,0	warp	ama_tavern1-2	1,1,amatsu,214,116
+ama_in01,166,73,0	warp	ama_inn1-1	1,1,ama_in01,162,31
+ama_in01,162,34,0	warp	ama_inn1-2	1,1,ama_in01,166,77
+
+amatsu,85,235,0	warp	ama_castle1-1	1,1,ama_in02,223,45
+ama_in02,226,45,0	warp	ama_castle1-2	1,1,amatsu,88,235
+ama_in02,65,37,0	warp	ama_castle2-1	1,1,ama_in02,195,41
+ama_in02,195,44,0	warp	ama_castle2-2	1,1,ama_in02,65,40
+ama_in02,59,141,0	warp	ama_castle3-1	1,1,ama_in02,56,41
+ama_in02,56,44,0	warp	ama_castle3-2	1,1,ama_in02,59,144
+ama_in02,215,149,0	warp	ama_castle4-1	1,1,ama_in02,59,156
+ama_in02,59,160,0	warp	ama_castle4-2	1,1,ama_in02,215,152
+ama_in02,126,164,0	warp	ama_castle5-1	1,1,ama_in02,219,161
+ama_in02,222,161,0	warp	ama_castle5-2	1,1,ama_in02,129,164
+
+//============================================================ 
+// Old changelog
+//============================================================ 
 //= 1.3 Fixed a warp-back [erKURITA]
 //= 1.4 Added Ninja's Warps. Thanks to RockmanEXE for the info. [erKURITA]
 //= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
-//= 1.6 Movves Job Quest related warps to proper file. [L0ne_W0lf]
+//= 1.6 Moved Job Quest related warps to proper file. [L0ne_W0lf]
 //============================================================
-
-//= Amatsu ===================================================
-ama_in01,157,25,0	warp	warp1969	1,1,amatsu,213,116
-ama_in01,161,34,0	warp	warp1970	1,1,ama_in01,166,77
-ama_in01,166,73,0	warp	warp1971	1,1,ama_in01,162,32
-ama_in01,174,120,0	warp	warp2011	1,1,amatsu,217,146
-ama_in01,174,170,0	warp	warp2012	1,1,ama_fild01,174,328
-ama_in01,31,176,0	warp	warp2010	1,1,amatsu,42,110
-ama_in01,32,24,0	warp	warp1963	1,1,amatsu,98,117
-ama_in01,34,97,0	warp	warp1965	1,1,amatsu,168,178
-ama_in01,77,177,0	warp	warp1967	1,1,amatsu,246,160
-ama_in01,86,23,0	warp	warp2009	1,1,amatsu,129,117
-ama_in01,88,94,0	warp	warp2008	1,1,amatsu,52,145
-ama_in02,127,163,0	warp	warp1980	1,1,ama_in02,220,161
-ama_in02,195,44,0	warp	warp1973a	1,1,ama_in02,65,40
-ama_in02,215,150,0	warp	warp1978	1,1,ama_in02,59,156
-ama_in02,222,161,0	warp	warp1979	1,1,ama_in02,130,163
-ama_in02,227,45,0	warp	warp1973b	1,1,amatsu,88,235
-ama_in02,56,44,0	warp	warp1975	1,1,ama_in02,59,144
-ama_in02,59,142,0	warp	warp1976	1,1,ama_in02,56,41
-ama_in02,59,159,0	warp	warp1977	1,1,ama_in02,215,152
-ama_in02,65,38,0	warp	warp1974	1,1,ama_in02,195,41
-amatsu,132,117,0	warp	warp1989	1,1,ama_in01,88,22
-amatsu,168,180,0	warp	warp1964	1,1,ama_in01,34,99
-amatsu,216,116,0	warp	warp1968	1,1,ama_in01,162,25
-amatsu,217,149,0	warp	warp1987	1,1,ama_in01,174,122
-amatsu,247,290,0	warp	warp1960	1,1,ama_fild01,73,32
-amatsu,249,160,0	warp	warp1966	1,1,ama_in01,79,178
-amatsu,40,110,0	warp	warp1995	1,1,ama_in01,28,176
-amatsu,52,148,0	warp	warp1994	1,1,ama_in01,88,97
-amatsu,85,235,0	warp	warp1972	1,1,ama_in02,224,45
-amatsu,96,117,0	warp	warp1962	1,1,ama_in01,29,23
diff --git a/npc/warps/dungeons/ama_dun.txt b/npc/warps/dungeons/ama_dun.txt
index 68defa5e9..91d360651 100644
--- a/npc/warps/dungeons/ama_dun.txt
+++ b/npc/warps/dungeons/ama_dun.txt
@@ -3,19 +3,17 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
-//= Warp Points for Amatsu
+//= [Aegis Conversion]
+//= Warp Points for Amatsu Dungeon
 //===== Additional Comments: =================================
-//= Split off amatsu.txt
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-//= Amatsu Dungeon ===========================================
-//disabled due to amatsu dungeon quest
-//ama_dun01,228,6,0	warp	warp8007	1,1,ama_test,50,87
-ama_dun01,234,143,0	warp	warp8008	1,1,ama_dun02,31,41
-ama_dun02,196,124,0	warp	warp8010	1,1,ama_dun03,119,14
-ama_dun02,29,41,0	warp	warp8009	1,1,ama_dun01,231,143
-ama_dun03,119,9,0	warp	warp8011	1,1,ama_dun02,196,121
+ama_dun01,235,144,0	warp	ama_dun1-1	1,1,ama_dun02,33,40
+ama_dun02,30,40,0	warp	ama_dun1-2	1,1,ama_dun01,232,144
+ama_dun02,196,123,0	warp	ama_dun2-1	1,1,ama_dun03,120,12
+ama_dun03,120,9,0	warp	ama_dun2-2	1,1,ama_dun02,196,120
diff --git a/npc/warps/fields/amatsu_fild.txt b/npc/warps/fields/amatsu_fild.txt
index cc61996e8..5b692921b 100644
--- a/npc/warps/fields/amatsu_fild.txt
+++ b/npc/warps/fields/amatsu_fild.txt
@@ -3,20 +3,19 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
-//= Warp Points for Amatsu Field's
+//= [Aegis COnversion]
+//= Warp Points for Amatsu Field
 //===== Additional Comments: =================================
-//= Split off amatsu.txt
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-//= Amatsu Fields ============================================
-// removed
-//ama_fild,154,301,0	warp	warp1998	1,1,prontera,163,186
-//ama_fild,174,132,0	warp	warp1996	1,1,prontera,163,186
-//ama_fild,193,302,0	warp	warp1997	1,1,prontera,163,186
-//ama_fild,330,141,0	warp	warp1999	1,1,prontera,163,186
-ama_fild01,174,332,0	warp	warp8003	1,1,ama_in01,175,174
-ama_fild01,75,29,0	warp	warp1961	1,1,amatsu,247,287
+amatsu,248,292,0	warp	ama_fild1-1	1,1,ama_fild01,75,33
+ama_fild01,75,30,0	warp	ama_fild1-2	1,1,amatsu,248,289
+ama_fild01,174,331,0	warp	ama_shrine1-1	1,1,ama_in01,175,174
+ama_in01,175,171,0	warp	ama_shrine1.2	1,1,ama_fild01,174,328
+ama_fild01,330,141,0	warp	ama_craftsman1-1	1,1,ama_in01,174,124
+ama_in01,174,121,0	warp	ama_craftsman1.2	1,1,ama_fild01,330,138