Implemented a missing npc in Amatsu and the momotaro event.

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

5 files changed, 960 insertions, 448 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 2ff02cf90..61ad82caf 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -37,6 +37,8 @@ Musashiden
 Date		Added

 ======

 06/12

+	* Implemented a missing NPC in Amatsu and fixed up the old [MasterOfMuppets]

+	  version of the Momotaro event, it is now a permanent quest.

 	* Started the Juno Update process. 5% complete. [Musashiden]

 	* Added custom quest for 5 mobile RO bonus items [Lupus]

 		Bird Nest,Lion Mask,Skeleton Manteau,Fashion Hip Sack,Sales Banner

diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index bcc4c08dd..466c6b22b 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= Some people & eAthena Dev Team

 //===== Current Version: ===================================== 

-//= 1.05

+//= 1.07

 //===== Compatible With: ===================================== 

 //= Any eAthena Version; Niflheim Required

 //===== Description: ========================================= 

@@ -17,6 +17,7 @@
 // 1.04 Fixed a few typo's [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]

 //=====================================================================

 alberta.gat,245,93,4	script	Sea Captain	709,{

 	mes "[Walter Moers]";

@@ -1489,6 +1490,211 @@ amatsu.gat,261,197,4	script	Legendary Sakura Tree	111,{
 	close;

 }

 

+ama_in02.gat,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;

+

+		}

+	if(countitem(@stoneID) < 8)goto s_NEnough;

+	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!";

+	close;

+

+s_NEnough:

+	mes "[Laspuchin Gregory]";

+	mes "Keheheh~ Check your pockets";

+	mes "before you tell me";

+	mes "how foolish you are.....";

+	next;

+	mes "[Laspuchin Gregory]";

+	mes "Bring me stones! You said you";

+	mes "were going to help me!";

+	mes "Keep your promises!";

+	mes "Kehehehkehkeh...";

+	close;

+

+}

+

 //| Ninja map portion dummy npcs, commented by default.

 //que_ng.gat,27,18,3	script	Seaman	709,{end;}

 //que_ng.gat,28,45,3	script	Man	86,{end;}

diff --git a/npc/other/momotaro.txt b/npc/other/momotaro.txt
deleted file mode 100644
index 56926aad5..000000000
--- a/npc/other/momotaro.txt
+++ /dev/null
@@ -1,447 +0,0 @@
-//=====================================================================

-//MOMOTARO event

-//=====================================================================

-amatsu.gat,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 "I represent ^009CFFTsurukame Publishing Inc.^000000 and handle the legends that are told in the village for generations.";

-	mes "A popular legend among men and women of all ages is ^009CFF<Momotaro>^000000......";

-	next;

-	mes "[Publisher]";

-	mes "One Million copies were sold!";

-	mes "To celebrate the anniversary, the ^3163FFMomotaro Event Hall^000000 was established.";

-	next;

-	mes "[Publisher]";

-	mes "You practical become the protagonist of the Momotaro Story and fight against a small demon.";

-	mes "There are also presents!";

-	next;

-	menu "Who is Momotaro?",-,"I really wanna do that!",L1,"I'm busy right now......",L2;

-		mes "[Publisher]";

-		mes "What? You do not know Momotaro? Oh my, what an insensitive person......";

-		mes "Well then, I will tell you......";

-		next;

-		mes "[Publisher]";

-		mes "Once upon a time, there was an old couple......";

-		mes "The couple had a very good relation, but they had no children...";

-		next;

-		mes "[Publisher]";

-		mes "Someday, the grandmother did their laundry at the river, a big peach flowed by. ";

-		mes "The Grandmother picked up the peach and returned home, where the grandfather tried to divide the fruit...... ";

-		mes "But from the middle of the peach a baby appeared.";

-		next;

-		mes "[Publisher]";

-		mes "Grandfather and Grandmother were surprised very much, but decided to raise the baby as their own child.";

-		next;

-		mes "[Publisher]";

-		mes "The Child grow up rapidly and became a strong young boy several days later.";

-		next;

-		mes "[Publisher]";

-		mes "The name of the child was ^3163FF<Momotaro>^000000.";

-		mes "In those days a small demon appeard and tormented the village people so Momotaro decided to go on a travel to exterminate the demon......";

-		next;

-		mes "[Publisher]";

-		mes "Along the way Momotaro met a ^3163FFmonkey^000000, a ^3163FFpheasant^000000 and a ^3163FFdog^000000m which followed him as companions.";

-		mes " Finally they defeated the demon and lived with the grandfather and the grandmother in happiness...... ";

-		mes "- the end -";

-		next;

-		mes "[Publisher]";

-		mes "How was it?";

-		mes "It was of interest One Million times!";

-		close;

-L1:

-		mes "[Publisher]";

-		mes "Oh! You are a good and powerfull person! To me you seem to be vigorous. ";

-		mes "Well then, this application form has to be filled......";

-		next;

-		mes "[Publisher]";

-		mes "......";

-		mes "......Hmm hmm......";

-		mes "......Well! Everything ok!";

-		mes "We can start at once. Please enjoy the ^3163FFMomotaro Event Hall^000000.";

-		next;

-//modification

-//		warp "ama_test",52,35;

-		warp "ama_fild01",330,130;

-//end modification

-		end;

-L2:

-		mes "[Publisher]";

-		mes "There are also premium presents, you know....... (wink)";

-		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) getitem 627,1; //sweet milk

-	if (event_momo == 2) getitem 629,1; //singing flower

-	if (event_momo == 3) getitem 625,1; //rusty iron

-//Am Mut successful finish unknown

-	if (event_momo == 4) getitem 627,1; //sweet milk

-	if (event_momo == 4) getitem 629,1; //singing flower

-	if (event_momo == 4) getitem 625,1; //rusty iron

-	set event_momo,10;

-	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.";

-	set event_momo,event_momo+1;

-	if (event_momo == 20) set event_momo,0;

-	close;

-}

-//=====================================================================

-ama_test.gat,52,44,4	script	Event Hall Staff	109,{

-	mes "[Satoshi]";

-	mes "Welcome to the Momotaro Event Hall";

-	next;

-	mes "[Satoshi]";

-	mes "I'm in charge of the waiting room of the Momotaro Event Hall. My name is Satoshi.";

-	next;

-	mes "[Satoshi]";

-	mes "Originally this was the work of the publisher, but...... she was not sufficient for that job and got transfered suddenly......";

-	mes "But this was good! Because this way we could make the attraction even more challenging for the visitors.";

-	next;

-	mes "[Satoshi]";

-	mes "......hehehe, no no, it was just a joke...... (sweat)";

-	next;

-	mes "[Satoshi]";

-	mes "Well, I will give you an explanation about the Event Hall.";

-	next;

-	mes "[Satoshi]";

-	mes "Did you ask the Publisher outside about the Momotaro Story?";

-	next;

-	menu "Yes",L1,"No",-;

-		mes "[Satoshi]";

-		mes "What the heck? You come here without knowing the story?";

-		mes "......";

-		mes "You are by no means a fan of Momotaro.";

-		next;

-		mes "[Satoshi]";

-		mes "The Story is told by the publisher outside. Well then...... Goodby.";

-		next;

-		warp "amatsu.gat",223,230;

-		end;

-L1:

-		mes "[Satoshi]";

-		mes "Hmm......";

-		mes "The story of Momotaro is the best work of this Publisher. Maybe it is even a supreme masterpiece?";

-		mes "Hahaha!!!";

-		next;

-		mes "[Satoshi]";

-		mes "...... So, what's next...";

-		next;

-		mes "[Satoshi]";

-		mes "The rule of the Event Hall are simple. Just go in, like the brave Momotaro! And if the small demon is defeated, everything will be good.";

-		mes "Well, be brave!";

-		next;

-		mes "[Satoshi]";

-		mes "Furthermore, there are 3 important points.";

-		next;

-		mes "[Satoshi]";

-		mes "First:";

-		mes "When the Event Hall is cleared it cannot be entered again.";

-		mes "Please pay attention to this point.";

-		next;

-		mes "[Satoshi]";

-		mes "Second:";

-		mes "Please do not go accompanied by a pet inside the Event Hall. If you have a pet with you, please change it back to an egg before entering.";

-		next;

-		mes "[Satoshi]";

-		mes "And the last important point:";

-		mes "There is a time restriction of 6 minutes for people entering the Event Hall.";

-		next;

-		mes "[Satoshi]";

-		mes "Well then, Please enter the Waiting Room Chat and wait for your turn. I wish you a good fight.";

-		close;

-OnInit:

-	waitingroom "Event Hall Waiting Room",1,"Event Hall Staff::OnMax";

-//modification

-//do clear everything in case of somebody got stuck in the hall

-	areawarp "ama_test.gat",30,78,68,120,"amatsu.gat",223,230;

-	disablenpc "Manager";

-	enablenpc "Grandfather";

-	enablenpc "Grandmother";

-	killmonsterall "ama_test.gat";

-	stopnpctimer "roomtimer";

-//end modification

-	end;

-OnMax:

-//modification

-//	doevent "roomt";

-	initnpctimer "roomtimer";

-//end modification

-	warpwaitingpc "ama_test.gat",50,83;

-	disablenpc "Event Hall Staff";

-	disablenpc "Manager";

-	enablenpc "Grandfather";

-	enablenpc "Grandmother";

-	end;

-}

-

-ama_test.gat,49,95,4	script	Grandfather	766,{

-//modification

-	mes "[Grandfather]";

-	mes "Zzzzzz......";

-//end modification

-	close;

-}

-

-ama_test.gat,51,95,4	script	Grandmother	761,{

-	mes "[Grandmother]";

-	mes "Oh....!?";

-	next;

-	mes "[Grandmother]";

-	mes "Grandfather, do you know where I put my money?";

-	next;

-	mes "[Grandfather]";

-	mes "Grandmother...... The village headman said, that the small demons recently stole money from people right in the middle of the village, causing big tumult...";

-	next;

-	mes "[Grandmother]";

-	mes "Iiiiiii......!";

-	next;

-	mes "[Grandfather]";

-	mes "This is the recent talk in the village......";

-	next;

-	mes "[Grandfather]";

-	mes "Oh, there is Momotaro......";

-	next;

-	mes "[Grandfather]";

-	mes "As you probably know, there are only cowards here with no power to fight the small demons....";

-	mes "So I would like to ask you a favour, Momotaro.";

-	next;

-	mes "[Grandmother]";

-	mes "Momotaro......";

-	mes "Your Grandmother would like to give you ^3355ffthe tastiest red portion on this world^000000...... but I cannot...... ";

-	next;

-	mes "[Grandmother]";

-	mes "I'm so sorry...... Momotaro......";

-	next;

-	mes "[Grandmother & Grandfather]";

-	mes "Please, Momotaro, help us......";

-//modification

-	addtimer 5000, "Grandmother::OnTimer5000";

-	close;

-OnTimer5000:

-//end modification

-	disablenpc "Grandfather";

-	disablenpc "Grandmother";

-	set @mobdie,0;

-	monster "ama_test.gat",47,101,"Small Demon",1110,1,"mobcount";

-	monster "ama_test.gat",51,101,"Small Demon",1110,1,"mobcount";

-	monster "ama_test.gat",55,101,"Small Demon",1110,1,"mobcount";

-	monster "ama_test.gat",55,97,"Small Demon",1110,1,"mobcount";

-	monster "ama_test.gat",55,93,"Small Demon",1110,1,"mobcount";

-	monster "ama_test.gat",53,91,"Small Demon",1110,1,"mobcount";

-	monster "ama_test.gat",49,91,"Small Demon",1110,1,"mobcount";

-	monster "ama_test.gat",45,96,"Small Demon",1110,1,"mobcount";

-	monster "ama_test.gat",45,99,"Small Demon",1110,1,"mobcount";

-	end;

-}

-

-ama_test.gat,50,100,4	script	Manager	762,{

-//modification

-	if (event_momo >= 4) goto LSecondFin;

-//end modification

-	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!";

-	next;

-	set event_momo,1;

-//modification

-//	deltimer "roomt";

-//end modification

-	disablenpc "Manager";

-	enablenpc "Event Hall Staff";

-	warp "amatsu.gat",223,230;

-	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 Grad^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;

-//modification

-	goto LWarpOut;

-//	end;

-//end modification

-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!";

-//modification

-	addtimer 5000, "Manager::OnTimer5000";

-//end modification

-	close;

-OnTimer5000:

-	monster "ama_test.gat",35,103,"Demon",1301,1,"mobcount2";

-	monster "ama_test.gat",56,111,"Demon",1301,1,"mobcount2";

-	monster "ama_test.gat",40,91,"Demon",1301,1,"mobcount2";

-	disablenpc "Manager";

-	set event_momo,3;

-	end;

-//modification

-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.";

-	next;	

-	set event_momo,4;

-LWarpOut:

-//end modification

-	mes "[Manager]";

-	mes "Whatever you encounter, never loose that strong spirit!";

-	next;

-	warp "amatsu.gat",223,230;

-	disablenpc "Manager";

-	stopnpctimer "roomtimer";

-	enablenpc "Event Hall Staff";

-	donpcevent "Event Hall Staff::OnInit";

-	end;

-Onstart:

-	mes "[Manager]";

-	mes "Hohoho......";

-	close;

-}

-//=======================================MobCount===============================-

-ama_test.gat,0,1,0	script	mobcount	-1,{

-	if (@mobdie >= 8) goto Lfin;

-	set @mobdie,@mobdie+1;

-	set @mobrand,rand(4);

-	if (@mobrand == 1) goto Lrand2;

-	if (@mobrand == 2) goto Lrand3;

-	if (@mobrand == 3) goto Lrand4;

-Lrand1:

-	areaannounce "ama_test.gat",30,78,68,120,"Small Demon: I havn't done anything!",8;end;

-Lrand2:

-	areaannounce "ama_test.gat",30,78,68,120,"Small Demon: Excuse me, Excuse me",8;end;

-Lrand3:

-	areaannounce "ama_test.gat",30,78,68,120,"Small Demon: Ahhh......",8;end;

-Lrand4:

-	areaannounce "ama_test.gat",30,78,68,120,"Small Demon: I've been hit on surprise...",8;end;

-Lfin:

-	areaannounce "ama_test.gat",30,78,68,120,"Small Demon: Uhhaaa......",8;

-	addtimer 5000, "mobcount2::OnTimer5000";

-//modification

-//	stopnpctimer "roomtimer";

-	end;

-//	enablenpc "Manager";

-//	doevent "Manager::Onstart";

-//	end;

-//end modification

-}

-//=======================================MobCount2==============================-

-ama_test.gat,50,101,0	script	mobcount2	-1,{

-	if (@mobdie2 == 2) goto Lfin;

-	set @mobdie2,@mobdie2+1;

-	areaannounce "ama_test.gat",30,78,68,120,"Demon: Uhaaa...",8;end;

-Lfin:

-	set event_momo,4;

-//modification

-	addtimer 5000, "mobcount2::OnTimer5000";

-	end;

-OnTimer5000:

-//end modification

-	enablenpc "Manager";

-	doevent "Manager::Onstart";

-	end;

-}

-//=======================================TIMER==================================-

-

-//modification

-//dead code

-//ama_test.gat,50,102,0	script	roomt	-1,{

-//

-//	deltimer "roomt";

-//	mapannounce "ama_test.gat","Time limit is 6 Minutes from now.",8;

-//	addtimer 180000,"roomt::On180000";

-//	end;

-//

-//OnTestTime:

-//	mapannounce "ama_test.gat","Time left: "+temp_time+"sec ",8;

-//	end;

-//

-//On180000:

-//	deltimer "roomt";

-//	mapannounce "ama_test.gat","3 Minutes left.",8;

-//	addtimer 120000,"roomt::On300000";

-//	end;

-//On300000:

-//	deltimer "roomt";

-//	mapannounce "ama_test.gat","One Minute left.",8;

-//	addtimer 60000,"roomt::On360000";

-//	end;

-//On360000:

-//	mapannounce "ama_test.gat","Hohoho - Time limit is exceeded.",8;

-//	disablenpc "Manager";

-//	enablenpc "Event Hall Staff";

-//	areawarp "ama_test.gat",30,78,68,120,"amatsu.gat",223,230;

-//	end;

-//}

-

-ama_test.gat,50,102,0	script	roomtimer	-1,{

-

-OnTimer1000:

-	mapannounce "ama_test.gat","Time limit is 6 Minutes from now.",8;

-	end;

-OnTimer180000:

-	mapannounce "ama_test.gat","3 Minutes left.",8;

-	end;

-OnTimer300000:

-	mapannounce "ama_test.gat","One Minute left.",8;

-	end;

-OnTimer360000:

-	stopnpctimer "roomtimer";

-	mapannounce "ama_test.gat","Hohoho - Time limit is exceeded.",8;

-	areawarp "ama_test.gat",30,78,68,120,"amatsu.gat",223,230;

-	disablenpc "Manager";

-	enablenpc "Event Hall Staff";

-	donpcevent "Event Hall Staff::OnInit";

-	end;

-}

-//end modification

diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
new file mode 100644
index 000000000..dafd28e4f
--- /dev/null
+++ b/npc/quests/quests_amatsu.txt
@@ -0,0 +1,750 @@
+//===== eAthena Script ======================================= 

+//= Quests NPCs related to Amatsu City

+//===== By: ================================================== 

+//= eAthena team & others? & MasterOfMuppets

+//===== Current Version: ===================================== 

+//= 1.0

+//===== Compatible With: ===================================== 

+//= eAthena 7.15 +

+//===== Description: ========================================= 

+//= 

+//===== 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.

+//============================================================ 

+

+amatsu.gat,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;

+		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.";

+		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.";

+		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.";

+		next;

+		mes "[Publisher]";

+		mes "How was it?";

+		mes "Great, right?";

+		mes "I mean, this story sold a million";

+		mes "copies!";

+		close;

+L1:

+		mes "[Publisher]";

+		mes "Yay-! You look excited!";

+		mes "You'll be ready to go soon.";

+		mes "Please fill out this registration";

+		mes "card.";

+		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,24))

+		{

+

+	case 1:

+		getitem 627,1; //sweet milk

+	break;

+

+	case 2:

+		getitem 629,1; //singing flower

+	break;

+

+	case 3:

+		getitem 625,1; //rusty iron

+	break;

+

+	case 4:

+		getitem 619,1; //unripe apple

+	break;

+

+	case 5:

+		getitem 620,1; //orange juice

+	break;

+

+	case 6:

+		getitem 621,1; //bitter herb

+	break;

+

+	case 7:

+		getitem 622,1; //rainbow carrot

+	break;

+

+	case 8:

+		getitem 623,1; //earthworm the dude

+	break;

+

+	case 9:

+		getitem 624,1; //rotten fish

+	break;

+

+	case 10:

+		getitem 626,1; //monster juice

+	break;

+

+	case 11:

+		getitem 628,1; //well-dried bone

+	break;

+

+	case 12:

+		getitem 630,1; //dew laden moss

+	break;

+

+	case 13:

+		getitem 631,1; //deadly noxious herb

+	break;

+

+	case 14:

+		getitem 632,1; //fatty chubby earthworm

+	break;

+

+	case 15:

+		getitem 633,1; //sweet potato

+	break;

+

+	case 16:

+		getitem 634,1; //tropical banana

+	break;

+

+	case 17:

+		getitem 635,1; //orc trophy

+	break;

+

+	case 18:

+		getitem 636,1; //no recipient

+	break;

+

+	case 19:

+		getitem 637,1; //old broom

+	break;

+

+	case 20:

+		getitem 638,1; //silver knife of chastity

+	break;

+

+	case 21:

+		getitem 639,1; //armlet of obedience

+	break;

+

+	case 22:

+		getitem 640,1; //shining stone

+	break;

+

+	case 23:

+		getitem 641,1; //contract in shadow

+	break;

+

+	case 24:

+		getitem 642,1; //book of the devil

+	break;

+

+		}

+	}

+//Am Mut successful finish unknown

+	if (event_momo == 4)

+	{

+	while(@i != 3)

+	{

+	switch(rand(1,24))

+		{

+

+	case 1:

+		getitem 627,1; //sweet milk

+	break;

+

+	case 2:

+		getitem 629,1; //singing flower

+	break;

+

+	case 3:

+		getitem 625,1; //rusty iron

+	break;

+

+	case 4:

+		getitem 619,1; //unripe apple

+	break;

+

+	case 5:

+		getitem 620,1; //orange juice

+	break;

+

+	case 6:

+		getitem 621,1; //bitter herb

+	break;

+

+	case 7:

+		getitem 622,1; //rainbow carrot

+	break;

+

+	case 8:

+		getitem 623,1; //earthworm the dude

+	break;

+

+	case 9:

+		getitem 624,1; //rotten fish

+	break;

+

+	case 10:

+		getitem 626,1; //monster juice

+	break;

+

+	case 11:

+		getitem 628,1; //well-dried bone

+	break;

+

+	case 12:

+		getitem 630,1; //dew laden moss

+	break;

+

+	case 13:

+		getitem 631,1; //deadly noxious herb

+	break;

+

+	case 14:

+		getitem 632,1; //fatty chubby earthworm

+	break;

+

+	case 15:

+		getitem 633,1; //sweet potato

+	break;

+

+	case 16:

+		getitem 634,1; //tropical banana

+	break;

+

+	case 17:

+		getitem 635,1; //orc trophy

+	break;

+

+	case 18:

+		getitem 636,1; //no recipient

+	break;

+

+	case 19:

+		getitem 637,1; //old broom

+	break;

+

+	case 20:

+		getitem 638,1; //silver knife of chastity

+	break;

+

+	case 21:

+		getitem 639,1; //armlet of obedience

+	break;

+

+	case 22:

+		getitem 640,1; //shining stone

+	break;

+

+	case 23:

+		getitem 641,1; //contract in shadow

+	break;

+

+	case 24:

+		getitem 642,1; //book of the devil

+	break;

+

+		}

+	set @i,@i+1;

+	}

+	}

+	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.gat,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",-;

+		mes "[Satoshi]";

+		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!!!";

+		next;

+		mes "[Satoshi]";

+		mes "Please listen to the story";

+		mes "from the publisher.";

+		mes "Thank you.";

+		mes "Bye~~";

+		close2;

+		warp "amatsu.gat",223,230;

+		end;

+L1:

+		mes "[Satoshi]";

+		mes "Hehe...Good.";

+		mes "Momotoro's Story is our";

+		mes "pride. It's the best story EVER.";

+		mes "Hahaha!!!";

+		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";

+		mes "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 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.gat",30,78,68,120,"amatsu.gat",223,230;

+	disablenpc "Manager#Momotaro";

+	enablenpc "Grandpa#Momotaro";

+	enablenpc "Grandma#Momotaro";

+	donpcevent "#MomotaroTimer::OnStopTimer";

+	killmonsterall "ama_test.gat";

+	end;

+OnMax:

+	warpwaitingpc "ama_test.gat",51,85;

+	disablewaitingroomevent "Event Hall Staff";

+	disablenpc "Manager#Momotaro";

+	enablenpc "Grandpa#Momotaro";

+	enablenpc "Grandma#Momotaro";

+	donpcevent "#MomotaroActivator::OnMomoInit";

+	end;

+}

+

+ama_test.gat,1,1,0	script	#MomotaroTimer	-1,{

+OnStartTimer:

+	initnpctimer;

+	end;

+OnTimer180000:

+	if(!isloggedin($MomotaroRID))goto s_Cleanup;

+	mapannounce "ama_test.gat","Timer: 3 Minutes left.",8;

+	end;

+OnTimer300000:

+	if(!isloggedin($MomotaroRID))goto s_Cleanup;

+	mapannounce "ama_test.gat","Timer: 1 Minute left.",8;

+	end;

+OnTimer360000:

+	if(!isloggedin($MomotaroRID))goto s_Cleanup;

+	mapannounce "ama_test.gat","Timer: Beep- Beep- Beep- Time's up.",8;

+OnTimer362500:

+	areawarp "ama_test.gat",30,78,68,120,"amatsu.gat",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;

+	end;

+

+OnCleanUp:

+s_Cleanup:

+	stopnpctimer;

+	set $Momotaro,0;

+	set $MomoDokebi,0;

+	set $MomoDokebi2,0;

+	set $MomotaroRID,0;

+	mapannounce "ama_test.gat","The current player has exited. The waiting room will now open again.",8;

+	disablenpc "Manager#Momotaro";

+	donpcevent "Event Hall Staff::OnInitCopy";

+	end;

+

+OnStopTimer:

+	stopnpctimer;

+	end;

+

+}

+

+ama_test.gat,51,85,0	script	#MomotaroActivator	139,1,1,{

+	if($Momotaro)end;

+	set $Momotaro,1;

+	set $MomotaroRID,getcharid(3);

+	areaannounce "ama_test.gat",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]";

+	mes "Arrrk!!!";

+	next;

+	mes "[Grandma]";

+	mes "Honey!! Someone hacked my account";

+	mes "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...";

+	next;

+	mes "[Grandma]";

+	mes "Dohhhhhhh!!!!";

+	next;

+	mes "[Grandpa]";

+	mes "...Huh I've heard that somewhere";

+	mes "before....";

+	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.";

+	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 ".....I failed to make them ....";

+	next;

+	mes "[Grandma]";

+	mes "...I'm sorry. I should have been";

+	mes "leveling up before...^111111*Sob*";

+	next;

+	mes "[Grandma & Grandpa]";

+	mes "So...Do me this favor, kid~";

+	close2;

+	initnpctimer;

+	end;

+

+OnTimer5000:

+	stopnpctimer;

+	set $MomoDokebi,0;

+	set $MomoDokebi2,0;

+	disablenpc "Grandpa#Momotaro";

+	disablenpc "Grandma#Momotaro";

+	monster "ama_test.gat",47,101,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";

+	monster "ama_test.gat",51,101,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";

+	monster "ama_test.gat",55,101,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";

+	monster "ama_test.gat",55,97,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";

+	monster "ama_test.gat",55,93,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";

+	monster "ama_test.gat",53,91,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";

+	monster "ama_test.gat",49,91,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";

+	monster "ama_test.gat",45,96,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";

+	monster "ama_test.gat",45,99,"Dokebi",1110,1,"mobcount#momotaro::OnMobDead";

+	end;

+

+OnInit:

+	set $Momotaro,0;

+	set $MomoDokebi,0;

+	set $MomoDokebi2,0;

+	set $MomotaroRID,0;

+	end;

+

+}

+

+ama_test.gat,49,95,4	script	Grandpa#Momotaro	766,{

+

+	mes "[Grandpa]";

+	mes "Zzzzzz......";

+	close;

+}

+

+ama_test.gat,51,95,4	script	Grandma#Momotaro	761,{

+

+	mes "[Grandma]";

+	mes "Oh....!?";

+	close;

+

+}

+

+ama_test.gat,50,100,4	script	Manager#Momotaro	762,{

+

+	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!";

+	close2;

+	set $Momotaro,0;

+	set $MomoDokebi,0;

+	set $MomoDokebi2,0;

+	set $MomotaroRID,0;

+	set event_momo,1;

+	donpcevent "Event Hall Staff::OnInitCopy";

+	warp "amatsu.gat",223,230;

+	disablenpc "Manager#Momotaro";

+	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!";

+	initnpctimer;

+	close;

+OnTimer5000:

+	stopnpctimer;

+	if(!isloggedin($MomotaroRID)){ donpcevent "#MomotaroTimer::OnCleanUp"; end; }

+	attachrid($MomotaroRID);

+	monster "ama_test.gat",35,103,"Am Mut",1301,1,"mobcount2#momotaro::OnMobDead";

+	monster "ama_test.gat",56,111,"Am Mut",1301,1,"mobcount2#momotaro::OnMobDead";

+	monster "ama_test.gat",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.gat",223,230;

+	donpcevent "Event Hall Staff::OnInitCopy";

+	disablenpc "Manager#Momotaro";

+	end;

+OnStart:

+	misceffect 215;

+	if(!isloggedin($MomotaroRID)){ donpcevent "#MomotaroTimer::OnCleanUp"; end; }

+	attachrid($MomotaroRID);

+	mes "[Manager]";

+	mes "Hohoho......";

+	close;

+

+}

+//=======================================MobCount===============================-

+ama_test.gat,0,1,0	script	mobcount#momotaro	-1,{

+OnMobDead:

+	if ($MomoDokebi >= 8) goto Lfin;

+	set $MomoDokebi,$MomoDokebi+1;

+	attachrid($MomotaroRID);

+	set @mobrand,rand(4);

+	if (@mobrand == 1) goto Lrand2;

+	if (@mobrand == 2) goto Lrand3;

+	if (@mobrand == 3) goto Lrand4;

+Lrand1:

+	areaannounce "ama_test.gat",30,78,68,120,"Dokebi: I'm sorry~~! Waaaaah~~",8;detachrid;end;

+Lrand2:

+	areaannounce "ama_test.gat",30,78,68,120,"Dokebi: !! IT'S A RAID!!!! RUN!!",8;detachrid;end;

+Lrand3:

+	areaannounce "ama_test.gat",30,78,68,120,"Dokebi: But I didn't even do anything baaaaad~!",8;detachrid;end;

+Lrand4:

+	areaannounce "ama_test.gat",30,78,68,120,"Dokebi: Ow, Ouch!!!",8;detachrid;end;

+Lfin:

+	areaannounce "ama_test.gat",30,78,68,120,"Dokebi: I will be baaack~~~~!!!",8;

+	initnpctimer;

+	end;

+OnTimer5000:

+	donpcevent "mobcount2#momotaro::OnTimer5000";

+	end;

+

+}

+//=======================================MobCount2==============================-

+ama_test.gat,50,101,0	script	mobcount2#momotaro	-1,{

+OnMobDead:

+	if ($MomoDokebi2 == 2) goto Lfin;

+	set $MomoDokebi2,$MomoDokebi2+1;

+	areaannounce "ama_test.gat",30,78,68,120,"Am Mut: Ow, Ouch!!!",8;end;

+Lfin:

+	areaannounce "ama_test.gat",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";

+	end;

+

+}

diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index c1160369e..2684f15f3 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -64,6 +64,7 @@ npc: npc/airports/yuno.txt
 // --------------------------- Quests ---------------------------

 npc: npc/quests/quests_alberta.txt

 npc: npc/quests/quests_aldebaran.txt

+npc: npc/quests/quests_amatsu.txt

 npc: npc/quests/quests_ayothaya.txt

 npc: npc/quests/quests_comodo.txt

 npc: npc/quests/quests_geffen.txt