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

2 files changed, 57 insertions, 86 deletions

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