Updated Ayothaya NPCs, Quests, and Warps.

- Should also fix bugreport:586 (Footprint2 error)


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

5 files changed, 2089 insertions, 1711 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index d48eb4734..ec3ae4daa 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,8 @@
 Date		Added
 ======
+2007/12/13
+	* Rev. 11903 Updated Ayothaya NPCs, Quests, and Warps. [L0ne_W0lf]
+	- Should also fix bugreport:586 (Footprint2 error)
 2007/12/11
 	* Rev. 11886 Updated Amatsu NPCs, Quests, and Warps. [L0ne_W0lf]
 2007/12/09
diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index 0e86b378c..3b2ae908e 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -3,183 +3,237 @@
 //===== By: ================================================== 
 //= MasterOfMuppets
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: ===================================== 
-//= Any eAthena +
+//= eAthena SVN
 //===== Description: ========================================= 
+//= [Aegis Conversion]
 //= Ayothaya Town Scripts
 //===== Additional Comments: ================================= 
-//= 0.1 Added a Sailor NPC to get back to Alberta [ZoDIaC]
-//= 0.2 fixed coords, dialogues
-//= 0.3 Fixed Warp name, ayotaya doesn't exist, even though iRO 
-//= 	decided to call it Ayotaya, it really is Ayothaya, like 
-//=	that Yuno/Juno thing
-//= 0.4 Added the official warp npc for Ayothaya. [MasterOfMuppets]
-//= 1.0 Added most of the official npcs. The following quests were added: [MasterOfMuppets]
-//=     Tom Yum Goong quest, Holy Threads quest and Holier threads quest.
-//= 1.0a some checks, optimization [Lupus]
-//= 1.1 Missing delitem fixed by Poki#3 [Lupus]
-//= 1.1a Fixed a typo and clarified a comment at the bottom of the script [MasterOfMuppets]
-//= 1.2 Fixed exploits [Lupus]
-//= 1.3 Removed Duplicates [Silent]
-//= 1.4 Moved quests to quests/quests_ayothaya.txt [Evera]
-//= 1.5 Moved a few NPC's to quests/quests_ayothaya.txt [MasterOfMuppets]
+//= 1.6 Rescripted to AEgis 10.3 standards. [L0ne_W0lf]
 //============================================================ 
 
-ayothaya,152,68,1	script	Aibakthing#01	843,{
-	mes "[Aibakthing]";
-	mes "Hoo! Hah! Hmm! Hah!";
-	mes "So, how did you like Ayothaya? Did you get a chance to try Tom Yum Goong? When you're ready, I shall take you back home.";
-	next;
-	menu "Go back to Alberta.",-,"Cancel.",s_Cancel;
-
-	mes "[Aibakthing]";
-	mes "You will be welcome to come back whenever you please. I hope that we weill see each other again sometime soon. Thank you~";
-	close2;
-	warp "alberta",235,45;
-	end;	
-s_Cancel:
-	mes "[Aibakthing]";
-	mes "Ah yes. I unsderstand that it is difficult to take leave of such a beautiful place. Do not worry and take your time.";
-	close;
-} 
-
-alberta,247,42,3	script	Aibakthing#02	843,{
+// Ayothaya Transportation NPC
+//============================================================ 
+alberta,247,42,3	script	Aibakthing#ayo	843,{
 	mes "[Aibakthing]";
 	mes "Hoo! Hah! Hoo! Hah!";
-	mes "Let me take you away to a distant spiritual place, a land of exotic mystery, my hometown Ayothaya.";
+	mes "Let me take you away to";
+	mes "a distant spiritual place,";
+	mes "a land of exotic mystery,";
+	mes "my hometown Ayotaya!";
 	next;
-	menu "About Ayothaya",-,"Go to Ayothaya",s_Go,"Cancel.",s_Cancel;
+	switch(select("About Ayotaya.:Go to Ayotaya.:Cancel.")) {
+	case 1:
+		mes "[Aibakthing]";
+		mes "We Ayothayans are a pious people who value peace and sincerity. We endeavor to lead simple, yet noble, lives in harmony with nature.";
+		next;
+		mes "[Aibakthing]";
+		mes "Our traditional cuisine is world famous. It's no surprise when we serve dishes like Tom Yum Goong, made of Shrimp, Lemon and Chillis, which has a tantalizing aroma and flavor beyond imagining.";
+		next;
+		mes "[Aibakthing]";
+		mes "For those who crave adventure, there is an age old story about the Sa-mhing Tiger, an evil creature that haunts our temple ruins.";
+		next;
+		mes "[Aibakthing]";
+		mes "Hoo! Hahh! Hoo! Hahh!";
+		mes "No man alive can resist the";
+		mes "call of this beautiful land.";
+		mes "Rune-Midgardians are";
+		mes "always welcome!";
+		close;
+	case 2:
+		mes "[Aibakthing]";
+		mes "Ah, you must pay 10,000 Zeny";
+		mes "if you wish to visit Ayotaya.";
+		mes "If you're ready, we can leave";
+		mes "right now~";
+		next;
+		if (select("I'm ready, let's go!:No.") == 1) {
+			if (Zeny > 9999) {
+				mes "[Aibakthing]";
+				mes "Hoo! Hah! Hoo! Hah!";
+				mes "Let us be off! Back to my";
+				mes "beautiful Ayotaya!";
+				close2;
+				set zeny,zeny-10000;
+				warp "ayothaya",149,71;
+				end;
+			}
+			mes "[Aibakthing]";
+			mes "I am sorry, but you do not have the 10,000 Zeny to travel to Ayotaya. Such a price is nothing compared to the experiences that await you!";
+			close;
+		}
+		mes "[Aibakthing]";
+		mes "Have you ever dreamed";
+		mes "of a beautiful place filled";
+		mes "with spiritual serenity? You";
+		mes "must have been dreaming";
+		mes "of Ayotaya, my friend.";
+		close;
+	case 3:
+		mes "[Aibakthing]";
+		mes "Have you ever dreamed";
+		mes "of a beautiful place filled";
+		mes "with spiritual serenity? You";
+		mes "must have been dreaming";
+		mes "of Ayotaya, my friend.";
+		close;
+	}
+}
 
+ayothaya,152,68,1	script	Aibakthing#ayo2	843,{
 	mes "[Aibakthing]";
-	mes "We Ayothayans are a pious people who value peace and sincerity. We endeavor to lead simple, yet noble, lives in harmony with nature.";
+	mes "Hoo! Hah! Hmm! Hah!";
+	mes "So, how did you like Ayotaya? Did you get a chance to try Tom Yum Goong? When you're ready, I shall take you back home.";
 	next;
+	if (select("Go back to Alberta.:Cancel.") == 1) {
+		mes "[Aibakthing]";
+		mes "You will be welcome to come back whenever you please. I hope that we will see each other again sometime soon. Thank you~";
+		close2;
+		warp "alberta",235,45;
+		end;
+	}
 	mes "[Aibakthing]";
-	mes "Our traditional cuisine is world famous. It's no surprise when we serve dishes like Tom Yum Goong, made of Shrimp, Lemonade and Chillis, which has a tantalizing aroma and flavor beyond imagining.";
+	mes "Ah yes. I understand that it is difficult to take leave of such a beautiful place. Do not worry";
+	mes "and take your time.";
+	close;
+}
+
+// Generic Ayothaya NPCs
+//============================================================ 
+ayothaya,189,120,3	script	Young Man#Thang	843,{
+	mes "[Thang]";
+	mes "There's an ancient,";
+	mes "dreadful building in";
+	mes "Ayotaya that no one";
+	mes "here dares approach...";
 	next;
-	mes "[Aibakthing]";
-	mes "For those who crave adventure, there is an age old story about the Sa-mhing Tiger, an evil creature that haunts our temple ruins.";
+	mes "[Thang]";
+	mes "In the past, a few curious people went inside, despite the horror stories, and never returned. What on earth could be going on inside of that place?";
 	next;
-	mes "[Aibakthing]";
-	mes "Hoo! Hahh! Hoo! Hahh!";
-	mes "No man alive can resist the call of this beautiful land. Rune-Midgardians are always welcome!";
+	mes "[Thang]";
+	mes "However, if you want to prove your courage to others, confronting the danger inside might be a worthy challenge for an adventurer...";
+	mes "I think.";
 	close;
-s_Cancel:
-	mes "[Aibakthing]";
-	mes "Have you ever dreamed of a beautiful place filled with spiritual serenity? You must have been dreaming of Ayothaya, my friend.";
-	close;
-s_Go:
-	mes "[Aibakthing]";
-	mes "Ah, you must pay 10,000 Zeny";
-	mes "if you wish to visit Ayothaya.";
-	mes "If you're read, we can leave right now~";
-	next;
-	menu "I'm ready, let's go!",-,"No.",s_Cancel;
-
-	if(Zeny < 10000) goto s_NoZeny;
-	mes "[Aibakthing]";
-	mes "Hoo! Hah! Hoo! Hah!";
-	mes "Let us be off! Back to my beautiful Ayothaya!";
-	close2;	
-	set Zeny, Zeny - 10000;
-	warp "ayothaya",150,65;
-	end;
-s_NoZeny:
-	mes "[Aibakthing]";
-	mes "I am sorry, but you do not have the 10,000 Zeny to travel to Ayothaya. Such a price is nothing compared to the experience that await you!";
+}
+	
+ayothaya,171,152,5	script	Girl#Lalitha	838,{
+	set .@sit,rand(1,5);
+	if (.@sit > 0 && .@sit < 3) {
+		mes "[Lalitha]";
+		mes "Hello!";
+		mes "I don't think";
+		mes "we've met before.";
+		next;
+		mes "[Lalitha]";
+		mes "You must be";
+		mes "from Rune-Midgard.";
+		mes "After all, I know every single person living in this village.";
+		mes "Heh heh~";
+		next;
+		mes "[Lalitha]";
+		mes "Hmm...";
+		mes "May I ask about the land you";
+		mes "come from? I'm curious about";
+		mes "a lot of things in the outside world.";
+		next;
+		mes "[Lalitha]";
+		mes "You know, like the dresses and jewelry that ladies wear in other countries, whether or not the men are good looking, what kind of songs you have, what kind of girls that guys over there like...";
+		emotion e_what;
+		next;
+		mes "[" + name + "]";
+		mes ".........";
+		next;
+		mes "[Lalitha]";
+		mes "..........";
+		emotion e_swt;
+		next;
+		mes "[Lalitha]";
+		mes "Okay~!";
+		mes "Take care and";
+		mes "enjoy your travels!";
+		close;
+	}
+	else if (.@sit > 2 && .@sit < 6) {
+		mes "[Lalitha]";
+		mes "When you go East from this";
+		mes "village, you will arrive at the ruins of an old shrine. It is now";
+		mes "a nest full of fearsome monsters.";
+		next;
+		mes "[Lalitha]";
+		mes "If you plan to venture through these ruins, you better prepare";
+		mes "as much as you can!";
+		next;
+		mes "[Lalitha]";
+		mes "Ah...";
+		mes "I wonder where";
+		mes "my Black Knight is~";
+		emotion e_lv;
+		next;
+		mes "["+ name +"]";
+		mes "Don't you mean...";
+		mes "Knight in shining armor";
+		mes "riding a white horse?";
+		next;
+		mes "[Lalitha]";
+		mes "Hmm...?";
+		mes "Oh, well...";
+		mes "I'll take them both!";
+		mes "Hee hee~!";
+		close;
+	}
+	mes "[Lalitha]";
+	mes "Mmm...?";
+	mes "What's up?";
 	close;
 }
-
-ayothaya,143,102,5	script	Old Man#01	842,{
+	
+ayothaya,143,102,5	script	Old Man#ayothaya	842,{
 	mes "[Villager]";
 	mes "Ummm.";
 	mes "Hmmmmm...";
 	mes "Ummmmm...?";
 	next;
 	mes "[Villager]";
-	mes "You must be an outsider.";
+	mes "You must be";
+	mes "an outsider.";
 	mes "Yes. Yes, indeed.";
-	next;	
+	next;
 	mes "[Villager]";
-	mes "Did you just ask where am I going? Why, to the Fishing Spot just ahead. That's what we old men do: fish.";
+	mes "Did you just ask";
+	mes "where am I going?";
+	mes "Why, to the Fishing Spot";
+	mes "just ahead. That's what";
+	mes "we old men do: fish.";
 	next;
 	mes "[Villager]";
 	mes "Hmmm...";
-	mes "Would you like to hear something interesting? I've heard that someone found a ring inside a fish he caught in the Fishing Spot.";
+	mes "Would you like to hear";
+	mes "something interesting? I've heard that someone found a ring inside";
+	mes "a fish he caught in the";
+	mes "Fishing Spot.";
 	next;
 	mes "[Villager]";
-	mes "Supposedly there are lots of stories about people finding valuable inside of the fish they've been catching there.";
+	mes "Supposedly, there are lots of stories about people finding valuables inside of the fish they've been catching there.";
 	next;
 	mes "[Villager]";
-	mes "If you're lucky enough, you might even become a millionaire.";
+	mes "If you're lucky enough,";
+	mes "you might even become";
+	mes "a millionaire.";
 	mes "Heh heh heh~";
 	next;
 	mes "[Villager]";
 	mes "...!?";
-	mes "Ah, I came into the fish market!";
-	mes "^6A6A6A*Sigh*^000000 It seems I went the wrong way. The Fishing Spot is on the opposite side of this village.";
+	mes "Ah, I came into the fish market! ^666666*Sigh*^000000 It seems I went the wrong way. The Fishing Spot is on the opposite side of this village.";
 	next;
 	mes "[Villager]";
-	mes "Since I'm here, it wouldn't be a bad idea to look around. All of the seafood in this market in this market is fresh and tasty. You'll regret if you don't try some of this seafood at least once.";
-	close;
-}
-
-ayo_fild02,25,155,7	script	Aik	843,{
-	mes "[Aik]";
-	mes "So, How was your expedition? I hope that the evil spirits will not follow you outside the ruins, and haunt your dreams.";
-	next;
-	mes "[Aik]";
-	mes "When you go back,";
-	mes "remember to ward off";
-	mes "the evil from your mind.";
-	mes "Otherwise you will encounter";
-	mes "trouble later...";
-	next;
-	mes "[Aik]";
-	mes "So, would you";
-	mes "like to go back?";
-	next;
-	menu "Yes.",s_Yes,"No, I need to look around more...",-;
-
-	mes "[Aik]";
-	mes "I see.";
-	mes "Take care.";
+	mes "Since I'm here, it wouldn't be";
+	mes "a bad idea to look around. All of the seafood in this market is fresh and tasty. You'll regret it if you don't try some of this seafood";
+	mes "at least once.";
 	close;
-s_Yes:
-	mes "[Aik]";
-	mes "Alright then...";
-	mes "Here we go...";
-	next;
-	mes "^3C2EE6He suddenly grabbed you and hurled you up into the air!";	
-	close2;
-	warp "ayo_fild01",115,200;
-	end;
 }
-
-ayothaya,171,152,5	script	Girl	838,{
-	mes "[Lalitha]";
-	mes "When you go East from this village, you will arrive at the ruins of an old shrine. It is now a nest full of fearsome monsters.";
-	next;
-	mes "[Lalitha]";
-	mes "If you plan to venture through these ruins, you better prepare as much as you can!";
-	next;
-	mes "[Lalitha]";
-	mes "Ah...";
-	mes "I wonder where my Black Knight is~";
-	next;
-	mes "[" + strcharinfo(0) + "]";
-	mes "Don't you mean...";
-	mes "Knight in shining armor riding a white horse?";
-	next;
-	mes "[Lalitha]";
-	mes "Hmm...?";
-	mes "Oh, well...";
-	mes "I'll take them both!";
-	mes "Hee hee~!";
-	close;
-}
-
-ayothaya,197,188,5	script	Young Man#01	841,{
+	
+ayothaya,197,189,5	script	Young Man#1ayothaya	841,{
 	mes "[Kwan]";
 	mes "Phew, isn't it";
 	mes "soooo hot today?";
@@ -191,66 +245,69 @@ ayothaya,197,188,5	script	Young Man#01	841,{
 	mes "coming from there recently.";
 	next;
 	mes "[Kwan]";
-	mes "You'de better be really careful if";
-	mes "you travel outside of the village.";
-	mes "Whatever you do, don't go into the ruins of and old shrine in the forest.";
+	mes "You'd better be really careful if you travel outside of the village. Whatever you do, don't go into";
+	mes "the ruins of an old shrine";
+	mes "in the forest.";
 	next;
 	mes "[Kwan]";
-	mes "That place is far too dangerous to visit. Still, I head that if you had some kind of amulet, you could go there with a little less worry...";
+	mes "That place is far too";
+	mes "dangerous to visit. Still, I hear that if you had some kind of amulet, you could go there with";
+	mes "a little less worry...";
 	next;
 	mes "[Kwan]";
-	mes "Well, anyway, it's still a really good idea to stay away from that place. I hope you enjoy visiting Ayothaya, and that keep safe~";
+	mes "Well, anyway, it's still a really good idea to stay away from that place. I hope you enjoy visiting Ayotaya, and that you keep safe~";
 	close;
 }
-
-ayothaya,241,264,5	script	Young Man#02	843,{
-
+	
+ayothaya,214,142,5	script	Young Man#5ayothaya	843,{
+	mes "[Detzi]";
+	mes "In Ayotaya, we have our own traditional martial arts. We, the young men of the village, practice our traditional martial arts in order to become strong.";
+	next;
+	mes "[Detzi]";
+	mes "Why don't you learn our martial arts? I guarantee that it will help you greatly in your travels.";
+	close;
+}
+	
+ayothaya,241,264,5	script	Young Man#5ayothaya2	843,{
 	mes "[Eik]";
 	mes "Hey...";
 	mes "You look pretty strong";
 	mes "You wanna challenge";
 	mes "me to a match?";
 	next;
-	menu "Sure!",s_Sure,"Nah~",-;
-
+	if (select("Sure!:Nah~") == 1) {
+		mes "[Eik]";
+		mes "Ow ow ow!";
+		mes "I was just";
+		mes "kidding, man!";
+		next;
+		mes "[Eik]";
+		mes "I'm not so rude as to pick fights with strangers for no reason!";
+		emotion e_wah;
+		close;
+	}
 	mes "[Eik]";
 	mes "Real power is developed after having thousands of matches with other people. So, don't be afraid of fighting, okay?";
-	close;
-
-s_Sure:
-	mes "[Eik]";
-	mes "Ow ow ow!";
-	mes "I was just";
-	mes "kidding, man!";
-	next;
-	mes "[Eik]";
-	mes "I'm not so rude as to pick fights";
-	mes "with strangers for no reason!";
+	emotion e_pif;
 	close;
 }
 
-ayothaya,213,142,5	script	Young Man#03	843,{
-	mes "[Detzi]";
-	mes "In Ayothaya, we have our own traditional martial arts. We, the young men of the village, practice our traditional martial arts in order to become strong.";
-	next;
-	mes "[Detzi]";
-	mes "Why don't you learn our martial arts? I guarantee that it will help you greatly in you travels.";
-	close;
-}
-
-ayo_dun01,25,271,4	script	#ayokillscript	139,1,1,{
-	percentheal -100,0;
-	end;
-}
-
-ayo_dun01,25,274,4	duplicate(#ayokillscript)	#ayodupe4	139,1,1
-ayo_dun01,28,274,4	duplicate(#ayokillscript)	#ayodupe5	139,1,1
-ayo_dun01,28,271,4	duplicate(#ayokillscript)	#ayodupe6	139,1,1
-ayo_dun01,25,28,4	duplicate(#ayokillscript)	#ayodupe7	139,1,1
-ayo_dun01,25,25,4	duplicate(#ayokillscript)	#ayodupe8	139,1,1
-ayo_dun01,28,25,4	duplicate(#ayokillscript)	#ayodupe9	139,1,1
-ayo_dun01,28,28,4	duplicate(#ayokillscript)	#ayodupe10	139,1,1
-ayo_dun01,271,274,4	duplicate(#ayokillscript)	#ayodupe11	139,1,1
-ayo_dun01,271,271,4	duplicate(#ayokillscript)	#ayodupe12	139,1,1
-ayo_dun01,274,271,4	duplicate(#ayokillscript)	#ayodupe13	139,1,1
-ayo_dun01,274,274,4	duplicate(#ayokillscript)	#ayodupe14	139,1,1
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 0.1 Added a Sailor NPC to get back to Alberta [ZoDIaC]
+//= 0.2 fixed coords, dialogues
+//= 0.3 Fixed Warp name, ayotaya doesn't exist, even though iRO 
+//= 	decided to call it Ayotaya, it really is Ayothaya, like 
+//=	that Yuno/Juno thing
+//= 0.4 Added the official warp npc for Ayothaya. [MasterOfMuppets]
+//= 1.0 Added most of the official npcs. The following quests were added: [MasterOfMuppets]
+//=     Tom Yum Goong quest, Holy Threads quest and Holier threads quest.
+//= 1.0a some checks, optimization [Lupus]
+//= 1.1 Missing delitem fixed by Poki#3 [Lupus]
+//= 1.1a Fixed a typo and clarified a comment at the bottom of the script [MasterOfMuppets]
+//= 1.2 Fixed exploits [Lupus]
+//= 1.3 Removed Duplicates [Silent]
+//= 1.4 Moved quests to quests/quests_ayothaya.txt [Evera]
+//= 1.5 Moved a few NPC's to quests/quests_ayothaya.txt [MasterOfMuppets]
+//============================================================ 
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index 0a13ab861..955281e55 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -3,26 +3,18 @@
 //===== By ===================================================
 //= Fredzilla, MasterOfMuppets
 //===== Version ==============================================
-//= 1.9
+//= 2.0
 //===== Compatible With ======================================
-//= eAthena 1.0
+//= eAthena SVN
 //===== Description ==========================================
-//= Ayothaya Ring Quest, Ayothaya Shrimp Quest, Ayothaya
-//= Dungeon Quest, Tom Yum Goong Quest,
+//= [Aegis Conversion]
+//= Ayothaya Ring Quest
+//= Ayothaya Dungeon Quest
+//= Tom Yum Goong Quest
 //===== Comments =============================================
-//= List or Variables used
-//= @fishing - 	Checks for if you have caught a fish or not, 
-//=	       	1/10 chance you will get the wedding ring if 
-//=		you have started that quest.
-//= weddingring - Signifies the start of the wedding ring 
-//=               quest, and used throughout to keep track of 
-//=               progress.
-//= recoveredring - Signifies you have retrieved the ring 
-//=		    and therefore can't just drop the ring and 
-//=		    get the same quest again.
-//= 1.0 - First Release, made with infomation from RagnaInfo
-//= 1.1 - added anti-novice protection [Lupus]
-//= 1.3 - Fixed exploit [Lupus]
+//= 1.0 First Release, made with infomation from RagnaInfo
+//= 1.1 Added anti-novice protection [Lupus]
+//= 1.3 Fixed exploit [Lupus]
 //= 1.4 Updated, more close to the official. Thanks to birkiczd
 //=	Also optimized it again, remove unused global variable [Lupus]
 //= 1.5 Removed Duplicates [Silent]
@@ -31,11 +23,12 @@
 //= 1.7 Updated the Ayothaya Ring quest to the official one [MasterOfMuppets]
 //= 1.8 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.9 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 2.0 Rescripted Tom Yum Goong and Dungeon quest to Aegis [L0ne_W0lf]
+//=	10.3 standards.
 //============================================================
 
+// Ayothaya Ring Quest
 //============================================================
-//============================================== Ayothaya Ring
-//====================================================== Quest
 ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 
 	if(thai_find == 14)
@@ -1121,7 +1114,7 @@ OnTouch:
 	
 }
 	
-ayo_dun01,74,132,0	script	AyoFootprint2	139,2,0,{
+ayo_dun01,74,142,0	script	AyoFootprint2	139,2,0,{
 OnTouch:
 	if(thai_find == 5)
 	{
@@ -1400,921 +1393,939 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 	
 }
 
+// Ayothaya Dungeon Quest
 //============================================================
-//============================================ Ayothaya Shrimp
-//====================================================== Quest
-ayothaya,203,169,3	script	Noi	839,{
-	mes "[Noi]";
-	mes "Welcome to Ayothaya.";
-	mes "Out beautiful village is built above the water, surrounded by a dense forest.";
-	next;
-	mes "[Noi]";
-	mes "There are many tourist attractions in this village, that you won't be able to find anywhere else. Out fish markets and the unique architecture of our buildings is enough reason to visit Ayothaya.";
-	next;
-	mes "[Noi]";
-	mes "Please feel free";
-	mes "to take a look around.";
-	next;
-	menu "Building Locations.",s_Loc,"Remove marks from mini-map.",s_Remo,"Cancel.",-;
-
-	mes "[Noi]";
-	mes "Please enjoy";
-	mes "your travels.";
-	close;
-s_Loc:
-	mes "[Noi]";
-	mes "Where would";
-	mes "you like to visit?";
-	next;
-	menu "Weapon Shop",s_Weap,"Tool Shop",s_Tool,"Tavern",s_Tavern,"Shrine",s_Shrine,"Fishing Spot",s_Fish,"Cancel",-;
-
-	mes "[Noi]";
-	mes "If you wish to remove location marks on your mini-map, please select the 'Remove marks from mini-map' command from the menu.";
-	close;
-
-s_Weap:
-	mes "[Noi]";
-	mes "At our Weapon Shop,";
-	mes "you will find great weapons favored by brave Ayothayan seafarers.";
-	next;
-	mes "[Noi]";
-	mes "Our weapon shop is located at ^00FF00+^000000.";
-	viewpoint 1,166,90,1,0x00FF00;
-	close;
-
-s_Tool:
-	mes "[Noi]";
-	mes "We Ayothayans always make sure we have everything we need before we go traveling. It never hurts to be prepared, does it?";
-	next;
-	mes "[Noi]";
-	mes "Our Tool Shop";
-	mes "is located at ^0000FF+^000000.";
-	viewpoint 1,128,86,2,0x0000FF;
-	close;
-
-s_Tavern:
-	mes "[Noi]";
-	mes "One of the basics of adventuring is gathering information, or at least that's what they say. You can meet people from all sorts of places in the Tavern. I'm sure you can earn something useful there.";
-	next;
-	mes "[Noi]";
-	mes "Of course, you must";
-	mes "drop by our Tavern.";
-	mes "It is located at ^FFFF00+^000000.";
-	viewpoint 1,229,70,3,0xFFFF00;
-	close;
-
-s_Shrine:
-	mes "[Noi]";
-	mes "If you wish to pray to God, or achieve a state of peace in your mind, why don't you visit our Shrine? Even if it's just for sight-seeing, everyone is welcome there.";
-	next;
-	mes "[Noi]";
-	mes "Our shrine";
-	mes "is located at^880088+^000000.";
-	viewpoint 1,207,284,4,0x880088;
-	close;
-s_Fish:
-	mes "[Noi]";
-	mes "Since Ayothaya was built above the surface of the water and so close to a beach, it's been a favorite spot for fishermen. Why don't you catch some for dinner at the Fishing Spot?";
-	next;
-	mes "[Noi]";
-	mes "Our famous";
-	mes "Fishing Spot";
-	mes "is located at ^AFAFAF+^000000.";
-	viewpoint 1,251,97,5,0xAFAFAF;
-	close;
-s_Remo:
-	viewpoint 2,166,90,1,0x00FF00;
-	viewpoint 2,128,86,2,0x0000FF;
-	viewpoint 2,229,70,3,0xFFFF00;
-	viewpoint 2,207,284,4,0x880088;
-	viewpoint 2,251,97,5,0xAFAFAF;
-	mes "[Noi]";
-	mes "Alright...";
-	mes "I've removed all the location marks from your mini-map.";
-	mes "Thank you.";
-	close;
-}
-
-ayothaya,153,86,4	script	Thongpool	843,{
-	if(ayoshrimps == 1)goto s_Shrimp2;
-	if(tomyumgoong == 2)goto s_Shrimp;
-	mes "[Thongpool]";
-	mes "Welcome, welcome!";
-	mes "I've got the best Shrimp caught in the cleanest waters in the world~!";
-	close;
-s_Shrimp:
-	mes "[Thongpool]";
-	mes "Come adventurers,";
-	mes "take a look! I have";
-	mes "plenty of Shrimp!";
-	next;
-	mes "[Thongpool]";
-	mes "You're looking for Shrimp,";
-	mes "aren't you? How many Shrimps";
-	mes "do you need? Twenty Forty?";
-	next;
-	menu "I need Shrimp for Tom Yum Goong.",s_Tom,"Err, they look expensive.",-;
-
-	mes "[Thongpool]";
-	mes "What...?";
-	mes "Do you think";
-	mes "it's expensive?";
-	mes "But the fantastic taste";
-	mes "of Tom Yum Goong";
-	mes "is priceless!";
-	close;
-s_Tom:
-	mes "[Thongpool]";
-	mes "Ah! I guess Ms. Mali the Spicy recommended me to you. I guess that also means you want to buy them in bulk?";
-	next;
-	mes "[Thongpool]";
-	mes "After all,";
-	mes "you'll need a larger";
-	mes "amount of Shrimp to";
-	mes "cook Tom Yum Goong.";
-	next;
-	mes "[Thongpool]";
-	mes "Oh yes, you will need 20 Shrimps for Ms. Mali's Tom Yum Goong.";
-	mes "I even give you a discount:";
-	mes "11,000 zeny for 20 shrimps.";
-	mes "What do you say?";
-	next;
-	menu "I'll take them.",s_Take,"I could get 100 Jellopies for that much!",-;
-
-	mes "[Thongpool]";
-	mes "Well well well...";
-	mes "You might your hungry stomach with that many Jellopies but they wouldn't taste as good as my Shrimp!";
-	close;
-
-s_Take:
-	if(Zeny < 11000) goto s_NoZeny;
-	set Zeny, Zeny - 11000;
-	getitem 567,20; //Shrimp
-	emotion e_no1;
-	mes "[Thongpool]";
-	mes "Good, now you have the freshest Shrimp in this village!";
-	mes "It's time for you to go back and ask Ms. Mali to cook them for you.";
-	if(ayoshrimps < 1)set ayoshrimps,1;
-	close;
-
-s_NoZeny:
-	mes "[Thongpool]";
-	mes "Awww...";
-	mes "You don't have";
-	mes "enough money.";
-	close;
-
-s_Shrimp2:
-	mes "[Thongpool]";
-	mes "Mmm...?";
-	mes "Did you need more Shrimps?";
-	mes "Would you like to buy more?";
-	next;
-	menu "Yes!",s_Take,"No, thanks.",-;
-
-	mes "[Thongpool]";
-	mes "I see...";
-	mes "If you need some shrimps, just tell me!";
-	close;
-}
-
-//============================================================
-//=========================================== Ayothaya Dungeon
-//====================================================== Quest
-ayothaya,83,132,7	script	Dusit	843,{
-	if(ayodunquest == 1 || ayodunquest == 2 || ayodunquest == 3)goto s_Dun;
-	mes "[Dusit]";
-	mes "Oh...!";
-	mes "You must be a traveller.";
-	mes "I have a tale you may wish to hear if you're interested in listening.";
-	next;
-	menu "What is it?",s_What,"I know what the story is.",-;
-
-	mes "[Dusit]";
-	mes "You do now?";
-	mes "Then be careful!";
-	mes "It'll eat you alive!";
-	close;
-s_What:
-	mes "[Dusit]";
-	mes "Ayothaya has a long history. Perhaps it looks calm and peaceful now, but in the past our village was terrorized bu a terrible creature.";
-	next;
-	mes "[Dusit]";
-	mes "This beast is known to us as the ^6B1312Sa-mhing Tiger^000000, which used to dwell deep in the ancient ruins.";
-	next;
-	mes "[Dusit]";
-	mes "The Sa-mhing Tiger is addicted to the taste of human flesh. It has been known to transform into the shape of a person it has eaten in order to lure out his family and friends.";
-	next;
-	mes "[Dusit]";
-	mes "The local people are still afraid that the creature might transform into someone they know, and sneak into their homes to eat them.";
-	next;
-	mes "[Dusit]";
-	mes "However there is one way you can identify the Sa-mhing Tiger from a human being. Since it's a tiger, it cannot do some of the things humans are taught to do, such as light a match.";
-	next;
-	mes "[Dusit]";
-	mes "So, if by chance you see a friend acting strangely all of a sudden, ask him to strike a match. Make sure he is not the Sa-mhing Tiger.";
-	next;
-	mes "[Dusit]";
-	mes "However...";
-	mes "I'm not sure if this actually works or not. I guess the best thing to do is just run for your life if you even suspect someone of being the Sa-mhing Tiger.";
-	next;
-	mes "[Dusit]";
-	mes "Do you blieve";
-	mes "in the existance";
-	mes "of man-eating tigers?";
-	next;
-	menu "Well, not really.",-,"Yes, I do and I think they're scary!",s_Yes;
-
-	mes "[Dusit]";
-	mes "Umm...";
-	mes "Oh well. My late grandfather told me about the Sa-mhing Tiger when I was a little kid. Of course, I haven't seen it.";
-	next;
-	mes "[Dusit]";
-	mes "The closest thing I've seen to the Sa-mhing Tiger was a golden cat with a bell. Somehow, I don't think it ate men.";
-	close;
-s_Yes:
-	mes "[Dusit]";
-	mes "Run for your life if you ever encounter the Sa-mhing Tiger! It'll eat you alive!";
-	next;
-	mes "[Dusit]";
-	mes "If you're interested in finding more about the story, I can introduce you to someone who knows that creature more than anyone else.";
-	next;
-	mes "[Dusit]";
-	mes "Why don't you talk to Boonthom? He's a pretty strange person, but there's something about him...";
-	next;
-	mes "[Dusit]";
-	mes "...";
-	mes "......";
-	next;
-	mes "[Dusit]";
-	mes "Ah well, you'll see what I'm talking about. I hope he'll help you learn more about that evil creature.";
-	set ayodunquest,1;
-	close;
-s_Dun:
-	mes "[Dusit]";
-	mes "How are you?";
-	mes "If you're interested in the Sa-mhing Tiger, please to talk to Boonthom.";
-	next;
-	mes "[Dusit]";
-	mes "But beware!";
-	mes "The Sa-mhing Tiger might be closer to you than you expect!";
-	close;
+ayothaya,83,132,0	script	Dusit#thai	843,{
+	if (ayodunquest == 0) {
+		mes "[Dusit]";
+		mes "Oh...!";
+		mes "You must be a traveller.";
+		mes "I have a tale you may wish to hear if you're interested in listening.";
+		next;
+		if (select("What is it?:I know what the story is.") == 1) {
+			mes "[Dusit]";
+			mes "Ayothaya has a long history. Perhaps it looks calm and peaceful now, but in the past our village was terrorized by a terrible creature.";
+			next;
+			mes "[Dusit]";
+			mes "This beast is known to us as";
+			mes "the ^660000Sa-mhing Tiger^000000, which used";
+			mes "to dwell deep in the ancient ruins.";
+			next;
+			mes "[Dusit]";
+			mes "The Sa-mhing Tiger is addicted";
+			mes "to the taste of human flesh. It has been known to transform into the shape of a person it has eaten in order to lure out his family and friends.";
+			next;
+			mes "[Dusit]";
+			mes "The local people are still afraid that the creature might transform into someone they know, and sneak into their homes to eat them.";
+			next;
+			mes "[Dusit]";
+			mes "However, there is one way you can identify the Sa-mhing Tiger from a human being. Since it's a tiger, it cannot do some of the things";
+			mes "humans are taught to do,";
+			mes "such as light a match.";
+			next;
+			mes "[Dusit]";
+			mes "So, if by any chance you see";
+			mes "a friend acting strangely all";
+			mes "of a sudden, ask him to strike";
+			mes "a match. Make sure he is not";
+			mes "the Sa-mhing Tiger.";
+			next;
+			mes "[Dusit]";
+			mes "However...";
+			mes "I'm not sure if this actually works or not. I guess the best thing to do is just run for your life if you even suspect someone of being";
+			mes "the Sa-mhing Tiger.";
+			next;
+			mes "[Dusit]";
+			mes "Do you believe";
+			mes "in the existance";
+			mes "of man-eating tigers?";
+			next;
+			if (select("Well, not really.:Yes, I do and I think they're scary!") == 1) {
+				mes "[Dusit]";
+				mes "Umm...";
+				mes "Oh well. My late grandfather told me about the Sa-mhing Tiger when";
+				mes "I was a little kid. Of course,";
+				mes "I haven't seen it.";
+				next;
+				mes "[Dusit]";
+				mes "The closest thing I've seen to the Sa-mhing Tiger was a golden cat with a bell. Somehow, I don't think it ate men.";
+				close;
+			}
+			mes "[Dusit]";
+			mes "Run for your life if you ever encounter the Sa-mhing Tiger!";
+			mes "It'll eat you alive!";
+			next;
+			mes "[Dusit]";
+			mes "If you're interested in finding";
+			mes "out more about the story, I can introduce you to someone who";
+			mes "knows that creature more than";
+			mes "anyone else.";
+			next;
+			mes "[Dusit]";
+			mes "Why don't you talk to Boonthom? He's a pretty strange person, but there's something about him...";
+			next;
+			mes "[Dusit]";
+			mes "...";
+			mes "......";
+			next;
+			mes "[Dusit]";
+			mes "Ah well, you'll see what I'm talking about. I hope he'll help you learn more about that evil creature.";
+			set ayodunquest,1;
+			close;
+		}
+		mes "[Dusit]";
+		mes "You do now?";
+		mes "Then be careful!";
+		mes "It'll eat you alive!";
+		close;
+	}
+	else if (ayodunquest > 0) {
+		mes "[Dusit]";
+		mes "How are you?";
+		mes "If you're interested";
+		mes "in the Sa-mhing Tiger,";
+		mes "please go talk to Boonthom.";
+		next;
+		mes "[Dusit]";
+		mes "But beware!";
+		mes "The Sa-mhing Tiger might be";
+		mes "closer to you than you expect!";
+		close;
+	}
 }
 
-ayo_in01,181,193,4	script	Shaman	840,{
-	if(ayodot == 8)goto s_Check2;
-	if(ayodot == 7 && countitem(7285) > 0)goto s_ICheck;
-	if(ayodot == 6 && countitem(7285) > 0)goto s_Holier;
-	if(ayodunquest == 3)goto s_Lose;
-	if(ayodunquest == 2)goto s_Items;
-	if(ayodunquest == 1)goto s_Quest;
-	mes "[Boonthom]";
-	mes "I'm sorry I can't talk to you.";
-	mes "I'm very busy right now.";
-	close;	
-s_Quest:
-	mes "[Boonthom]";
-	mes "You...!";
-	mes "Isn't it...!";
-	mes "Ooooooohhhhhhh!";
-	next;
-	mes "[Boonthom]";
-	mes "Oh...?";
-	next;
-	mes "[Boonthom]";
-	mes "...";
-	next;
-	mes "[Boonthom]";
-	mes "...";
-	mes "......";
-	next;
-	mes "[Boonthom]";
-	mes "...";
-	mes "......";
-	mes ".........";
-	next;
-	mes "[Boonthom]";
-	mes "Never mind.";
-	mes "Hah! I've lost my train of thought.";
-	next;
-	mes "[Boonthom]";
-	mes "So have you come to me to seek help? I can see the fear in your eyes. Let me gaze into your soul, and see what your fear is for myself. Hmmm...";
-	next;
-	mes "[Boonthom]";
-	mes "...";
-	next;
-	mes "[Boonthom]";
-	mes "...";
-	mes "......";
-	next;
-	mes "[Boonthom]";
-	mes "...";
-	mes "......";
-	mes ".........";
-	next;
-	mes "[Boonthom]";
-	mes "What...!";
-	mes "I see that you dread the Sa-mhing Tiger! I haven't heard any news of that monster for a long time...";
-	next;
-	mes "[Boonthom]";
-	mes "A long time ago, the Sa-mhing Tiger really did roam the village and ate innocent people.";
-	next;
-	mes "[Boonthom]";
-	mes "However, its terror was brought to an end when it was finally captured. I was one of those involved in capturing the Sa-mhing Tiger.";
-	next;
-	mes "[Boonthom]";
-	mes "I insisted on killing it, but the other people were too afraid to do so. Instead, the Sa-mhing Tiger was locked in a cave inside of the ancient ruins.";
-	next;
-	mes "[Boonthom]";
-	mes "I believe that was at least 10 years ago. Perhaps it's already dead by now. However, no one knows how powerful the tiger truly is. It may still be alive.";
-	next;
-	mes "[Boonthom]";
-	mes "I don't think we need to worry about it though. It is locked up and there it shall remain.";
-	next;
-	menu "I want to explore the ancient ruins.",s_Explore,"Locked up! Good! I'm not afraid!",-;
-
-	mes "[Boonthom]";
-	mes "Hmmm...";
-	mes "Not afraid";
-	mes "of it, are you?";
-	next;
-	mes "[Boonthom]";
-	mes "..........";
-	mes "..........";
-	close;
-s_Explore:
-	mes "[Boonthom]";
-	mes "You...";
-	mes "You are strange.";
-	mes "You want to explore the ancient ruins. Do all the adventurers disregard their safety like that?";
-	next;
-	mes "[Boonthom]";
-	mes "It's your choice. But remember, it is very dangerous to go through the path to the center of the building.";
-	mes "Usually, I forbid it.";
-	next;
-	mes "[Boonthom]";
-	mes "But if you want to go in, I can give you some useful tips.";
-	mes "Would you like to listen?";
-	next;
-	menu "If it's that dangerous I'd rather not try",-,"Sure!",s_Sure;
-
-	mes "[Boonthom]";
-	mes "You made a good decision.";
-	mes "You'd better be careful if you want to stay alive.";
-	close;
-s_Sure:
-	mes "[Boonthom]";
-	mes "Umm, okay.";
-	mes "Since you're";
-	mes "that interested...";
-	next;
-	mes "[Boonthom]";
-	mes "If you wish to enter the ancient building, you must have protection against evil spirits and malice.";
-	next;
-	mes "[Boonthom]";
-	mes "There are many ghosts and demons within the cave, and they will attack people who do not possess holy power... Like you.";
-	next;
-	mes "[Boonthom]";
-	mes "I can make you an object";
-	mes "containing this holy power if you wish. In order to make it, I will need some materials.";
-	next;
-	mes "[Boonthom]";
-	mes "^4466771 Needle Packet^000000,";
-	mes "^4466771 Spool^000000,";
-	mes "^4466771 Solid Husk^000000 and";
-	mes "^4466771 Holy Water^000000...";
-	mes "That's all I need.";
-	next;
-	mes "[Boonthom]";
-	mes "Please come back";
-	mes "when you prepare all the materials.";
-	set ayodunquest,2;
-	close;
-
-s_Items:
-	if(countitem(7213) < 1 || countitem(7217) < 1 || countitem(7190) < 1 || countitem(523) < 1)goto s_NoItems; //Pin Cusion, Spool, Hard Back Shell, Holy Water
-	delitem 7213,1; //Pin Cusion
-	delitem 7217,1; //Spool
-	delitem 7190,1; //Hard Back Shell
-	delitem 523,1; //Holy Water
-	mes "[Boonthom]";
-	mes "Excellent!";
-	mes "Now you have brought everything I need. Let me make the thing for you as promised...";
-	next;
-	mes "[Boonthom]";
-	mes "Ooooohmmmmm...";
-	next;
-	mes "[Boonthom]";
-	mes "Hmmmmmm...";
-	mes "Hmmmmmmmmm.";
-	next;
-	mes "[Boonthom]";
-	mes "Pffff pffff...";
-	next;
-	set ayodunquest,3;
-	getitem 7285,1; //Holy Threads
-	mes "[Boonthom]";
-	mes "Here you go.";
-	mes "Please take these holy threads.";
-	mes "With this, you will be able to enter the ruins with less worry.";
-	next;
-	mes "[Boonthom]";
-	mes "Even if you lose this, don't worry.";
-	mes "Just bring me the materials, and I will make you another one.";
-	next;
-	mes "[Boonthom]";
-	mes "The ancient building consists of 2 levels. Before you enter the 2nd underground level, please return to me so that I can tell you how to enter that place.";
-	close;
-
-s_NoItems:
-	mes "[Boonthom]";
-	mes "Did you forget what materials you need to create my object of holy power? Please listen carefully this time.";
-	next;
-	mes "[Boonthom]";
-	mes "^4466771 Needle Packet^000000,";
-	mes "^4466771 Spool^000000,";
-	mes "^4466771 Solid Husk^000000 and";
-	mes "^4466771 Holy Water^000000.";
-	next;
-	mes "[Boonthom]";
-	mes "See you later.";
-	close;
-
-s_Lose:
-	if(countitem(7285) > 0)goto s_NoItems2;
-	if(countitem(7213) < 1 || countitem(7217) < 1 || countitem(7190) < 1 || countitem(523) < 1)goto s_NoItems2; //Pin Cusion, Spool, Hard Back Shell, Holy Water
-	//Custom Dialogues
-	mes "[Boonthom]";
-	mes "Oh, you have all the items I require to make holy threads.";
-	next;
-	mes "[Boonthom]";
-	mes "Would you like to make one?";
-	next;
-	menu "Yes please.",s_Yes,"No I'm fine.",-;
-	
-	mes "[Boonthom]";
-	mes "See you later then.";
-	close;
-s_Yes:
-	if(countitem(7213) < 1 || countitem(7217) < 1 || countitem(7190) < 1 || countitem(523) < 1)goto s_NoItems2; //Pin Cusion, Spool, Hard Back Shell, Holy Water
-	delitem 7213,1; //Pin Cusion
-	delitem 7217,1; //Spool
-	delitem 7190,1; //Hard Back Shell
-	delitem 523,1; //Holy Water
-	getitem 7285,1; //Holy Threads
-	mes "[Boonthom]";
-	mes "All right, here are your holy threads.";
-	mes "If you lose them, I'm still here to make some more.";
-	next;
-	mes "[Boonthom]";
-	mes "Good luck venturing down the dungeon.";
-	close;
-
-s_NoItems2:
-	mes "[Boonthom]";
-	mes "If you lose the holy threads, don't worry. I can make some more for you. Just gather the following items.";
-	next;
-	mes "[Boonthom]";
-	mes "^4466771 Needle Packet^000000,";
-	mes "^4466771 Spool^000000,";
-	mes "^4466771 Solid Husk^000000 and";
-	mes "^4466771 Holy Water^000000.";
-	next;
-	mes "[Boonthom]";
-	mes "See you later.";
-	close;
-s_Holier:
-	mes "[" + strcharinfo(0) + "]";
-	mes "I copied down this";
-	mes "message while exploring";
-	mes "the dungeon. Would you";
-	mes "take a look at this?";
-	next;
-	mes "[Stone Slate]";
-	mes "Do not enter the";
-	mes "2nd underground level";
-	mes "...is danger... You will";
-	mes "...encounter... tiger...";
-	next;
-	mes "[Stone Slate]";
-	mes "You must kill... In order to do...";
-	mes "Must... How to go... the 2nd";
-	mes "underground level...";
-	mes "You need more... Holy power... in";
-	mes "order to... Otherwise, it's";
-	mes "impossible...";
-	next;
-	mes "[Boonthom]";
-	mes "That was written by one of my";
-	mes "comrades who entered the ruins,";
-	mes "as he regretted letting the tiger";
-	mes "live, let it return";
-	next;
-	mes "[Boonthom]";
-	mes "If you were able to find this note,";
-	mes "you must have strong determination";
-	mes "to venture through the ruins.";
-	next;
-	mes "[Boonthom]";
-	mes "As you can guess from the";
-	mes "note, the 2nd underground level is";
-	mes "very very dangerous. You will need";
-	mes "holy threads that contains even more";
-	mes "holy protection.";
-	next;
-	mes "[Boonthom]";
-	mes "Now, go and gather some materials";
-	mes "so that I can create more powerful";
-	mes "holy threads for you.";
-	next;
-	mes "[Boonthom]";
-	mes "^4466772 Holy Water^000000,";
-	mes "^4466771 Yggdrasil Leaf^000000,";
-	mes "^4466772 Needle Packet^000000 and";
-	mes "^4466772 Spool^000000.";
-	next;
-	mes "[Boonthom]";
-	mes "Return to me";
-	mes "once you have";
-	mes "gathered everything.";
-	set ayodot,7;
-	close;
-s_ICheck:	
-	if(countitem(523) < 2 || countitem(610) < 1 || countitem(7213) < 2 || countitem(7217) < 2)goto s_NEnoughItems;
-	if(ayodot == 8)goto s_Process;
-	mes "[Boonthom]";
-	mes "Hmmm~";
-	mes "You've brought";
-	mes "everything. Quite";
-	mes "the enthusiastic one,";
-	mes "aren't you?";
-	next;
+ayo_in01,181,193,4	script	Shaman#thai	840,{
+	if (ayodunquest == 1) {
+		mes "[Boonthom]";
+		mes "You...!";
+		mes "Isn't it....!";
+		mes "Oooooohhhhhhh!";
+		next;
+		mes "[Boonthom]";
+		mes "Oh...?";
+		next;
+		mes "[Boonthom]";
+		mes "...";
+		next;
+		mes "[Boonthom]";
+		mes "...";
+		mes "......";
+		next;
+		mes "[Boonthom]";
+		mes "...";
+		mes "......";
+		mes ".........";
+		next;
+		mes "[Boonthom]";
+		mes "Never mind.";
+		mes "Hah! I've lost my";
+		mes "train of thought.";
+		next;
+		mes "[Boonthom]";
+		mes "So have you come to me to seek help? I can see the fear in your eyes. Let me gaze into your soul, and see what your fear is for myself. Hmmm...";
+		next;
+		mes "[Boonthom]";
+		mes "...";
+		next;
+		mes "[Boonthom]";
+		mes "...";
+		mes "......";
+		next;
+		mes "[Boonthom]";
+		mes "...";
+		mes "......";
+		mes ".........";
+		next;
+		mes "[Boonthom]";
+		mes "What...!";
+		mes "I see that you dread the Sa-mhing Tiger! I haven't heard any news of that monster for a long time...";
+		next;
+		mes "[Boonthom]";
+		mes "A long time ago,";
+		mes "the Sa-mhing Tiger";
+		mes "really did roam the village";
+		mes "and ate innocent people.";
+		next;
+		mes "[Boonthom]";
+		mes "However, its terror";
+		mes "was brought to an end when it";
+		mes "was finally captured. I was one of those involved in capturing the Sa-mhing Tiger.";
+		next;
+		mes "[Boonthom]";
+		mes "I insisted killing on it, but the other people were too afraid to do so. Instead, the Sa-mhing Tiger";
+		mes "was locked in a cave inside of the ancient ruins.";
+		next;
+		mes "[Boonthom]";
+		mes "I believe that was at least 10 years ago. Perhaps it's already dead by now. However, no one";
+		mes "knows how powerful the tiger truly";
+		mes "is. It may still be alive.";
+		next;
+		mes "[Boonthom]";
+		mes "I don't think we need to worry about it though. It is locked up and there it shall remain.";
+		next;
+		switch(select("I want to explore the ancient ruins.:Locked up! Good! I'm not afraid!")) {
+		case 1:
+			mes "[Boonthom]";
+			mes "You...";
+			mes "You are strange.";
+			mes "You want to explore the ancient ruins. Do all adventurers disregard their safety like that?";
+			next;
+			mes "[Boonthom]";
+			mes "It's your choice. But remember, it is very dangerous to go through the path to the center of the building. Usually, I forbid it.";
+			next;
+			mes "[Boonthom]";
+			mes "But if you want to go in,";
+			mes "I can give you some useful tips.";
+			mes "Would you like to listen?";
+			next;
+			if (select("If it's that dangerous, I'd rather not try.:Sure!") == 1) {
+				mes "[Boonthom]";
+				mes "You made a good decision.";
+				mes "You'd better be careful if";
+				mes "you want to stay alive.";
+				close;
+			}
+			mes "[Boonthom]";
+			mes "Umm, okay.";
+			mes "Since you're";
+			mes "that interested...";
+			next;
+			mes "[Boonthom]";
+			mes "If you wish to enter the ancient building, you must have protection against evil spirits and malice.";
+			next;
+			if (Class == Job_Priest || Class == Job_Acolyte || Class == Job_Crusader) {
+				mes "[Boonthom]";
+				mes "Even if you can";
+				mes "wield the power of";
+				mes "holiness, you will still need the spiritual security of our land.";
+			}
+			else {
+				mes "[Boonthom]";
+				mes "There are many ghosts and";
+				mes "demons within the cave, and they will attack people who do not possess holy power... Like you.";
+			}
+			next;
+			mes "[Boonthom]";
+			mes "I can make you an object";
+			mes "containing this holy power if you wish. In order to make it, I will need some materials.";
+			next;
+			mes "[Boonthom]";
+			mes "^3366991 Needle Packet^000000,";
+			mes "^3366991 Spool^000000,";
+			mes "^3366991 Solid Husk^000000 and";
+			mes "^3366991 Holy Water^000000...";
+			mes "That's all I need.";
+			next;
+			mes "[Boonthom]";
+			mes "Please come back";
+			mes "when you prepare all";
+			mes "the materials.";
+			set ayodunquest,2;
+			close;
+		}
+		mes "[Boonthom]";
+		mes "Hmmm...";
+		mes "Not afraid";
+		mes "of it, are you?";
+		next;
+		mes "[Boonthom]";
+		mes "............";
+		mes "............";
+		close;
+	}
+	else if (ayodunquest == 2) {
+		if (countitem(7213) > 0 && countitem(7217) > 0 && countitem(7190) > 0 && countitem(523) > 0) {
+			mes "[Boonthom]";
+			mes "Excellent!";
+			mes "Now you have brought";
+			mes "everything I need. Let me make";
+			mes "the thing for you as promised...";
+			next;
+			mes "[Boonthom]";
+			mes "Ooooohmmmmm...";
+			next;
+			mes "[Boonthom]";
+			mes "Hmmmmmm...";
+			mes "Hmmmmmmmmm.";
+			next;
+			mes "[Boonthom]";
+			mes "Pffff pffff...";
+			next;
+			mes "[Boonthom]";
+			mes "Here you go.";
+			mes "Please take these holy threads.";
+			mes "With this, you will be able to enter the ruins with less worry.";
+			delitem 7213,1; //Needle_Pouch
+			delitem 7217,1; //Spool
+			delitem 7190,1; //Solid_Peeling
+			delitem 523,1; //Holy_Water
+			set ayodunquest,3;
+			getitem 7285,1; //Thread_Skein
+			next;
+			mes "[Boonthom]";
+			mes "Even if you lose this, don't worry. Just bring me the materials, and";
+			mes "I will make you another one.";
+			next;
+			mes "[Boonthom]";
+			mes "The ancient building consists";
+			mes "of 2 levels. Before you enter the 2nd underground level, please return to me so that I can tell you how to enter that place.";
+		}
+		mes "[Boonthom]";
+		mes "Did you forget what materials";
+		mes "you need to create my object of holy power? Please listen";
+		mes "carefully this time.";
+		next;
+		mes "[Boonthom]";
+		mes "^3366991 Needle Packet^000000,";
+		mes "^3366991 Spool^000000,";
+		mes "^3366991 Solid Husk^000000 and";
+		mes "^3366991 Holy Water^000000.";
+		next;
+		mes "[Boonthom]";
+		mes "See you later.";
+		close;
+	}
+	else if (ayodunquest == 3) {
+		if (countitem(7213) > 0 && countitem(7217) > 0 && countitem(7190) > 0 && countitem(523) > 0) {
+			mes "[Boonthom]";
+			mes "Excellent! Now you have brought everything I need, let me make the thing for you as I promised...";
+			next;
+			mes "[Boonthom]";
+			mes "Ooooohmmmmm...";
+			next;
+			mes "[Boonthom]";
+			mes "Hmmmmmm...";
+			mes "Hmmmmmmmmm.";
+			next;
+			mes "[Boonthom]";
+			mes "Pffff pffff...";
+			next;
+			mes "[Boonthom]";
+			mes "Here you go.";
+			mes "Please take these holy threads.";
+			mes "With this, you will be able to enter the ruins with less worry.";
+			delitem 7213,1; //Needle_Pouch
+			delitem 7217,1; //Spool
+			delitem 7190,1; //Solid_Peeling
+			delitem 523,1; //Holy_Water
+			getitem 7285,1; //Thread_Skein
+			next;
+			mes "[Boonthom]";
+			mes "Even if you lose this, don't worry. Just bring me the materials, I can make you another one.";
+			close;
+		}
+		mes "[Boonthom]";
+		mes "If you lose the holy threads, don't worry. I can make some more for you. Just gather the following items.";
+		next;
+		mes "[Boonthom]";
+		mes "^3366991 Needle Packet^000000,";
+		mes "^3366991 Spool^000000,";
+		mes "^3366991 Solid Husk^000000 and";
+		mes "^3366991 Holy Water^000000.";
+		next;
+		mes "[Boonthom]";
+		mes "See you later.";
+		close;
+	}
+	else if (ayodunquest > 3 && ayodunquest < 9) {
+		mes "[Boonthom]";
+		mes "You finally started seeking the tiger. I hope that you will be safe from harm.";
+		next;
+		mes "[Boonthom]";
+		mes "Feel free to ask";
+		mes "me for help at anytime.";
+		close;
+	}
+	else if (ayodunquest == 9) {
+		mes "["+strcharinfo(0)+"]";
+		mes "I copied down this";
+		mes "message while exploring";
+		mes "the dungeon. Would you";
+		mes "take a look at this?";
+		next;
+		mes "[Stone Slate]";
+		mes "^333333Do not enter the";
+		mes "2nd underground level";
+		mes "...is danger... You wil...";
+		mes "...encounter... tiger...^000000";
+		next;
+		mes "[Stone Slate]";
+		mes "^333333You must kill... In order to do... MUST... How to go... the 2nd underground level...";
+		mes "You need more... Holy power... in order to... Otherwise, it's impossible...^000000";
+		next;
+		mes "[Boonthom]";
+		mes "That was written by one of my comrades who entered the ruins,";
+		mes "as he regretted letting the tiger live, lest it return.";
+		next;
+		mes "[Boonthom]";
+		mes "If you were able to find this note, you must have strong determination to venture through the ruins.";
+		next;
+		mes "[Boonthom]";
+		mes "As you can guess from the";
+		mes "note, the 2nd underground level is very very dangerous. You will need holy threads that contain even more holy protection.";
+		next;
+		mes "[Boonthom]";
+		mes "Now, go and gather some materials so that I can create more powerful holy threads for you.";
+		next;
+		mes "[Boonthom]";
+		mes "^3366992 Holy Water^000000,";
+		mes "^3366991 Yggdrasil Leaf^000000,";
+		mes "^3366992 Needle Packet^000000 and";
+		mes "^3366992 Spool^000000.";
+		set ayodunquest,10;
+		next;
+		mes "[Boonthom]";
+		mes "Return to me";
+		mes "once you have";
+		mes "gathered everything.";
+		close;
+	}
+	else if (ayodunquest == 10) {
+		if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1) {
+			mes "[Boonthom]";
+			mes "Hmm~";
+			mes "You've brought";
+			mes "everything. Quite";
+			mes "the enthusiastic one,";
+			mes "aren't you?";
+			next;
+			mes "[Boonthom]";
+			mes "Ooooohmmmmm...";
+			next;
+			mes "[Boonthom]";
+			mes "Hmmmmmm...";
+			mes "Hmmmmmmmmm.";
+			next;
+			mes "[Boonthom]";
+			mes "Pffff pffff...";
+			next;
+			mes "[Boonthom]";
+			mes "Here you go.";
+			mes "Please take these holy threads.";
+			mes "With this, you will be able to enter the ruins with less worry.";
+			delitem 7213,2; //Needle_Pouch
+			delitem 7217,2; //Spool
+			delitem 610,1; //Leaf_Of_Yggdrasil
+			delitem 523,2; //Holy_Water
+			set ayodunquest,11;
+			getitem 7287,1; //Thread_Skein_
+			next;
+			mes "[Boonthom]";
+			mes "Even if you lose this, don't worry. Just bring me the materials, and";
+			mes "I will make you another one.";
+			close;
+		}
+		mes "[Boonthom]";
+		mes "Hmm...?";
+		mes "Didn't I tell you";
+		mes "what I need to make";
+		mes "a more powerful";
+		mes "holy thread?";
+		next;
+		mes "[Boonthom]";
+		mes "^3366992 Holy Water^000000,";
+		mes "^3366991 Yggdrasil Leaf^000000,";
+		mes "^3366992 Needle Packet^000000 and";
+		mes "^3366992 Spool^000000.";
+		next;
+		mes "[Boonthom]";
+		mes "Return to me";
+		mes "with those items";
+		mes "and I will craft";
+		mes "more powerful holy";
+		mes "threads for you.";
+		close;
+	}
+	else if (ayodunquest == 11) {
+		if (countitem(7287) > 0) {
+			mes "[Boonthom]";
+			mes "Those threads";
+			mes "will protect you";
+			mes "from the spiritual";
+			mes "dangers, but it's up";
+			mes "to you to defend yourself";
+			mes "from monster attacks, okay?";
+			close;
+		}
+		else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
+			mes "[Boonthom]";
+			mes "Ooooohmmmmm...";
+			next;
+			mes "[Boonthom]";
+			mes "Hmmmmmm...";
+			mes "Hmmmmmmmmm.";
+			next;
+			mes "[Boonthom]";
+			mes "Pffff pffff...";
+			next;
+			mes "[Boonthom]";
+			mes "Here you go.";
+			mes "Please take these holy threads.";
+			mes "With this, you will be able to enter the ruins with less worry.";
+			delitem 7213,2; //Needle_Pouch
+			delitem 7217,2; //Spool
+			delitem 610,1; //Leaf_Of_Yggdrasil
+			delitem 523,2; //Holy_Water
+			getitem 7287,1; //Thread_Skein_
+			close;
+		}
+		mes "[Boonthom]";
+		mes "Hmm...?";
+		mes "Didn't I tell you";
+		mes "what I need to make";
+		mes "a more powerful";
+		mes "holy thread?";
+		next;
+		mes "[Boonthom]";
+		mes "^3366992 Holy Water^000000,";
+		mes "^3366991 Yggdrasil Leaf^000000,";
+		mes "^3366992 Needle Packet^000000 and";
+		mes "^3366992 Spool^000000.";
+		close;
+	}
+	else if (ayodunquest == 12) {
+		mes "[Boonthom]";
+		mes "Huh...!";
+		mes "You must have seen something.";
+		mes "I can tell by the gloomy look on your face, and the shadow looming over your soul.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "I found";
+		mes "this old letter";
+		mes "in the ruins.";
+		next;
+		mes "[Old Letter]";
+		mes "^333333Dear, Boonthom...I was a fool...There is Sa-mhing Tig'...One who ....my remains... Please take...to Boonthom...";
+		next;
+		mes "[Boonthom]";
+		mes "I see...";
+		mes "Oh, my dear";
+		mes "old friend...";
+		next;
+		mes "[Boonthom]";
+		mes "Thank you for your trouble.";
+		mes "My friend left that box for me.";
+		mes "But I guess he would wish to give that box to the person who found his remains.";
+		next;
+		mes "[Boonthom]";
+		mes "If you wish to explore the building again, but you don't have any holy thread, feel free to ask me at anytime.";
+		set ayodunquest,13;
+		close;
+	}
+	else if (ayodunquest > 12) {
+		if (countitem(7287) > 0) {
+			mes "[Boonthom]";
+			mes "Best of luck on your";
+			mes "expeditions, brave";
+			mes "adventurer~";
+			close;
+		}
+		else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
+			mes "[Boonthom]";
+			mes "Lost the";
+			mes "holy threads";
+			mes "somehow, did you?";
+			mes "With the items you";
+			mes "have, I'll simply";
+			mes "make more of them.";
+			next;
+			mes "[Boonthom]";
+			mes "Ooooohmmmmm...";
+			next;
+			mes "[Boonthom]";
+			mes "Hmmmmmm...";
+			mes "Hmmmmmmmmm.";
+			next;
+			mes "[Boonthom]";
+			mes "Pffff pffff...";
+			next;
+			mes "[Boonthom]";
+			mes "Here you go.";
+			mes "Please take these holy threads.";
+			mes "With this, you will be able to enter the ruins with less worry.";
+			delitem 7213,2; //Needle_Pouch
+			delitem 7217,2; //Spool
+			delitem 610,1; //Leaf_Of_Yggdrasil
+			delitem 523,2; //Holy_Water
+			getitem 7287,1; //Thread_Skein_
+			close;
+		}
+		mes "[Boonthom]";
+		mes "Hmm...?";
+		mes "Didn't I tell you";
+		mes "what I need to make";
+		mes "a more powerful";
+		mes "holy thread?";
+		next;
+		mes "[Boonthom]";
+		mes "^3366992 Holy Water^000000,";
+		mes "^3366991 Yggdrasil Leaf^000000,";
+		mes "^3366992 Needle Packet^000000 and";
+		mes "^3366992 Spool^000000.";
+		close;
+	}
 	mes "[Boonthom]";
 	mes "Ooooohmmmmm...";
-	next;
-	mes "[Boonthom]";
-	mes "Hmmmmmm...";
-	mes "Hmmmmmmmmm.";
-	next;
-	mes "[Boonthom]";
-	mes "Pffff pffff...";
-	next;
-s_Process:
-	if(countitem(523) < 2 || countitem(610) < 1 || countitem(7213) < 2 || countitem(7217) < 2)goto s_NEnoughItems;
-	delitem 523,2; //Holy Water
-	delitem 610,1; //Yggdrasil Leaf
-	delitem 7213,2; //Needle Packet
-	delitem 7217,2; //Spool
-	getitem 7287,1; //Holier Threads
-	if(ayodot != 8)set ayodot,8;
-	mes "[Boonthom]";
-	mes "Here you go.";
-	mes "Please take these holy threads.";
-	mes "With this, you will be able to";
-	mes "enter the ruins with less worry.";
-	next;
-	mes "[Boonthom]";
-	mes "Even if you lost this, don't worry.";
-	mes "Just bring me the materials, and";
-	mes "I will make you another one.";
-	close;
-s_NEnoughItems:
-	mes "[Boonthom]";
-	mes "Hmmm...?";
-	mes "Didn't I tell you";
-	mes "what I need to make";
-	mes "a more powerful";
-	mes "holy thread?";
-	next;
-	mes "[Boonthom]";
-	mes "^4466772 Holy Water^000000,";
-	mes "^4466771 Yggdrasil Leaf^000000,";
-	mes "^4466772 Needle Packet^000000 and";
-	mes "^4466772 Spool^000000.";
-	next;
-	mes "[Boonthom]";
-	mes "Return to me";
-	mes "with those items";
-	mes "And I will craft";
-	mes "more powerful holy";
-	mes "threads for you.";
-	close;
-s_Check2:
-	if(countitem(7285) < 1)goto s_Lose;
-	if(countitem(7287) < 1)goto s_LoseThreads;
-	mes "[Boonthom]";
-	mes "Those threads";
-	mes "will protect you";
-	mes "from the spiritual";
-	mes "dangers, but it's up";
-	mes "to you to defend yourself";
-	mes "from monster attacks, okay?";
-	close;
-s_LoseThreads:
-//Custom Dialogues
-	mes "[Boonthom]";
-	mes "I can feel the absence of holy power.";
-	mes "You lost the holier threads didn't you?";
-	next;
-	mes "[Boonthom]";
-	mes "But that's alright, I can make a new one";
-	mes "So... Do you want one?";
-	next;
-	menu "Yeah!",s_ICheck,"Nah",-;
-
-	mes "[Boonthom]";
-	mes "Come back anytime!";
 	close;
 }
-ayo_fild01,129,197,7	script	Puraim	842,{
-	if(countitem(7285) > 0)goto s_Dungeon; //Holy Threads
+
+ayo_fild01,129,197,0	script	Puraim#thai1	842,{
+	if ((ayodunquest > 2 && countitem(7285) > 0) || (ayodunquest > 2 && countitem(7287) > 0)) {
+		mes "[Puraim]";
+		mes "Huh...?";
+		mes "I feel it!";
+		mes "I can feel the";
+		mes "power of holiness!";
+		mes "It's coming from you!";
+		next;
+		mes "[Puraim]";
+		mes "I guess you can go ahead";
+		mes "into the ruins. So that's";
+		mes "what you want? To explore";
+		mes "this area?";
+		next;
+		mes "[Puraim]";
+		mes "I would suggest";
+		mes "against coming inside.";
+		mes "Even the local people";
+		mes "fear this area.";
+		next;
+		mes "[Puraim]";
+		mes "If the Sa-mhing Tiger wasn't around, there would still be all the evil spirits in this place. Even with the holy thread, this place is still dangerous.";
+		next;
+		mes "[Puraim]";
+		mes "So what do you want?";
+		mes "Do you still want to";
+		mes "explore the area,";
+		mes "adventurer?";
+		next;
+		if (select("Yes.:No! I'm too afraid of the ruins now.") == 1) {
+			mes "[Puraim]";
+			mes "Hmmm...";
+			mes "It seems you adventurers are tempted by the thrill of danger,";
+			mes "or you've all got some death wish.";
+			next;
+			mes "[Puraim]";
+			mes "Oh well, that's none of my business. After all, you already";
+			mes "have a holy spirit. Still, be careful. You might not want to go to the 2nd underground level of the ruins.";
+			next;
+			mes "[Puraim]";
+			mes "As you Rune-Midgardians";
+			mes "say, 'curiousity killed the cat.'";
+			mes "Anyway, go for it!";
+			next;
+			mes "^3355FFHe shoved you off the hill";
+			mes "and you plummet like a rock.^000000";
+			close2;
+			percentheal -10,0;
+			warp "ayo_fild02",30,135;
+			end;
+		}
+		mes "[Puraim]";
+		mes "Good decision!";
+		mes "As I expected, you're";
+		mes "smart enough not to";
+		mes "stupidly jeopardize your life.";
+		close;
+	}
 	mes "[Puraim]";
-	mes "If I were you, I wouldn't even dare to approach";
-	mes "The ruins down over there.";
+	mes "If I were you, I wouldn't";
+	mes "even dare to approach";
+	mes "the ruins down over there.";
 	next;
 	mes "[Puraim]";
-	mes "Anyone who doesn't have the protection of a holy spirit will be easy game for the evil creatures living there. You'd be killed in no time at all!";
+	mes "Anyone who doesn't have the protection of a holy spirit will be easy game for the evil creatures living there. You'd be killed in";
+	mes "no time at all!";
 	next;
 	mes "[Puraim]";
 	mes "Go back, adventurer.";
-	mes "If you wish to explore this area, you'd better show me some holy spirit.";
-	close;
-s_Dungeon:
-	mes "[Puraim]";
-	mes "Huh...?";
-	mes "I feel it!";
-	mes "I can feel the power of holiness!";
-	mes "It's coming from you!";
-	next;
-	mes "[Puraim]";
-	mes "I guess you can go ahead into the ruins. So that's what you want? To explore this aera?";
-	next;
-	mes "[Puraim]";
-	mes "I would suggest against coming inside. Even the local people fear this area.";
-	next;
-	mes "[Puraim]";
-	mes "If the Sa-mhing Tiger wasn't around, there would still be all the evil spirits in this place. Even with the holy threads, this place is still dangerous.";
-	next;
-	mes "[Puraim]";
-	mes "So what do you want to do? Do you still want to explore the area, adventurer?";
-	next;
-	menu "Yes",s_Yes,"No! I'm too afraid of the ruins now.",-;
-
-	mes "[Puraim]";
-	mes "Good decision!";
-	mes "As I expected, you're smart enough not to stupidly jeopardize your life.";
+	mes "If you wish to explore";
+	mes "this area, you'd better";
+	mes "show me some holy spirit.";
 	close;
-s_Yes:
-	mes "[Puraim]";
-	mes "Hmmm...";
-	mes "It seems you adventurers are tempted by the thrill of danger, or you've all got some death wish.";
-	next;
-	mes "[Puraim]";
-	mes "Oh well, that's none of my business. After all, you already have a holy spirit. Still, be careful. You might not want to go to the 2nd underground level of the ruins.";
-	next;
-	mes "[Puraim]";
-	mes "As you Rune-Midgardians say, 'curiousity killed the cat.' Anyway, go for it!";
-	next;
-	mes "[Puraim]";
-	mes "^3C2EE6He shoved you off the hill and you plummet like a rock.";
-	close2;
-	set @hpcheck,readparam(6)/10;
-	if(readparam(5) < @hpcheck)goto s_SetHp;
-	percentheal -10,0;
-s_Warp:
-	warp "ayo_fild02",30,135;
-	end;
-s_SetHp:
-	set @hpcheck2,readparam(5)-1;
-	heal -@hpcheck2,0;
-	goto s_Warp;
 }
-	
-ayo_dun01,260,42,4	script	LocationActivator	139,4,0,{
-	if(ayodot > 5)end;
-	if(countitem(7285) > 0)goto s_Dots;
-	end;
-s_Dots:
-	mes "- Holy threads in your pocket";
-	mes "suddenly started glowing. You felt";
-	mes "something is near you.-";
-	if(ayodot == 0)goto s_0;
-	if(ayodot == 1)goto s_1;
-	if(ayodot == 2)goto s_2;
-	if(ayodot == 3)goto s_3;
-	if(ayodot == 4)goto s_4;
-	if(ayodot == 5)goto s_5;
-	end;
 
-s_0:
-	viewpoint 1,198,164,1,0xFF0000;
-	viewpoint 1,87,16,2,0xFF0000;
-	viewpoint 1,268,215,3,0xFF0000;
-	viewpoint 1,147,274,4,0xFF0000;
-	viewpoint 1,99,118,5,0xFF0000;
-	viewpoint 1,16,188,6,0xFF0000;
-	stopnpctimer;
-	close;
-s_1:
-	viewpoint 1,87,16,2,0xFF0000;
-	viewpoint 1,268,215,3,0xFF0000;
-	viewpoint 1,147,274,4,0xFF0000;
-	viewpoint 1,99,118,5,0xFF0000;
-	viewpoint 1,16,188,6,0xFF0000;
-	close;
-s_2:
-	viewpoint 1,268,215,3,0xFF0000;
-	viewpoint 1,147,274,4,0xFF0000;
-	viewpoint 1,99,118,5,0xFF0000;
-	viewpoint 1,16,188,6,0xFF0000;
-	close;
-s_3:
-	viewpoint 1,147,274,4,0xFF0000;
-	viewpoint 1,99,118,5,0xFF0000;
-	viewpoint 1,16,188,6,0xFF0000;
-	close;
-s_4:
-	viewpoint 1,99,118,5,0xFF0000;
-	viewpoint 1,16,188,6,0xFF0000;
-	close;	
-s_5:
-	viewpoint 1,16,188,6,0xFF0000;
+ayo_fild02,25,154,0	script	Aik#thai	843,{
+	mes "[Aik]";
+	mes "So, how was your expedition?";
+	mes "I hope that the evil spirits will not follow you outside of the ruins, and haunt your dreams.";
+	next;
+	mes "[Aik]";
+	mes "When you go back,";
+	mes "remember to ward off";
+	mes "the evil from your mind.";
+	mes "Otherwise you will encounter";
+	mes "trouble later...";
+	next;
+	mes "[Aik]";
+	mes "So, would you";
+	mes "like to go back?";
+	next;
+	if (select("Yes.:No, I need to look around more...") == 1) {
+		mes "[Aik]";
+		mes "Alright then...";
+		mes "Here we go...";
+		next;
+		mes "^3355FFHe suddenly grabbed you";
+		mes "and hurled you up into the air!^000000";
+		close2;
+		warp "ayo_fild01",115,200;
+		end;
+	}
+	mes "[Aik]";
+	mes "I see.";
+	mes "Take care.";
 	close;
 }
 
-ayo_dun01,198,164,4	script	#invayo1	111,{
-
-	if(countitem(7285) < 1)end;
-	if(ayodot == 0)goto s_First;
-
-	mes "^3C2EE6You find a piece of a stone slate with letters etched on it. It seems to be the 1st part of the slate.";
+// Water Traps
+ayo_dun01,273,26,0	script	 #th_dun1_1_1::AyoTrap1	111,0,4,{
+	mes "^3355FFYou look down and see a pool";
+	mes "of water in the distance. It looks like a long drop to the bottom.^000000";
+	next;
+	mes "^3355FFYou are filled";
+	mes "with apprehension,";
+	mes "After all, if you fall down,^000000";
+	mes "^2F2F4Fyou might get killed.^000000";
 	close;
 
-s_First:
-
-	mes "^3C2EE6You find a piece of a stone slate with letters etched on it. It seems to be the 1st part of the slate.";
+OnTouch:
+	mes "^3355FFYou look down and see a pool";
+	mes "of water in the distance. It looks like a long drop to the bottom.^000000";
 	next;
-	mes "^3C2EE6It reads '^0000FFDo not enter the 2nd underground level.^3C2EE6' You are unable to read the rest of the message.";
-	set ayodot,1;
+	mes "^3355FFYou are filled";
+	mes "with apprehension.";
+	mes "After all, if you fall down,";
+	mes "^2F2F4Fyou might get killed.^000000";
 	close;
-
 }
 
-ayo_dun01,87,16,4	script	#invayo2	111,{
-
-	if(countitem(7285) < 1)end;
-	if(ayodot == 1)goto s_First;
-
-	mes "^3C2EE6You find a piece of a stone slate with letters etched on it. It seems to be the 2nd part of the slate.";
-	close;
-
-s_First:
-
-	mes "^3C2EE6You find a piece of a stone slate with letters etched on it. It seems to be the 2nd part of the slate.";
-	next;
-	mes "^3C2EE6It reads '^0000FF...is danger... You wil....^3C2EE6' You are unable to read the rest of the message.";
-	set ayodot,2;
-	close;
+ayo_dun01,273,27,0	duplicate(AyoTrap1)	 #th_dun1_1_2	111
+ayo_dun01,272,27,0	duplicate(AyoTrap1)	 #th_dun1_1_3	111,0,4
+ayo_dun01,272,26,0	duplicate(AyoTrap1)	 #th_dun1_1_4	111
 
+ayo_dun01,26,27,0	script	 #th_dun1_1::AyoTrap2	-1,1,1,{
+OnTouch:
+	percentheal -100,0;
+	end;
 }
 
-ayo_dun01,268,215,4	script	#invayo3	111,{
+ayo_dun01,28,27,0	duplicate(AyoTrap2)	 #th_dun1_2	-1,0,1
+ayo_dun01,27,25,0	duplicate(AyoTrap2)	 #th_dun1_3	-1,1,0
+ayo_dun01,25,25,0	duplicate(AyoTrap2)	 #th_dun1_4	-1
+ayo_dun01,272,273,0	duplicate(AyoTrap2)	 #th_dun1_5	-1,1,1
+ayo_dun01,274,273,0	duplicate(AyoTrap2)	 #th_dun1_6	-1,0,1
+ayo_dun01,273,271,0	duplicate(AyoTrap2)	 #th_dun1_7	-1,1,0
+ayo_dun01,271,271,0	duplicate(AyoTrap2)	 #th_dun1_8	-1
+ayo_dun01,26,273,0	duplicate(AyoTrap2)	 #th_dun1_9	-1,1,1
+ayo_dun01,28,273,0	duplicate(AyoTrap2)	 #th_dun1_10	-1,0,1
+ayo_dun01,27,271,0	duplicate(AyoTrap2)	 #th_dun1_11	-1,1,0
+ayo_dun01,25,271,0	duplicate(AyoTrap2)	 #th_dun1_12	-1
+
+// Hints
+ayo_dun01,156,148,0	script	 #hint01::AyoHint	-1,0,4,{
+OnTouch:
+	if (rand(1,100) > 60 && ayodunquest < 11) {
+		mes "^3355FFThe Holy Thread in your pocket suddenly began to glow. You feel that something is near you...^000000";
+		close2;
+		viewpoint 1,198,164,0,0xFF0000;
+		viewpoint 1,87,16,1,0xFF0000;
+		viewpoint 1,268,214,2,0xFF0000;
+		viewpoint 1,147,274,3,0xFF0000;
+		viewpoint 1,99,118,4,0xFF0000;
+		viewpoint 1,16,188,5,0xFF0000;
+	}
+	end;
+}
 
-	if(countitem(7285) < 1)end;
-	if(ayodot == 2)goto s_First;
+ayo_dun01,259,42,0	duplicate(AyoHint)	 #hint02	-1,2,0
+ayo_dun01,259,44,0	duplicate(AyoHint)	 #hint02_2	-1,2,0
+ayo_dun01,259,46,0	duplicate(AyoHint)	 #hint02_3	-1,2,0
 
-	mes "^3C2EE6You find a piece of a stone slate with letters etched on it. It seems to be the 3rd part of the slate.";
+// Puzzle pieces
+ayo_dun01,198,164,0	script	 #hun_thai_1	111,{
+	if (ayodunquest == 3) {
+		set ayodunquest,4;
+		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 1st part of the slate.^000000";
+		next;
+		mes "^3355FFIt reads '^0000FFDo not enter the 2nd underground level^3355FF.' You are unable to read the rest of the message.^000000";
+		close;
+	}
+	mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 1st part of the slate.^000000";
 	close;
+}
 
-s_First:
-
-	mes "^3C2EE6You find a piece of a stone slate with letters etched on it. It seems to be the 3rd part of the slate.";
-	next;
-	mes "^3C2EE6It reads '^0000FF...encounter...tiger....^3C2EE6' You are unable to read the rest of the message.";
-	set ayodot,3;
+ayo_dun01,87,16,0	script	 #hun_thai_2	111,{
+	if (ayodunquest == 4) {
+		set ayodunquest,5;
+		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 2nd part of the slate.^000000";
+		next;
+		mes "^3355FFIt reads '^0000FF...is danger... You wil...^3355FF.' You are unable to read the rest of the message.^000000";
+		close;
+	}
+	mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 2nd part of the slate.^000000";
 	close;
-
 }
 
-ayo_dun01,147,274,4	script	#invayo4	111,{
-
-	if(countitem(7285) < 1)end;
-	if(ayodot == 3)goto s_First;
-
-	mes "^3C2EE6You find a piece of a stone slate with letters etched on it. It seems to be the 4th part of the slate.";
+ayo_dun01,268,214,0	script	 #hun_thai_3	111,{
+	if (ayodunquest == 5) {
+		set ayodunquest,6;
+		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 3rd part of the slate.^000000";
+		next;
+		mes "^3355FFIt reads '^0000FF...encounter... tiger...^3355FF.' You are unable to read the rest of the message.^000000";
+		close;
+	}
+	mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 3rd part of the slate.^000000";
 	close;
+}
 
-s_First:
-
-	mes "^3C2EE6You find a piece of a stone slate with letters etched on it. It seems to be the 4th part of the slate.";
-	next;
-	mes "^3C2EE6It reads '^0000FFYou must kill... In order to do... MUST ... How to go... the 2nd underground level...^3C2EE6' You are unable to read the rest of the message.";
-	set ayodot,4;
+ayo_dun01,147,274,0	script	 #hun_thai_4	111,{
+	if (ayodunquest == 6) {
+		set ayodunquest,7;
+		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 4th part of the slate.^000000";
+		next;
+		mes "^3355FFIt reads '^0000FFYou must kill... In order to do... MUST... How to go... the 2nd underground level...^3355FF' You are unable to read the rest of the message.^000000";
+		close;
+	}
+	mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 4th part of the slate.^000000";
 	close;
-
 }
 
-ayo_dun01,99,118,4	script	#invayo5	111,{
-	if(countitem(7285) < 1)end;
-	if(ayodot == 4)goto s_First;
-	mes "^3C2EE6You find a piece of a stone slate with letters etched on it. It seems to be the 5th part of the slate.";
-	close;
-s_First:
-	mes "^3C2EE6You find a piece of a stone slate with letters etched on it. It seems to be the 5th part of the slate.";
-	next;
-	mes "^3C2EE6It reads '^0000FFYou need more... Holy power... in order to...^3C2EE6' You are unable to read the rest of the message.";
-	set ayodot,5;
+ayo_dun01,99,118,0	script	 #hun_thai_5	111,{
+	if (ayodunquest == 7) {
+		set ayodunquest,8;
+		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 5th part of the slate.^000000";
+		next;
+		mes "^3355FFIt reads '^0000FFYou need more... Holy power... in order to...^3355FF' You are unable to read the rest of the message.^000000";
+		close;
+	}
+	mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 5th part of the slate.^000000";
 	close;
-
 }
-	
-ayo_dun01,16,188,4	script	#invayo6	111,{
-	if(countitem(7285) < 1)end;
-	if(ayodot == 5)goto s_First;
-	mes "^3C2EE6You find a piece of a stone slate with letters etched on it. It seems to be the last part of the slate.";
-	close;
-s_First:
-	mes "^3C2EE6You find a piece of a stone slate with letters etched on it. It seems to be the last part of the slate.";
-	next;
-	mes "^3C2EE6It reads '^0000FFOtherwise, it's impossible...^3C2EE6' You are unable to read the rest of the message.";
-	set ayodot,6;
+
+ayo_dun01,16,188,0	script	 #hun_thai_6	111,{
+	if (ayodunquest == 8) {
+		set ayodunquest,9;
+		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the last part of the slate.^000000";
+		next;
+		mes "^3355FFIt reads '^0000FFOtherwise, it's impossible...^3355FF' You are unable to read the rest of the message.^000000";
+		close;
+	}
+	mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the last part of the slate.^000000";
 	close;
 }
 
-ayo_dun01,24,283,4	script	#ayowarp	111,{
-	if(countitem(7287) < 1)goto s_NoEntry;
-	mes "^3C2EE6The holy threads emanate a powerful sense of safety and security. With the protection of holiness, you begin your descent into the 2nd level..";
-	close2;
-	set @ayodunwarp,rand(1,2);
-	if(@ayodunwarp == 2)goto s_2;
-	warp "ayo_dun02",275,26;
-	end;
-s_2:
-	warp "ayo_dun02",24,26;
-	end;	
-s_NoEntry:
-	mes "^3C2EE6You find what seems to be the entrance to the 2nd level. However, you are filled with an overwhelming sense of dread. Somehow, you can't bring yourself to go down...";
+ayo_dun01,24,283,0	script	 #2_dun_in	111,{
+	if (ayodunquest > 10) {
+		if (countitem(7287) > 0) {
+			mes "^3355FFThe holy threads";
+			mes "emanate a powerful sense";
+			mes "of safety and security.";
+			mes "With the protection of";
+			mes "holiness, you begin your";
+			mes "descent into the 2nd level.^000000.";
+			close2;
+			if (rand(1,10) > 5) {
+				warp "ayo_dun02",23,26;
+			}
+			else {
+				warp "ayo_dun02",275,26;
+			}
+			end;
+		}
+		mes "^3355FFYou find what seems to be the entrance to the 2nd level. However, you are filled with an overwhelming sense of dread. Somehow, you can't bring yourself to go down...^000000";
+		close;
+	}
+	mes "^3355FFYou find what seems to be the entrance to the 2nd level. However, you are filled with an overwhelming sense of dread. Somehow, you can't bring yourself to go down...^000000";
 	close;
 }
 
-ayo_dun01,23,283,4	duplicate(#ayowarp)	#ayodupe1	111
-ayo_dun01,25,283,4	duplicate(#ayowarp)	#ayodupe2	111
-ayo_dun01,26,283,4	duplicate(#ayowarp)	#ayodupe3	111
+ayo_dun02,268,108,0	script	 #reward_tiger	111,{
+	if (ayodunquest == 11 && countitem(7287) > 0) {
+		mes "^3355FFYou find half of the skeletal remains of a person sticking out from the ground. It seems to be the remains of Boonthom's comrade.^000000";
+		next;
+		mes "^3355FFYou find a piece of paper beside the skeleton, as well as a box.^000000";
+		next;
+		mes "^3355FFYou read what is written on the old sheet of paper. The letters have faded with age, and it is difficult to read.^000000";
+		next;
+		mes "[Old Letter]";
+		mes "^333333Dear, Boonthom,";
+		mes "I was a fool. There is 'Sa-mhing Tig'...One who ....my remains... Please take...to Boonthom...";
+		next;
+		mes "^3355FFYou pick";
+		mes "up the box.^000000";
+		set ayodunquest,12;
+		getitem 603,1; //Old_Blue_Box
+		close;
+	}
+}
 
+// Tom Tung Goong Quest
 //============================================================
-//============================================== Tom Yum Goong
-//====================================================== Quest
-
-
-ayothaya,196,265,3	script	Einon	842,{
-	if(tomyumgoong == 5)goto s_Done;
-	if(tomyumgoong == 1 || tomyumgoong == 2 || tomyumgoong == 3 || tomyumgoong == 4)goto s_Resta;
-	mes "[Einon]";
-	mes "Do you know what the";
-	mes "most popular cuisine";
-	mes "of this village is?";
-	next;
-	mes "[Einon]";
-	mes "Ayothaya is world famous for its regional cuisine, but out of all Ayothayan dishes, '^3C2EE6Tom Yum Goong^000000' is the best.";
-	next;
-	mes "[Einon]";
-	mes "Tom Yum Goong is a type of soup that is very spicy. Try it once, and you will be amazed by its profound taste. Try it twice, and you will be enraptured by its tantalizing aroma.";
-	next;
-	mes "[Einon]";
-	mes "It's really one of the most delicious foods in the world!";
-	mes "Everyone in the world would  would want to try this at least once in his lifetime. So, would you like to try some?";
-	next;	
-	menu "Sure thing.",s_Sure,"No, thanks. I hate spicy food.",-;
-
-	mes "[Einon]";
-	mes "Oh I see...";
-	mes "However, when you";
-	mes "change your mind,";
-	mes "please come back.";
-	close;
-
-s_Sure:
-	mes "[Einon]";
-	mes "Okay...!";
-	mes "Now who would be best for preparing Tom Yum Goong for you?";
-	mes "Hmmmmm...";
-	next;
-	mes "[Einon]";
-	mes "Everyone in the village knows how to make it, but I recommend that you go visit ^0000FF Mali the Spicy^000000.";
-	next;
-	mes "[Einon]";
-	mes "She is the best cook when it comes to Tom Yum Goong!";
-	mes "Why don't you ask her to cook you some?";
-	set tomyumgoong,1;
-	close;
-s_Resta:
-	mes "[Einon]";
-	mes "Ah, you wanna know where ^0000FFMali the Spicy^000000 is?";
-	mes "Well, there's not too many places a cook would stay other than in a restaurant, right? Hahaha~";
-	close;
-s_Done:
+ayothaya,196,265,3	script	Einon#ayo	842,{
+	if (tomyumgoong == 0) {
+		mes "[Einon]";
+		mes "Do you know what the";
+		mes "most popular cuisine";
+		mes "of this village is?";
+		next;
+		mes "[Einon]";
+		mes "Ayotaya is world famous";
+		mes "for its regional cuisine, but";
+		mes "out of all Ayotayan dishes,";
+		mes "'^3131FFTom Yum Goong^000000' is the best.";
+		next;
+		mes "[Einon]";
+		mes "Tom Yum Goong is a type";
+		mes "of soup that is very spicy. Try it once, and you will be amazed by its profound taste. Try it twice, and you will be enraptured by its tantalizing aroma.";
+		next;
+		mes "[Einon]";
+		mes "It's really one of the most delicious foods in the world!";
+		mes "Everyone in the world would";
+		mes "want to try this at least once in his lifetime. So, would you like";
+		mes "to try some?";
+		next;
+		if (select("Sure thing.:No, thanks. I hate spicy food.") == 1) {
+			mes "[Einon]";
+			mes "Okay...!";
+			mes "Now who would be";
+			mes "best for preparing";
+			mes "Tom Yum Goong for you?";
+			mes "Hmmmmm...";
+			next;
+			mes "[Einon]";
+			mes "Everyone in the village";
+			mes "knows how to make it, but";
+			mes "I recommend that you go";
+			mes "visit ^3131FFMali the Spicy^000000.";
+			next;
+			emotion e_no1;
+			set tomyumgoong,1;
+			mes "[Einon]";
+			mes "She is the best cook when it";
+			mes "comes to Tom Yum Goong!";
+			mes "Why don't you ask her";
+			mes "to cook you some?";
+			close;
+		}
+		mes "[Einon]";
+		mes "Oh I see...";
+		mes "However, when you";
+		mes "change your mind,";
+		mes "please come back.";
+		close;
+	}
+	else if (tomyumgoong == 1) {
+		mes "[Einon]";
+		mes "Ah, you wanna know";
+		mes "where ^3131FFMali the Spicy^000000 is?";
+		mes "Well, there's not too many places";
+		mes "a cook would stay other than in";
+		mes "a restaurant, right? Hahaha~";
+		close;
+	}
 	mes "[Einon]";
-	mes "Golden Ayothaya...";
+	mes "Golden Ayotaya...";
 	mes "Although I've grown";
 	mes "up in this village,";
 	mes "I still think my village";
@@ -2323,264 +2334,345 @@ s_Done:
 	mes "[Einon]";
 	mes "What do you think?";
 	mes "Wouldn't you agree with me?";
-	close;	
-}
-
-ayo_in01,145,163,4	script	Cook	839,{	
-	if(tomyumgoong == 5)goto s_Busy;
-	if(ayopause == 1)goto s_Pause;
-	if(ayopause == 2)goto s_Pause2;
-	if(tomyumgoong == 4)goto s_Chilee;
-	if(tomyumgoong == 3)goto s_Lemons;
-	if(tomyumgoong == 2)goto s_Shrimp;
-	mes "[Mali the Spicy]";
-	mes "Hello, there!";
-	mes "I am called Mali the Spicy.";
-	mes "All of my dishes always amaze my customers with their tempting scents and deep flavors.";
-	next;
-	mes "[Mali the Spicy]";
-	mes "I am especially proud of my ^3C2EE6Tom Yum Goong^000000, which is the best in the village. I suppose it's my fate to cook the greatest Tom Yum Goong ever.";
-	if(tomyumgoong == 1)goto s_Quest;
-	close;
-s_Quest:
-	next;
-	mes "[Mali the Spicy]";
-	mes "Oh I see...";
-	mes "You want me to cook Tom Yum Goong for you, don't you?";
-	next;
-	mes "[Mali the Spicy]";
-	mes "Honestly, I've been really buse ever since I opened this restaurant. If you really wish to taste my Tom Yum Goong, would you do something for me?";
-	next;
-	menu "Sure!",s_Sure,"Eh... I dunno.",-;
-
-	mes "[Mali the Spicy]";
-	mes "I understand this might be difficult to do, but it's worth a try if you really want to taste the best Tom Yum Goong.";
-	close;
-
-s_Sure:
-	mes "[Mali the Spicy]";
-	mes "First, would you go get the ingredients to make Tom Yum Goong for me? I'll need some ^FF0000Shrimps^000000, ^FF0000Chilees^000000 and ^FF0000Lemons^000000.";
-	next;
-	mes "[Mali the Spicy]";
-	mes "Remember, Shrimp is the main ingredient of this dish. So, the fresher the Shrimp, the tastier your food will be.";
-	next;
-	menu "Where can I find them?",-;
-	mes "[Mali the Spicy]";
-	mes "I expected you to ask me that.";
-	mes "For shrimps, look around the beach. You should see a lot of them there.";
-	next;
-	mes "[Mali the Spicy]";
-	mes "However, you might have a hard time finding them since you haven't done that before. So just buy some Shrimp from the guy who sells the freshest Shrimp around.";
-	next;
-	mes "[Mali the Spicy]";
-	mes "Hmmm...";
-	mes "If you mention";
-	mes "my name, that guy";
-	mes "might give you a discount";
-	next;
-	mes "[Mali the Spicy]";
-	mes "His name is ^0000FFThongpool^000000.";
-	mes "He will be somewhere around the village selling Shrimps. Go and ask him to give you 20 Shrimps to cook Tom Yum Goong.";
-	set tomyumgoong,2;
-	close;
-s_Shrimp:
-	if(countitem(567) > 19)goto s_EnoughShrimp;
-	mes "[Mali the Spicy]";
-	mes "Did you visit ^0000FFThongpool^000000?";
-	mes "He will be somewhere around the village selling Shrimps. Go and ask him to give you 20 Shrimps to cook Tom Yum Goong.";
-	close;
-
-s_EnoughShrimp:
-	delitem 567,20; //Shrimp
-	mes "[Mali the Spicy]";
-	mes "Ah you came back!";
-	mes "Now, let me see what"; 
-	mes "you've brought. Hmmm...";
-	mes "These are...";
-	next;
-	set ayopause,1;
-	set ayoshrimps,0;
-	emotion e_no1;
-	mes "[Mali the Spicy]";
-	mes "The freshest Shrimp that";
-	mes "I've been looking for!";
-	mes "With these big and fresh Shrimps,";
-	mes "I can cook the best Tom Yum Goong";
-	mes "for you! Thank you so much!";
-	next;
-	mes "[Mali the Spicy]";
-	mes "It will be a perfect food with the natural sweetness of the Shrimp, the sourness of Lemons and a little bit of fish sauce!";
-	next;
-s_Pause:
-	mes "[Mali the Spicy]";
-	mes "Oh... Right";
-	mes "But we only have Shrimp.";
-	mes "Now, I want you to bring me some ^FF0000Lemons^000000.";
-	next;
-	menu "Where can I find Lemons?",s_WLemon,"I hate sour food. I'd better quit!",-;
-
-	mes "[Mali the Spicy]";
-	mes "It's your call.";
-	mes "But remember...";
-	mes "The shimps might go bad while you're taking a rest.";
-	close;
-
-s_WLemon:
-	mes "[Mali the Spicy]";
-	mes "A few days ago, I saw a good";
-	mes "Lemon tree while taking a walk.";
-	mes "But this tree belongs to an";
-	mes "ordinary man who's not a Fruit Merchant.";
-	next;
-	mes "[Mali the Spicy]";
-	mes "I'm not sure wheter or not he'd sell Lemons to you, but you can try, I guess.";
-	set ayopause,0;
-	set tomyumgoong,3;
-	close;
-s_Lemons:
-	if(countitem(568) > 9)goto s_EnoughLemon;
-	mes "[Mali the Spicy]";
-	mes "Alright...";
-	mes "I'm counting on you";
-	mes "to get the best Lemons";
-	mes "from the man who owns that tree.";
-	next;
-	mes "[Mali the Spicy]";
-	mes "Somehow, you've got";
-	mes "to get those high quality";
-	mes "Lemons so that I can make some Tom Yum Goong!";
-	close;
-s_EnoughLemon:
-	delitem 568,10; //Lemon
-	emotion e_gasp;
-	mes "[Mali the Spicy]";
-	mes "Welcome back!";
-	mes "Wow, you came back";
-	mes "really fast! Okay, let me";
-	mes "see the Lemons";
-	mes "you brought?";
-	next;
-	set ayopause,2;
-	mes "[Mali the Spicy]";
-	mes "Wow, great!";
-	mes "These are really fresh Lemons!";
-	mes "How could you bring all of these by";
-	mes "yourself? Thanks for your trouble~";
-	next;
-s_Pause2:
-	mes "[Mali the Spicy]";
-	mes "Now, you should go buy";
-	mes "some ^FF0000Chilees^000000 and some";
-	mes "other materials in the market.";
-	next;
-	mes "[Mali the Spicy]";
-	mes "When you talk";
-	mes "to the Merchants";
-	mes "in the Market, they";
-	mes "will know what you want.";
-	next;
-	menu "Okay, I'll be right back.",s_Okay,"Ah, I'm tired now. Let me take a rest first...",-;
-
-	mes "[Mali the Spicy]";
-	mes "It's your call.";
-	mes "But remember...";
-	mes "The Shrimps might go bad";
-	mes "while you're taking a rest.";
-	close;	
-s_Okay:
-	mes "[Mali the Spicy]";
-	mes "See you in a bit~";
-	set ayopause,0;
-	set tomyumgoong,4;
-	close;
-s_Chilee:
-	if(countitem(7286) > 29)goto s_EnoughChilee;
-	mes "[Mali the Spicy]";
-	mes "Did you get the Chilees?";
-	mes "You should talk to the Merchants in the Market, they'll know what you want.";
-	close;
-s_EnoughChilee:
-	delitem 7286,30; //Red Chile
-	mes "[Mali the Spicy]";
-	mes "Now...";
-	mes "Everything is all set!";
-	mes "Before we start, let me";
-	mes "check the materials.";
-	next;
-	mes "[Mali the Spicy]";
-	mes "^FF0000Shrimp^000000, ^FF0000Chilees^000000, ^FF0000Lemons^000000...";
-	mes "Fish sauce and other little";
-	mes "things...";
-	next;
-	mes "[Mali the Spicy]";
-	mes "Perfect!";
-	mes "Shall we begin?";
-	next;
-	misceffect 125;
-	mes "^D0122C*Tuk*";
-	mes "^6F1E6A*Tup*";
-	mes "^357030*Puk*";
-	next;
-	misceffect 124;
-	mes "^D10C3A*Chop chop*";
-	mes "^DCB060*Tup tup tup*";
-	mes "^8CA7BA*Pu pu*";
-	next;
-	misceffect 23;
-	misceffect 135;
-	mes "^86733BTup tup ^396254chook";
-	mes "^486354chop chop";
-	mes "^BA0010Tup tup tup ^28842FPu pu";
-	next;
-	emotion e_omg;
-	misceffect 99;
-	misceffect 90;
-	mes "Wah^050158ah^241999ahhh^0F48CBhaaaahhh^000000!";
-	next;
-	mes "[Mali the Spicy]";
-	mes "...";
-	mes "......";
-	mes ".........";
-	next;
-	set tomyumgoong,5;
-	set ayoshrimps,0;
-	getitem 566,10; //Tom Yum Goong
-	emotion e_no1;
-	mes "[Mali the Spicy]";
-	mes "Here's your";
-	mes "Tom Yum Goong!";
-	mes "Ah~ This taste,";
-	mes "this scent... Yeah.";
-	mes "I know I did a good job.";
-	next;
-	mes "[Mali the Spicy]";
-	mes "Do you know what is the secret of Tom Yum Goong? It isn't simply just food. This has the power to heal you, and help you get into better shape.";
-	next;
-	mes "[Mali the Spicy]";
-	mes "Because...";
-	mes "It countains the";
-	mes "power of God.";
-	next;
-	mes "[Mali the Spicy]";
-	mes "Okay...!";
-	mes "I'm giving you";
-	mes "10 Tom Yum Goong";
-	mes "free of charge~";
-	next;
-	mes "[Mali the Spicy]";
-	mes "Thank you for all the trouble";
-	mes "you have been through to get these";
-	mes "ingredients. It would make me happy";
-	mes "if you shared Tom Yum Goong with";
-	mes "your friends.";
-	next;
-	mes "[Mali the Spicy]";
-	mes "Share the flavor of Ayothaya, and";
-	mes "let them know how beautiful our";
-	mes "land is. It was good to see you,";
-	mes "take care now~";
 	close;
-s_Busy:
+}
+	
+ayo_in01,145,163,3	script	Cook#ayo	839,{
+	if (tomyumgoong < 2) {
+		mes "[Mali the Spicy]";
+		mes "Hello, there!";
+		mes "I am called Mali the Spicy.";
+		mes "All of my dishes always amaze";
+		mes "my customers with their tempting scents and deep flavors.";
+		next;
+		mes "[Mali the Spicy]";
+		mes "I am especially proud of my";
+		mes "^3131FFTom Yum Goong^000000, which is the";
+		mes "best in the village. I suppose";
+		mes "it's my fate to cook the greatest Tom Yum Goong ever.";
+		if (tomyumgoong == 0) {
+			close;
+		}
+		else {
+			next;
+			mes "[Mali the Spicy]";
+			mes "Oh I see...";
+			mes "You want me to cook";
+			mes "Tom Yum Goong for you,";
+			mes "don't you?";
+			next;
+			mes "[Mali the Spicy]";
+			mes "Honestly, I've been really";
+			mes "busy ever since I opened this restaurant. If you really wish to taste my Tom Yum Goong, would";
+			mes "you do something for me?";
+			next;
+			if (select("Sure!:Eh... I dunno.") == 1) {
+				mes "[Mali the Spicy]";
+				mes "First, would you get";
+				mes "the ingredients to make";
+				mes "Tom Yum Goong for me? I'll need some ^CE0000Shrimps^000000, ^CE0000Chiles^000000 and ^CE0000Lemons^000000.";
+				next;
+				mes "[Mali the Spicy]";
+				mes "Remember, Shrimp is the main ingredient of this dish. So, the fresher the Shrimp, the tastier your food will be.";
+				next;
+				select("Where can I find them?");
+				mes "[Mali the Spicy]";
+				mes "I expected you";
+				mes "to ask me that.";
+				mes "For Shrimps, look around";
+				mes "the beach. You should see";
+				mes "a lot of them there.";
+				next;
+				mes "[Mali the Spicy]";
+				mes "However, you might have a hard time finding them since you haven't done that before. So just buy some Shrimp from the guy who sells";
+				mes "the freshest Shrimp around.";
+				next;
+				mes "[Mali the Spicy]";
+				mes "Hmmm...";
+				mes "If you mention";
+				mes "my name, that guy";
+				mes "might give you a discount.";
+				set tomyumgoong,2;
+				next;
+				mes "[Mali the Spicy]";
+				mes "His name is ^3131FFThongpool^000000.";
+				mes "He will be somewhere around the village selling Shrimps. Go and ask him to give you 20 Shrimps to cook Tom Yum Goong.";
+				close;
+			}
+			mes "[Mali the Spicy]";
+			mes "I understand this might be difficult to do, but it's worth";
+			mes "a try if you really want to taste the best Tom Yum Goong.";
+			close;
+		}
+	}
+	else if (tomyumgoong > 1 && tomyumgoong < 4) {
+		if (tomyumgoong == 2 && countitem(567) > 19) {
+			mes "[Mali the Spicy]";
+			mes "Errr...";
+			mes "What's wrong with these Shrimp?";
+			mes "They all have these scratches and rips in them! I can't believe Thongpool sold such bad Shrimp";
+			mes "to his customers!";
+			next;
+			mes "[Mali the Spicy]";
+			mes "I'm so sorry, but";
+			mes "I can't cook the best";
+			mes "Tom Yum Goong with";
+			mes "these Shrimp.";
+			next;
+			mes "[Mali the Spicy]";
+			mes "I know it's an inconvenience, but would you go back to Thongpool";
+			mes "and ask him to give you the freshest Shrimp to cook the best";
+			mes "Tom Yum Goong?";
+			close;
+		}
+		else if (tomyumgoong == 3) {
+			if (countitem(567) > 19) {
+				mes "[Mali the Spicy]";
+				mes "Ah, you came back!";
+				mes "Now, let me see what";
+				mes "you've brought. Hmm...";
+				mes "These are...";
+				next;
+				emotion e_no1;
+				mes "[Mali the Spicy]";
+				mes "The freshest Shrimp that";
+				mes "I've been looking for! Well done~";
+				mes "With these big and fresh Shrimp,";
+				mes "I can cook the best Tom Yum Goong for you! Thank you so much!";
+				delitem 567,20; //Prawn
+				next;
+				mes "[Mali the Spicy]";
+				mes "It will be a perfect food with the natural sweetness of the Shrimp, the sourness of Lemons and a little bit of fish sauce!";
+				next;
+				mes "[Mali the Spicy]";
+				mes "Oh... Right.";
+				mes "But we only have Shrimp.";
+				mes "Now, I want you to bring";
+				mes "me some ^CE0000Lemons^000000.";
+				next;
+				if (select("Where can I find Lemons?:I hate sour food. I'd better quit!") == 1) {
+					set tomyumgoong,4;
+					mes "[Mali the Spicy]";
+					mes "A few days ago, I saw a good";
+					mes "Lemon tree while taking a walk.";
+					mes "But this tree belongs to an ordinary man who's not a Fruit Merchant.";
+					next;
+					mes "[Mali the Spicy]";
+					mes "I'm not sure whether";
+					mes "or not he'd sell Lemons";
+					mes "to you, but you can try,";
+					mes "I guess.";
+					close;
+				}
+				emotion e_ag;
+				mes "[Mali the Spicy]";
+				mes "What a stupid...!";
+				mes "If you quit just because you really hate sour flavors, you must not be that eager to have my Tom Yum Goong!";
+				next;
+				mes "[Mali the Spicy]";
+				mes "Once you taste my";
+				mes "Tom Yum Goong, you'll";
+				mes "regret what you just said!";
+				close;
+			}
+			mes "[Mali the Spicy]";
+			mes "Huh...?";
+			mes "What did you do";
+			mes "with the Shrimps?";
+			mes "You didn't eat them";
+			mes "on the way here, did you?";
+			close;
+		}
+		mes "[Mali the Spicy]";
+		mes "Make sure you ask";
+		mes "Mr. Thongpool to give";
+		mes "you 20 Shrimps.";
+		mes "Now hurry~";
+		close;
+	}
+	else if (tomyumgoong > 3 && tomyumgoong < 6) {
+		if (tomyumgoong == 4 && countitem(568) > 9) {
+			mes "[Mali the Spicy]";
+			mes "You think these are";
+			mes "the best quality Lemons?";
+			mes "Take a closer look!";
+			next;
+			mes "[Mali the Spicy]";
+			mes "The skin of these";
+			mes "Lemons lack luster";
+			mes "and they don't even smell";
+			mes "fresh! They're just";
+			mes "common Lemons!";
+			close;
+		}
+		else if (tomyumgoong == 5) {
+			if (countitem(568) > 9) {
+				emotion e_gasp;
+				mes "[Mali the Spicy]";
+				mes "Welcome back!";
+				mes "Wow, you came back";
+				mes "really fast! Okay, let me";
+				mes "see the Lemons";
+				mes "you brought?";
+				next;
+				mes "[Mali the Spicy]";
+				mes "Wow, great!";
+				mes "These are really fresh Lemons!";
+				mes "How could you bring all of these by yourself? Thanks for your trouble~";
+				next;
+				mes "[Mali the Spicy]";
+				mes "Now, you should go buy";
+				mes "some ^CE0000Chiles^000000 and some";
+				mes "other materials in the Market.";
+				next;
+				mes "[Mali the Spicy]";
+				mes "When you talk";
+				mes "to the Merchants";
+				mes "in the Market, they";
+				mes "will know what you want.";
+				next;
+				if (select("Okay, I'll be right back.:Ah, I'm tired now. Let me take a rest first...") == 1) {
+					delitem 568,10; //Lemon
+					set tomyumgoong,6;
+					mes "[Mali the Spicy]";
+					mes "See you in a bit~";
+					close;
+				}
+				mes "[Mali the Spicy]";
+				mes "It's your call.";
+				mes "But remember...";
+				mes "The Shrimps might go bad";
+				mes "while you're taking a rest.";
+				close;
+			}
+			mes "[Mali the Spicy]";
+			mes "Huh...?";
+			mes "What did you";
+			mes "do with Lemons?";
+			mes "You didn't eat them";
+			mes "all on the way here, did you?";
+			close;
+		}
+		mes "[Mali the Spicy]";
+		mes "Alright...";
+		mes "I'm counting on you";
+		mes "to get the best Lemons";
+		mes "from the guy that owns that tree.";
+		next;
+		mes "[Mali the Spicy]";
+		mes "Somehow, you've got";
+		mes "to get those high quality";
+		mes "Lemons so that I can make";
+		mes "some Tom Yum Goong!";
+		close;
+	}
+	else if (tomyumgoong == 6) {
+		if (countitem(7286) > 29) {
+			mes "[Mali the Spicy]";
+			mes "I don't understand...";
+			mes "Where did you get these";
+			mes "bad ingredients?! Didn't";
+			mes "I tell you that my";
+			mes "Tom Yum Goong";
+			mes "requires the best?!";
+			close;
+		}
+		mes "[Mali the Spicy]";
+		mes "I know you've been working hard to do me this favor. I hope you'll put forth that last little bit of effort to finish this.";
+		next;
+		mes "[Malli the Spicy]";
+		mes "Please go take a look in the Market. I don't doubt that it will be a good experience. After all, my fantastic Tom Yum Goong is waiting for you!";
+		close;
+	}
+	else if (tomyumgoong == 7) {
+		set .@now_weight,MaxWeight-Weight;
+		if (.@now_weight > 1499) {
+			if (countitem(7286) > 29) {
+				delitem 7286,30; //Chilli
+				emotion e_gasp;
+				mes "[Mali the Spicy]";
+				mes "Now...";
+				mes "Everything is all set!";
+				mes "Before we start, let me";
+				mes "check the materials.";
+				next;
+				mes "[Mali the Spicy]";
+				mes "^CE0000Shrimp^000000, ^CE0000Chiles^000000, ^CE0000Lemons^000000...";
+				mes "Fish sauce and other little things...";
+				next;
+				mes "[Mali the Spicy]";
+				mes "Perfect!";
+				mes "Shall we begin?";
+				next;
+				mes "^FF0000*Tuk*^000000";
+				mes "^9C009C*Tup*^000000";
+				mes "^009C00*Puk*^000000";
+				specialeffect 125; //"Cook#ayo" EF_ENCHANTPOISON
+				next;
+				mes "^FF0031*Chop chop*^000000";
+				mes "^FF9C00*Tup tup tup*^000000";
+				mes "^639CFF*Pu pu^000000 -";
+				specialeffect 124; //"Cook#ayo" EF_VENOMDUST
+				next;
+				mes "[Mali the Spicy]";
+				mes "- ^9C6300Tup tup^000000 ^006363chook^000000";
+				mes "^316363Chop chop^000000";
+				mes "^FF0000Tup tup tup^000000 ^009C00Pu pu^000000 -";
+				specialeffect 23; //"Cook#ayo" EF_STONECURSE
+				specialeffect 98; //"Cook#ayo" EF_HASTEUP
+				specialeffect 12; //"Cook#ayo" EF_BEGINSPELL
+				next;
+				mes "[Mali the Spicy]";
+				mes "Wah^00009Cah^0000FFahhhh^0063FFaaaahhh^000000!";
+				emotion e_omg;
+				specialeffect 99; //"Cook#ayo" EF_FLASHER
+				specialeffect 90; //"Cook#ayo" EF_LORD
+				next;
+				mes "[Mali the Spicy]";
+				mes " ...";
+				mes " ......";
+				mes " .........";
+				next;
+				set tomyumgoong,8;
+				getitem 566,10; //Tomyumkung
+				emotion e_no1;
+				mes "[Mali the Spicy]";
+				mes "Here's your";
+				mes "Tom Yum Goong!";
+				mes "Ah~ This taste,";
+				mes "this scent... Yeah.";
+				mes "I know I did a good job.";
+				next;
+				mes "[Mali the Spicy]";
+				mes "Do you know what is the secret of Tom Yum Goong? It isn't simply just food. This has the power to heal you, and help you get into better shape.";
+				next;
+				mes "[Mali the Spicy]";
+				mes "Because...";
+				mes "It contains the";
+				mes "power of God.";
+				next;
+				mes "[Mali the Spicy]";
+				mes "Okay...!";
+				mes "I'm giving you";
+				mes "10 Tom Yum Goong";
+				mes "free of charge~";
+				next;
+				mes "[Mali the Spicy]";
+				mes "Thank you for all the trouble that you have been though to get these ingredients. It would make me happy if you shared Tom Yum Goong with your friends.";
+				next;
+				mes "[Mali the Spicy]";
+				mes "Share the flavor of Ayotaya, and let them know how beautiful our land is. It was good to see you, take care now~";
+				close;
+			}
+			mes "[Mali the Spicy]";
+			mes "Huh? What did you do with the Chiles? You didn't eat them all on the way here, did you?";
+			close;
+		}
+		mes "[Mali the Spicy]";
+		mes "Hmm...";
+		mes "You seem to be carrying too many things. Why don't you free up some space in your inventory first, and then come back?";
+		close;
+	}
 	emotion e_wah;
 	mes "[Mali the Spicy]";
 	mes "Ah...!";
@@ -2588,320 +2680,575 @@ s_Busy:
 	mes "My customers never get tired of";
 	mes "the taste of my Tom Yum Goong!";
 	mes "Heh heh heh~!";
-	close;	
-}
-
-ayothaya,213,95,7	script	Merchant#chili	841,{
-	if(tomyumgoong == 4)goto s_Chili;
-s_JumpBack:
-	mes "[Merchant Thongdum]";
-	mes "Hello there!";
-	mes "Ever try a Chili before?";
-	next;
-	mes "[Merchant Thongdum]";
-	mes "Despite its tiny appearance, it has a very strong flavor. It's also hot and spicy, so you should be careful when you eat one.";
-	next;
-	mes "[Merchant Thongdum]";
-	mes "The people of Ayothaya enjoy sensational food with distinct, spicy flavors. In Ayothayan cuisine, we use things like Chilis, Garlics, Ginger and Cilantro.";
-	next;
-	mes "[Merchant Thongdum]";
-	mes "I'm selling Chilis,";
-	mes "so if you need any,";
-	mes "please come to me~";
 	close;
-s_Chili:
-	if(countitem(7286) > 29)goto s_JumpBack;
-	mes "[Merchant Thongdum]";
-	mes "Hello, there~";
-	mes "Are you looking for";
-	mes "ingredients to make";
-	mes "Tom Yum Goong?";
-	next;
-	mes "[Merchant Thongdum]";
-	mes "Let's see...";
-	mes "I'm selling chilis,";
-	mes "fish sauce, and some";
-	mes "spices and flavorings";
-	mes "you'll need. I'll sell";
-	mes "it all to you for 2,000 zeny.";
-	next;
-	menu "Thanks, I'll take it",s_Take,"It's a rip-off, man!",-;
-
-	mes "[Merchant Thongdum]";
-	mes "Don't say that.";
-	mes "My prices are always";
-	mes "reasonable. I want you to know";
-	mes "that I'm a respectable Merchant.";
-	close;
-
-s_Take:
-	if(Zeny < 2000) goto s_NoZeny;
-	set Zeny, Zeny - 2000;
-	getitem 7286,30; //Red Chile
-	mes "[Merchant Thongdum]";
-	mes "Thank you.";
-	mes "I hhope you will enjoy";
-	mes "your Tom Yum Goong~";
-	close;
-
-s_NoZeny:
-//custom dialogues
-	emotion e_wah;
-	mes "[Merchant Thongdum]";
-	mes "Aw, you don't have enough zeny.";
-	mes "Please come back when you do!";
+}
+	
+ayothaya,153,86,5	script	Thongpool#ayo	843,{
+	//if (max_max_c1 == 1) {
+	//	mes "- Wait a minute! -";
+	//	mes "- Currently you're carrying -";
+	//	mes "- too many items with you. -";
+	//	mes "- Please enlighten your weight -";
+	//	mes "- and try again. -";
+	//	close;
+	//}
+	set .@now_weight,MaxWeight-Weight;
+	if (.@now_weight < 2000) {
+		mes "- Wait a minute! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please enlighten your weight -";
+		mes "- and try again. -";
+		close;
+	}
+	if (tomyumgoong == 2) {
+		mes "[Thongpool]";
+		mes "Come adventurers,";
+		mes "take a look! I have";
+		mes "plenty of Shrimp!";
+		next;
+		mes "[Thongpool]";
+		mes "You're looking for Shrimp,";
+		mes "aren't you? How many Shrimp";
+		mes "do you need? Twenty? Forty?";
+		next;
+		if (select("I need Shrimp for Tom Yum Goong.:Err, they look expensive.") == 1) {
+			mes "[Thongpool]";
+			mes "Ah! I guess Ms. Mali the Spicy recommended me to you. I guess";
+			mes "that also means you want to buy them in bulk?";
+			next;
+			mes "[Thongpool]";
+			mes "After all,";
+			mes "you'll need a larger";
+			mes "amount of Shrimp to";
+			mes "cook Tom Yum Goong.";
+			next;
+			mes "[Thongpool]";
+			mes "Oh yes, you will need 20 Shrimps for Ms. Mali's Tom Yum Goong.";
+			mes "I'll even give you a discount:";
+			mes "11,000 zeny for 20 shrimps.";
+			mes "What do you say?";
+			next;
+			if (select("I will take them.:I could get 100 Jellopies for that much!") == 1) {
+				if (Zeny > 10999) {
+					set .@now_weight,MaxWeight-Weight;
+					if (.@now_weight > 3999) {
+						set zeny,zeny-11000;
+						set tomyumgoong,3;
+						getitem 567,20; //Prawn
+						emotion e_no1;
+						mes "[Thongpool]";
+						mes "Good, now you have the";
+						mes "freshest Shrimp in this village! It's time for you to go back and ask Ms. Mali to cook them for you.";
+						close;
+					}
+					mes "[Thongpool]";
+					mes "Awww...";
+					mes "You're carrying too much stuff with you. I don't think you can carry more than what you have right now.";
+					close;
+				}
+				mes "[Thongpool]";
+				mes "Awww...";
+				mes "You don't have";
+				mes "enough money.";
+				close;
+			}
+			mes "[Thongpool]";
+			mes "Well well well...";
+			mes "You might fill your hungry stomach with that many Jellopies but they wouldn't taste as good as my Shrimp!";
+			close;
+		}
+		mes "[Thongpool]";
+		mes "What...?";
+		mes "Do you think";
+		mes "it's expensive?";
+		mes "But the fantastic taste";
+		mes "of Tom Yum Goong";
+		mes "is priceless!";
+		close;
+	}
+	else if (tomyumgoong == 3) {
+		mes "[Thongpool]";
+		mes "Mmm...?";
+		mes "Did you need";
+		mes "more Shrimps?";
+		mes "Would you like";
+		mes "to buy more?";
+		next;
+		if (select("Yes!:No, thanks.") == 1) {
+			if (Zeny > 10999) {
+				set .@now_weight,MaxWeight-Weight;
+				if (.@now_weight > 3999) {
+					set zeny,zeny-11000;
+					getitem 567,20; //Prawn
+					mes "[Thongpool]";
+					mes "There you go~";
+					mes "The freshest Shrimp you can ever get in this village, and maybe even the world!";
+					close;
+				}
+				mes "[Thongpool]";
+				mes "Awww...";
+				mes "You're carrying too much stuff with you. I don't think you can carry more than what you have right now.";
+				close;
+			}
+			mes "[Thongpool]";
+			mes "Awww...";
+			mes "You don't have";
+			mes "enough money.";
+			close;
+		}
+		mes "[Thongpool]";
+		mes "Good, now you have gotten the freshest shrimps in this village!";
+		mes "It's time for you to go back and ask Ms. Mali to cook for you.";
+		close;
+	}
+	mes "[Thongpool]";
+	mes "Welcome, welcome!";
+	mes "I've got the best Shrimp caught in the cleanest waters in the world~!";
 	close;
 }
-
-ayothaya,121,240,7	script	Mr. Jun	842,1,1,{
+	
+ayothaya,121,240,7	script	Mr. Jun#ayo	842,1,1,{
+	//if (max_max_c1 == 1) {
+	//	mes "- Wait a minute! -";
+	//	mes "- Currently you're carrying -";
+	//	mes "- too many items with you. -";
+	//	mes "- Please enlighten your weight -";
+	//	mes "- and try again. -";
+	//	close;
+	//}
+	set .@now_weight,MaxWeight-Weight;
+	if (.@now_weight < 2000) {
+		mes "- Wait a minute! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please enlighten your weight -";
+		mes "- and try again. -";
+		close;
+	}
+	if (tomyumgoong == 5) {
+		emotion e_swt;
+		mes "[Mr. Jun]";
+		mes "Umm...?";
+		mes "You don't need";
+		mes "more Lemons";
+		mes "again, do you?";
+		next;
+		switch(select("No.:Give me Lemons, old man!:Can I have some more Lemons, please?")) {
+		case 1:
+			emotion e_ho;
+			mes "[Mr. Jun]";
+			mes "Then why don't you taste";
+			mes "the Lemons I gave you last time? They're really sour, but also very delicious!";
+			close;
+		case 2:
+			emotion e_an;
+			mes "[Mr. Jun]";
+			mes "What...!?";
+			mes "What's wrong with you, kid?";
+			mes "What have you done with the";
+			mes "Lemons I gave you last time?";
+			close;
+		case 3:
+			mes "[Mr. Jun]";
+			mes "Oh, I am sorry....recently my lemon storage";
+			mes "was attacked by ^3131FF'Leaf Cats'^000000 that are roaming around the Shrine.";
+			next;
+			mes "[Mr. Jun]";
+			mes "I wish that I could help you,";
+			mes "but I don't even have enough lemons for my business.";
+			mes "If you need lemons, why don't you go hunt them?";
+			close;
+		}
+	}
 	mes "[Mr. Jun]";
 	mes "...";
 	close;
-OnTouch:
-	if(ayolemon == 2)end;
-	if(ayolemon == 1)goto s_Again;
-	if(tomyumgoong == 3)goto s_Lemon;
-	end;
-s_Lemon:
-	emotion e_hmm;
-	mes "[Mr. Jun]";
-	mes "Hello, there?";
-	mes "Did you need";
-	mes "some help...?";
-	next;
-	menu "I need some Lemons.",s_Quest,"No, thanks.",-;
-
-	mes "[Mr. Jun]";
-	mes "Feel free to";
-	mes "ask me for help";
-	mes "any time, okay?";
-	close;
-
-s_Quest:
-	mes "[Mr. Jun]";
-	mes "Umm...";
-	mes "Lemons?";
-	mes "As you see, I have plenty";
-	mes "of Lemons on my tree";
-	mes "Do you really need some?";
-	next;
-	menu "Yes, I will pay you.",s_Pay,"No, thanks.",-;
-
-	mes "[Mr. Jun]";
-	mes "Hmm...";
-	mes "Now what can";
-	mes "I possibly do";
-	mes "with all these";
-	mes "Lemons?";
-	close;
-
-s_Pay:
-	mes "[Mr. Jun]";
-	mes "I started growing this Lemon tree as a hobby, but I didn't expect to have such a good havest of sweet, succulent Lemons.";
-	next;
-	mes "[Mr. Jun]";
-	mes "Did you just say you were going to pay me for the Lemons? Oh, you've got me wrong. I don't intend to sell these.";
-	next;
-	mes "[Mr. Jun]";
-	mes "But...";
-	mes "I'm more than willing";
-	mes "to share some of them with";
-	mes "you, but only if you can...";
-	next;
-	mes "[Mr. Jun]";
-	mes "Play a small game with me!";
-	mes "How about that? I've been so bored";
-	mes "to death. Even an old man like me";
-	mes "needs to enjoy himself!";
-	next;
-	mes "[Mr. Jun]";
-	mes "Hahahaha~!";
-	mes "What do you say?";
-	mes "Would you like to try?";
-	next;
-	menu "Sure, why not!",s_Game,"No, thanks.",-;
-
-	mes "[Mr. Jun]";
-	mes "Afraid are we?";
-	mes "There's no fooling you:";
-	mes "I'm one of the best at games!";
-	close;
-
-s_Again:
-//custom dialogues
-	mes "[Mr. Jun]";
-	mes "Oh, you're back!";
-	mes "Would you like to try again?";
-	next;
-	menu "Yeah, I'm going to beat you.",s_Game4,"Nah, I just passed by.",-;
 
+OnTouch:
+	//if (max_max_c1 == 1) {
+	//	mes "- Wait a minute! -";
+	//	mes "- Currently you're carrying -";
+	//	mes "- too many items with you. -";
+	//	mes "- Please enlighten your weight -";
+	//	mes "- and try again. -";
+	//	close;
+	//}
+	set .@now_weight,MaxWeight-Weight;
+	if (.@now_weight < 2000) {
+		mes "- Wait a minute! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please enlighten your weight -";
+		mes "- and try again. -";
+		close;
+	}
+	if (tomyumgoong == 4) {
+		mes "[Mr. Jun]";
+		mes "Hello, there?";
+		mes "Did you need";
+		mes "some help...?";
+		emotion e_hmm;
+		next;
+		if (select("I need some Lemons.:No, thanks.") == 1) {
+			mes "[Mr. Jun]";
+			mes "Umm...";
+			mes "Lemons?";
+			mes "As you see, I have plenty";
+			mes "of Lemons on my tree.";
+			mes "Do you really need some?";
+			next;
+			if (select("Yes, I will pay you.:No, thanks.") == 1) {
+				mes "[Mr. Jun]";
+				mes "I started growing this Lemon tree as a hobby, but I didn't expect to have such a good harvest of sweet,";
+				mes "succulent Lemons.";
+				next;
+				mes "[Mr. Jun]";
+				mes "Did you just say you were";
+				mes "going to pay me for the Lemons?";
+				mes "Oh, you've got me wrong. I don't intend to sell these.";
+				next;
+				mes "[Mr. Jun[";
+				mes "But...";
+				mes "I'm more than willing";
+				mes "to share some of them with";
+				mes "you, but only if you can...";
+				next;
+				mes "[Mr. Jun]";
+				mes "Play a small game with me!";
+				mes "How about that? I've been so bored to death. Even an old man like me needs to enjoy himself!";
+				next;
+				mes "[Mr. Jun]";
+				mes "Hahahaha~!";
+				mes "What do you say?";
+				mes "Would you like to try?";
+				next;
+				if (select("Sure, why not!:No, thanks.") == 1) {
+					mes "[Mr. Jun]";
+					mes "Good!";
+					mes "The game I want us";
+					mes "to play is an easy";
+					mes "children's game.";
+					next;
+					mes "[Mr. Jun]";
+					mes "^660000Rock,";
+					mes "Paper, Scissors!^000000";
+					mes "Perhaps you've heard";
+					mes "of it in your land.";
+					emotion e_scissors;
+					next;
+					mes "[Mr. Jun]";
+					mes "Nuh-uh, don't look at me like that. I'm an old man, and I want to play this game and re-live my youth";
+					mes "a little bit. You'll understand when you're my age.";
+					next;
+					mes "[Mr. Jun]";
+					mes "Alright, if you win";
+					mes "^3131FF3^000000 out of ^3131FF5^000000 matches,";
+					mes "The Lemons are yours.";
+					mes "Are you ready?";
+					next;
+					mes "[Mr. Jun]";
+					mes "Okay...";
+					mes "As you kids say,";
+					mes "^990000Let's get eXtreme!^000000";
+					next;
+					set user_score,0;
+					set pc_score,0;
+					mes "[Mr. Jun]";
+					mes "Rock!";
+					mes "Paper!";
+					mes "Scissors!";
+					next;
+					while(1) {
+						if (.@pc_score == 5 || .@user_score == 3) {
+							break;
+						}
+						else {
+							set .@jun_mark,rand(1,3);
+							switch(select("Scissors:Rock:Paper")) {
+							case 1:
+								if (.@jun_mark == 1) {
+									emotion e_scissors;
+									emotion e_scissors,1;
+									mes "[Mr. Jun]";
+									mes "Hmpf.";
+									mes "It's a draw.";
+									mes "One more time!";
+									mes "Rock! Paper!";
+									mes "Scissors!";
+									next;
+								}
+								else if (.@jun_mark == 2) {
+									emotion e_rock;
+									emotion e_scissors,1;
+									set .@pc_score,.@pc_score + 1;
+									mes "[Mr. Jun]";
+									mes "Yes...!";
+									mes "Oh my God, yes!";
+									next;
+								}
+								else {
+									emotion e_paper;
+									emotion e_scissors,1;
+									set .@pc_score,.@pc_score + 1;
+									set .@user_score,.@user_score + 1;
+									mes "[Mr. Jun]";
+									mes "What...?";
+									mes "I don't believe it!";
+									mes "Bah.. !";
+									next;
+								}
+								break;
+							case 2:
+								if (.@jun_mark == 1) {
+									emotion e_scissors;
+									emotion e_rock,1;
+									set .@pc_score,.@pc_score + 1;
+									set .@user_score,.@user_score + 1;
+									mes "[Mr. Jun]";
+									mes "No...!";
+									mes "Sacrilege!";
+									next;
+								}
+								else if (.@jun_mark == 2) {
+									emotion e_rock;
+									emotion e_rock,1;
+									mes "[Mr. Jun]";
+									mes "Hmpf.";
+									mes "It's a draw.";
+									mes "One more time!";
+									mes "Rock! Paper!";
+									mes "Scissors!";
+									next;
+								}
+								else {
+									emotion e_paper;
+									emotion e_rock,1;
+									set .@pc_score,.@pc_score + 1;
+									mes "[Mr. Jun]";
+									mes "Bwahahaha!";
+									mes "You lose, kid!";
+									next;
+								}
+								break;
+							case 3:
+								if (.@jun_mark == 1) {
+									emotion e_scissors;
+									emotion e_paper,1;
+									set .@pc_score,.@pc_score + 1;
+									mes "[Mr. Jun]";
+									mes "Heh heh~";
+									mes "Young fool!";
+									next;
+								}
+								else if (.@jun_mark == 2) {
+									emotion e_rock;
+									emotion e_paper,1;
+									set .@user_score,.@user_score + 1;
+									set .@pc_score,.@pc_score + 1;
+									mes "[Mr. Jun]";
+									mes "Noooo...!";
+									mes "This cannot be!";
+									next;
+								}
+								else {
+									emotion e_paper;
+									emotion e_paper,1;
+									mes "[Mr. Jun]";
+									mes "Hmpf.";
+									mes "It's a draw.";
+									mes "One more time!";
+									mes "Rock! Paper!";
+									mes "Scissors!";
+									next;
+								}
+								break;
+							}
+						}
+					}
+					if (.@user_score == 3) {
+						emotion e_pif;
+						mes "[Mr. Jun]";
+						mes "You... won.";
+						mes "I'm so exhausted.";
+						mes "I guess I can't compete";
+						mes "with you youngsters";
+						mes "anymore. Ha ha ha!";
+						next;
+						mes "[Mr. Jun]";
+						mes "As promised,";
+						mes "I shall share some";
+						mes "of my Lemons with you.";
+						mes "Grab as many as you want!";
+						mes "^3355FFYou have plucked";
+						mes "10 Lemons from the tree.^000000";
+						set tomyumgoong,5;
+						getitem 568,10; //Lemon
+						next;
+						emotion e_dots;
+						mes "[Mr. Jun]";
+						mes "Hmm...";
+						mes "Looks like you need a lot of them. Oh well, that's fine with me. I had a good time with you.";
+						next;
+						mes "[Mr. Jun]";
+						mes "Don't forget this though:";
+						mes "Don't be selfish, and always share what you have with others. That's one of the most important values for human beings.";
+						close;
+					}
+					emotion e_scissors;
+					mes "[Mr. Jun]";
+					mes "Muhahahaha!";
+					mes "Victory is mine!";
+					mes "Looks like you won't be getting";
+					mes "any Lemons for now! But feel free to challenge me anytime!";
+					close;
+				}
+				mes "[Mr. Jun]";
+				mes "Afraid are we?";
+				mes "There's no fooling you:";
+				mes "I'm one of the best at games!";
+				close;
+			}
+			mes "[Mr. Jun]";
+			mes "Hmm...";
+			mes "Now what can";
+			mes "I possibly do";
+			mes "with all these";
+			mes "Lemons?";
+			close;
+		}
+		mes "[Mr. Jun]";
+		mes "Feel free to";
+		mes "ask me for help";
+		mes "any time, okay?";
+		close;
+	}
 	mes "[Mr. Jun]";
-	mes "Ha ha ha!";
-	mes "Come back when you think you can beat me.";
+	mes "...";
 	close;
-s_Game:
-	mes "[Mr. Jun]";
-	mes "Good!";
-	mes "The game I want us to play is an easy children's game.";
-	next;
-	mes "[Mr. Jun]";
-	mes "^6B1312Rock,";
-	mes "^6B1312Paper, Scissors!";
-	mes "Perhaps you've heard";
-	mes "of it in your land.";
-	next;
-	mes "[Mr. Jun]";
-	mes "Nuh-uh, don't look at me like that.";
-	mes "I'm an old man, and I want to play this game re-live my youth a little bit. You'll understand when you're my age.";
-	next;
-	mes "[Mr. Jun]";
-	mes "Alright, if you win";
-	mes "^3C2EE63^000000 out of ^3C2EE65^000000 matches,";
-	mes "The lemons are yours.";
-	mes "Are you ready?";
-	next;
-s_Game4:
-	mes "[Mr. Jun]";
-	mes "Okay...";
-	mes "As you kids say,";
-	mes "^6B1312Let's get eXtreme!";
-s_Game3:
-	next;
-	mes "[Mr. Jun]";
-	mes "Rock!";
-	mes "Paper!";
-	mes "Scissors!";
-s_Game2:
-	next;
-	menu "Rock",s_Rock,"Paper",s_Paper,"Scissors",s_Scissors;
+}
 
-s_Rock:
-	set @npcvar,rand(1,3);
-	set @playervar,1;
-	next;
-	goto s_Play;
-s_Paper:
-	set @npcvar,rand(1,3);
-	set @playervar,2;
-	next;
-	goto s_Play;
-s_Scissors:
-	set @npcvar,rand(1,3);
-	set @playervar,3;
-	next;
-	goto s_Play;
-s_Play:
-	if(@playervar == 1 && @npcvar == 1)goto s_RockRock;	
-	if(@playervar == 1 && @npcvar == 2)goto s_RockPaper;
-	if(@playervar == 1 && @npcvar == 3)goto s_RockScissors;
-	if(@playervar == 2 && @npcvar == 1)goto s_PaperRock;
-	if(@playervar == 2 && @npcvar == 2)goto s_PaperPaper;
-	if(@playervar == 2 && @npcvar == 3)goto s_PaperScissors;
-	if(@playervar == 3 && @npcvar == 1)goto s_ScissorsRock;
-	if(@playervar == 3 && @npcvar == 2)goto s_ScissorsPaper;
-	if(@playervar == 3 && @npcvar == 3)goto s_ScissorsScissors;
-s_RockRock:
-	emotion e_rock;
-	emotion 11,1;
-	goto s_Draw;
-s_RockPaper:
-	emotion e_paper;
-	emotion 11,1;
-	goto s_Lose;
-s_RockScissors:
-	emotion e_scissors;
-	emotion 11,1;
-	goto s_Win;
-s_PaperRock:
-	emotion e_rock;
-	emotion 12,1;
-	goto s_Win;
-s_PaperPaper:
-	emotion e_paper;
-	emotion 12,1;
-	goto s_Draw;
-s_PaperScissors:
-	emotion e_scissors;
-	emotion 12,1;
-	goto s_Lose;
-s_ScissorsRock:
-	emotion e_rock;
-	emotion 10,1;
-	goto s_Lose;
-s_ScissorsPaper:
-	emotion e_paper;
-	emotion 10,1;
-	goto s_Win;
-s_ScissorsScissors:
-	emotion e_scissors;
-	emotion 10,1;
-	goto s_Draw;
-s_Draw:
-	mes "[Mr. Jun]";
-	mes "Hmpf.";
-	mes "It's a draw";
-	mes "One more time!";
-	mes "Rock! Paper!";
-	mes "Scissors!";
-	goto s_Game2;
-s_Lose:
-	mes "[Mr. Jun]";
-	mes "Yes...!";
-	mes "Oh my god, yes!";
-	set @npcpoint,@npcpoint+1;
-	if(@npcpoint == 3)goto s_Lose2;
-	goto s_Game3;
-s_Win:
-	set @playerpoint,@playerpoint+1;
-	mes "[Mr. Jun]";
-	if(@playerpoint == 1)mes "Noooo...! This cannot be!";
-	if(@playerpoint == 2)mes "What...? I don't believe it! Bah.. !";
-	if(@playerpoint == 3)mes "No...! Sacrilege!";
-	if(@playerpoint == 3)goto s_Win2;
-	goto s_Game3;
-s_Lose2:
-	if(ayolemon != 1)set ayolemon,1;
-//Custom Dialogues
-	next;
-	mes "[Mr. Jun]";
-	mes "I won!";
-	mes "Seems like I can keep up with the kids. Ha ha ha!";
-	next;
-	mes "[Mr. Jun]";
-	mes "If you still want the lemons I'm up for another game. So please don't hesitate to come back.";
-	set @playerpoint,0;
-	set @npcpoint,0;
-	close;	
-s_Win2:
-	next;
-	mes "[Mr. Jun]";
-	mes "You... won.";
-	mes "I'm so exhausted.";
-	mes "I guess I can't compete with you youngsters anymore. Ha ha ha!";
-	next;
-	mes "[Mr. Jun]";
-	mes "As promised,";
-	mes "I shall share some";
-	mes "of my Lemons with you.";
-	mes "Grab as many as you want!";
+ayothaya,213,94,7	script	Merchant#ayo	841,{
+	if (tomyumgoong == 6) {
+		mes "[Merchant Thongdum]";
+		mes "Hello, there~";
+		mes "Are you looking for";
+		mes "ingredients to make";
+		mes "Tom Yum Goong?";
+		next;
+		mes "[Merchant Thongdum]";
+		mes "Let's see...";
+		mes "I'm selling chiles,";
+		mes "fish sauce, and some";
+		mes "spices and flavorings";
+		mes "you'll need. I'll sell";
+		mes "it all to you for 2,000 zeny.";
+		next;
+		if (select("Thanks, I'll take it.:It's a rip-off, man!") == 1) {
+			emotion e_thx;
+			if (Zeny > 1999) {
+				set .@now_weight,MaxWeight-Weight;
+				if (.@now_weight > 1199) {
+					set zeny,zeny-2000;
+					set tomyumgoong,7;
+					getitem 7286,30; //Chilli
+					mes "[Merchant Thongdum]";
+					mes "Thank you.";
+					mes "I hope you will enjoy";
+					mes "your Tom Yum Goong~";
+					close;
+				}
+				mes "[Merchant Thongdum]";
+				mes "Uh oh...";
+				mes "It looks like";
+				mes "you're carrying";
+				mes "too much stuff";
+				mes "right now.";
+				next;
+				mes "[Merchant Thongdum]";
+				mes "I can't give you";
+				mes "anything if you don't";
+				mes "have the room to hold it!";
+				close;
+			}
+			mes "[Merchant Thongdum]";
+			mes "Hmm...?";
+			mes "Right now, it looks";
+			mes "like you don't have the";
+			mes "money to buy what you";
+			mes "need from me.";
+			close;
+		}
+		emotion e_no;
+		mes "[Merchant Thongdum]";
+		mes "Don't say that.";
+		mes "My prices are always";
+		mes "reasonable. I want you to know";
+		mes "that I'm a respectable Merchant.";
+		close;
+	}
+	else if (tomyumgoong == 7) {
+		mes "[Merchant Thongdum]";
+		mes "I thought I provided you";
+		mes "with enough ingredients, but";
+		mes "now that I think about it, I don't";
+		mes "know how much Tom Yum Goong";
+		mes "you're making.";
+		next;
+		mes "[Merchant Thongdum]";
+		mes "Would you like to";
+		mes "buy some more Chilis?";
+		next;
+		if (select("No, thanks.:Yes, please.") == 1) {
+			mes "[Merchant Thongdum]";
+			mes "Fare well~";
+			close;
+		}
+		if (Zeny > 1999) {
+			set .@now_weight,MaxWeight-Weight;
+			if (.@now_weight > 1199) {
+				set zeny,zeny-2000;
+				getitem 7286,30; //Chilli
+				mes "[Merchant Thongdum]";
+				mes "Thank you,";
+				mes "come again!";
+				close;
+			}
+			mes "[Merchant Thongdum]";
+			mes "Uh oh...";
+			mes "It looks like";
+			mes "you're carrying";
+			mes "too much stuff";
+			mes "right now.";
+			next;
+			mes "[Merchant Thongdum]";
+			mes "I can't give you";
+			mes "anything if you don't";
+			mes "have the room to hold it!";
+			close;
+		}
+		mes "[Merchant Thongdum]";
+		mes "Hmm...?";
+		mes "Right now, it looks";
+		mes "like you don't have the";
+		mes "money to buy what you";
+		mes "need from me.";
+		close;
+	}
+	mes "[Merchant Thongdum]";
+	mes "Hello there!";
+	mes "Ever try a Chili before?";
 	next;
-	set ayolemon,2;
-	getitem 568,10; //Lemon
-	mes "^3C2EE6You have plucked";
-	mes "^3C2EE610 Lemons from the tree.";
+	mes "[Merchant Thongdom]";
+	mes "Despite its tiny appearance,";
+	mes "it has a very strong flavor. It's also hot and spicy, so you should be careful when you eat one.";
 	next;
-	emotion e_dots;
-	mes "[Mr. Jun]";
-	mes "Hmm...";
-	mes "Looks like you need a lot of them.";
-	mes "Oh well, that's fine with me. I had";
-	mes "a good time with you.";
+	mes "[Merchant Thongdum]";
+	mes "The people of Ayotaya enjoy sensational food with distinct, spicy flavors. In Ayotayan cuisine, we use things like Chilis, garlic, ginger and cilantro.";
 	next;
-	mes "[Mr. Jun]";
-	mes "Don't forget this though:";
-	mes "Don't be selfish, and always share";
-	mes "what you have with others. That's";
-	mes "one of the most important values";
-	mes "for human beings.";
+	mes "[Merchant Thongdum]";
+	mes "I'm selling Chilis,";
+	mes "so if you need any,";
+	mes "please come to me~";
 	close;
 }
diff --git a/npc/warps/cities/ayothaya.txt b/npc/warps/cities/ayothaya.txt
index 400ef2c06..de563a229 100644
--- a/npc/warps/cities/ayothaya.txt
+++ b/npc/warps/cities/ayothaya.txt
@@ -9,86 +9,53 @@
 //===== Description: =========================================
 //= Warp Points for Ayothaya
 //===== Additional Comments: =================================
+//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+ayothaya,130,97,0	warp	ayo_tool1-1	1,1,ayo_in01,43,183
+ayo_in01,46,183,0	warp	ayo_tool1-2	1,1,ayothaya,132,99
+ayothaya,129,86,0	warp	ayo_tool2-1	1,1,ayo_in01,21,178
+ayo_in01,23,176,0	warp	ayo_tool2-2	1,1,ayothaya,132,86
+ayothaya,130,75,0	warp	ayo_tool3-1	1,1,ayo_in01,17,156
+ayo_in01,17,153,0	warp	ayo_tool3-2	1,1,ayothaya,132,73
+ayothaya,165,90,0	warp	ayo_weapon1-1	1,1,ayo_in01,77,174
+ayo_in01,73,174,0	warp	ayo_weapon1-2	1,1,ayothaya,162,90
+ayothaya,177,90,0	warp	ayo_weapon2-1	1,1,ayo_in01,95,175
+ayo_in01,98,175,0	warp	ayo_weapon2-2	1,1,ayothaya,180,90
+ayothaya,173,77,0	warp	ayo_weapon3-1	1,1,ayo_in01,85,152
+ayo_in01,85,149,0	warp	ayo_weapon3-2	1,1,ayothaya,173,74
+ayothaya,229,69,0	warp	ayo_pubGate_pub	1,1,ayo_in01,137,192
+ayo_in01,137,195,0	warp	ayo_pub_pubGate	1,1,ayothaya,229,72
+ayothaya,202,161,0	warp	ayo_inn1-1	1,1,ayo_in01,31,108
+ayo_in01,31,111,0	warp	ayo_inn1-2	1,1,ayothaya,202,164
+ayothaya,211,150,0	warp	ayo_inn2-1	1,1,ayo_in01,47,94
+ayo_in01,50,94,0	warp	ayo_inn2-2	1,1,ayothaya,214,150
+ayothaya,202,140,0	warp	ayo_inn3-1	1,1,ayo_in01,31,81
+ayo_in01,31,78,0	warp	ayo_inn3-2	1,1,ayothaya,202,137
+ayothaya,192,150,0	warp	ayo_inn4-1	1,1,ayo_in01,13,94
+ayo_in01,10,94,0	warp	ayo_inn4-2	1,1,ayothaya,189,150
+ayo_in01,13,107,0	warp	ayo_stairNW1-1	1,1,ayo_in01,132,27
+ayo_in01,135,27,0	warp	ayo_roomNW1-2	1,1,ayo_in01,17,107
+ayo_in01,48,107,0	warp	ayo_stairNE1-1	1,1,ayo_in01,179,27
+ayo_in01,176,27,0	warp	ayo_roomNE2-2	1,1,ayo_in01,45,107
+ayo_in01,13,82,0	warp	ayo_stairSW1-1	1,1,ayo_in01,18,14
+ayo_in01,21,14,0	warp	ayo_roomSW1-2	1,1,ayo_in01,17,82
+ayo_in01,48,82,0	warp	ayo_stairSE1-1	1,1,ayo_in01,63,14
+ayo_in01,60,14,0	warp	ayo_roomSE1-2	1,1,ayo_in01,45,82
+ayothaya,111,109,0	warp	ayo_house11-1	1,1,ayo_in01,180,129
+ayo_in01,177,129,0	warp	ayo_house111-2	1,1,ayothaya,111,106
+ayothaya,62,104,0	warp	ayo_house21-1	1,1,ayo_in01,191,183
+ayo_in01,194,183,0	warp	ayo_house21-2	1,1,ayothaya,65,104
+ayothaya,208,283,0	warp	ayo_shrine1-1	1,1,ayo_in02,100,152
+ayo_in02,100,148,0	warp	ayo_shrine1-2	1,1,ayothaya,208,280
+ayothaya,276,176,0	warp	ayo_fild1-1	1,1,ayo_fild01,37,241
+ayo_fild01,32,240,0	warp	ayo_fild1-2	1,1,ayothaya,273,176
+
+//============================================================ 
+// Old changelog
+//============================================================ 
 //= 1.1 Fixed Armory part by massdriller [Thanks to akusarujin]
 //= 1.2 Revised warps, due to official Ayothaya Town NPC [MasterOfMuppets]
 //= 1.3 Fixed swapped Inn Exits, thanks to Sir_Loon [Lupus]
 //= 1.4 Fixed a warp-back. [erKURITA]
 //============================================================
-
-
-//Entrance / Exit 
-ayothaya,277,176,0	warp	ayothayawarp001	2,2,ayo_fild01,36,239
-ayo_fild01,32,241,0	warp	ayothayawarp002	2,2,ayothaya,274,176
-
-//Castle
-ayothaya,207,285,0	warp	ayothayawarp007	2,2,ayo_in02,99,149
-ayo_in02,99,146,0	warp	ayothayawarp008	2,2,ayothaya,207,282
-
-//House
-ayothaya,128,86,0	warp	ayothayawarp009	2,2,ayo_in01,27,172
-ayo_in01,29,170,0	warp	ayothayawarp010	2,2,ayothaya,132,86
-ayothaya,129,96,0	warp	ayothayawarp011	2,2,ayo_in01,44,183
-ayo_in01,47,183,0	warp	ayothayawarp012	2,2,ayothaya,131,98
-ayothaya,130,75,0	warp	ayothayawarp013	2,2,ayo_in01,17,155
-ayo_in01,17,152,0	warp	ayothayawarp014	2,2,ayothaya,132,73
-
-//Restaurant/Bar -- Facing North
-ayothaya,229,70,0	warp	ayothayawarp015	2,2,ayo_in01,137,191
-ayo_in01,137,194,0	warp	ayothayawarp016	2,2,ayothaya,232,75
-
-//Armory -- East door
-ayothaya,176,90,0	warp	ayothayawarp017	2,2,ayo_in01,92,174
-ayo_in01,97,174,0	warp	ayothayawarp018	2,2,ayothaya,180,90
-
-//Armory -- South door
-ayothaya,172,77,0	warp	ayothayawarp019	2,2,ayo_in01,88,154
-ayo_in01,84,149,0	warp	ayothayawarp020	2,2,ayothaya,172,74
-
-//Armory -- West door
-ayothaya,166,90,0	warp	ayothayawarp021	2,2,ayo_in01,75,174
-ayo_in01,73,174,0	warp	ayothayawarp022	2,2,ayothaya,163,90
-
-//Straw-roof hut -- Middle - Facing West
-//ayothaya,120,164,0	warp	ayothayawarp023	2,2,ayo_in01,,
-//ayo_in01,,,0	warp	ayothayawarp024	2,2,ayothaya,116,164
-
-//Straw-roof hut -- On Beach -- Facing South East
-//ayothaya,60,148,0	warp	ayothayawarp025	2,2,ayo_in01,,
-//ayo_in01,,,0	warp	ayothayawarp026	2,2,ayothaya,61,146
-
-//Straw-roof hut -- East Side (Middle) -- Facing East
-ayothaya,61,104,0	warp	ayothayawarp029	2,2,ayo_in01,191,183
-ayo_in01,194,183,0	warp	ayothayawarp030	2,2,ayothaya,66,104
-
-//Straw-roof hut -- East Side (Lower) -- Facing North
-//ayothaya,77,88,0	warp	ayothayawarp031	2,2,ayo_in01,,
-//ayo_in01,,,0	warp	ayothayawarp032	2,2,ayothaya,77,92
-
-//Larger Straw-roof hut -- East Side (Middle) -- Facing South
-ayothaya,111,109,0	warp	ayothayawarp033	2,2,ayo_in01,180,128
-ayo_in01,177,128,0	warp	ayothayawarp034	2,2,ayothaya,111,105
-
-//Inn -- North Door
-ayothaya,202,158,0	warp	ayothayawarp035	2,2,ayo_in01,30,107
-ayo_in01,30,110,0	warp	ayothayawarp036	2,2,ayothaya,202,161
-//Inn -- West Door 
-ayothaya,193,149,0	warp	ayothayawarp037	2,2,ayo_in01,14,94
-ayo_in01,11,94,0	warp	ayothayawarp038	2,2,ayothaya,189,149
-//Inn -- South Door
-ayothaya,202,141,0	warp	ayothayawarp039	2,2,ayo_in01,30,82
-ayo_in01,30,79,0	warp	ayothayawarp040	2,2,ayothaya,202,138
-//Inn -- East Door 
-ayothaya,211,149,0	warp	ayothayawarp041	2,2,ayo_in01,47,94
-ayo_in01,50,94,0	warp	ayothayawarp042	2,2,ayothaya,214,149 
-//Inn Room --Upper Right
-ayo_in01,48,83,0	warp	ayothayawarp043	2,2,ayo_in01,61,15
-ayo_in01,59,15,0	warp	ayothayawarp044	2,2,ayo_in01,45,83
-//Inn Room -- Upper Left
-ayo_in01,48,107,0	warp	ayothayawarp045	2,2,ayo_in01,177,27
-ayo_in01,175,27,0	warp	ayothayawarp046	2,2,ayo_in01,45,107
-//Inn Room --Bottom Right
-ayo_in01,13,83,0	warp	ayothayawarp047	2,2,ayo_in01,19,15
-ayo_in01,22,15,0	warp	ayothayawarp048	2,2,ayo_in01,16,83
-//Inn Room -- Bottom Left
-ayo_in01,13,107,0	warp	ayothayawarp049	2,2,ayo_in01,133,27
-ayo_in01,136,27,0	warp	ayothayawarp050	2,2,ayo_in01,16,107
diff --git a/npc/warps/dungeons/ayo_dun.txt b/npc/warps/dungeons/ayo_dun.txt
index 75bb8659a..cf4c154e8 100644
--- a/npc/warps/dungeons/ayo_dun.txt
+++ b/npc/warps/dungeons/ayo_dun.txt
@@ -3,19 +3,23 @@
 //===== By: ==================================================
 //= eAthena Team (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 10+
 //===== Description: =========================================
 //= Warp Points for Ayothaya Dungeon
 //===== Additional Comments: =================================
-//= 1.0 Splitted 2 files [Lupus]
-//= Should some warps be disabled due to Dungeon Quest?
+//= 1.1 Rescritped to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
+ayo_fild02,285,149,0	warp	ayo_dun1-1	1,1,ayo_dun01,275,18
+ayo_dun01,274,14,0	warp	ayo_dun1-2	1,1,ayo_fild02,279,150
+ayo_dun02,24,22,0	warp	ayo_dun2-1	1,1,ayo_dun01,24,279
+ayo_dun02,276,22,0	warp	ayo_dun2-2	1,1,ayo_dun01,24,279
 
-//Dungeon 
-ayo_fild02,285,150,0	warp	ayodunwrp001	2,2,ayo_dun01,275,17
-ayo_dun01,275,14,0	warp	ayodunwrp002	2,2,ayo_fild02,282,150
-ayo_dun02,24,21,0	warp	ayodunwrp003	2,2,ayo_dun01,24,281
-ayo_dun02,275,21,0	warp	ayodunwrp004	2,2,ayo_dun01,24,281
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.0 Splitted 2 files [Lupus]
+//= Should some warps be disabled due to Dungeon Quest?
+//============================================================