Updated Ayothaya NPCs, Quests, and Warps.

- Should also fix bugreport:586 (Footprint2 error)


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

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

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

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

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