Updated Amatsu NPCs, Quests, and Warps.

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

3 files changed, 57 insertions, 56 deletions

diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt
index 6a90860a6..3262f1692 100644
--- a/npc/warps/cities/amatsu.txt
+++ b/npc/warps/cities/amatsu.txt
@@ -1,49 +1,53 @@
 //===== eAthena Script =======================================
-//= Amatsu Warp Script
+//= Amatsu Warps Script
 //===== By: ==================================================
 //= Athena (1.0)
 //= Nana (1.1)
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
+//= [Aegis COnversion]
 //= Warp Points for Amatsu
 //===== Additional Comments: =================================
+//= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//=	Renamed warps for ease-of-reading.
+//============================================================
+
+amatsu,177,138,0	warp	ama_house1-1	1,1,ama_in01,28,176
+ama_in01,31,176,0	warp	ama_house1-2	1,1,amatsu,180,138
+amatsu,248,160,0	warp	ama_house2-1	1,1,ama_in01,79,178
+ama_in01,76,178,0	warp	ama_house2-2	1,1,amatsu,245,160
+amatsu,168,182,0	warp	ama_warrior1-1	1,1,ama_in01,34,99
+ama_in01,34,96,0	warp	ama_warrior1-2	1,1,amatsu,168,179
+amatsu,52,148,0	warp	ama_deluxe1-1	1,1,ama_in01,88,97
+ama_in01,88,94,0	warp	ama_deluxe1-2	1,1,amatsu,52,145
+amatsu,94,117,0	warp	ama_tools1-1	1,1,ama_in01,30,24
+ama_in01,33,24,0	warp	ama_tools1-2	1,1,amatsu,97,117
+amatsu,132,117,0	warp	ama_weapon1-1	1,1,ama_in01,89,23
+ama_in01,86,23,0	warp	ama_weapon1-2	1,1,amatsu,129,117
+amatsu,217,116,0	warp	ama_tavern1-1	1,1,ama_in01,162,25
+ama_in01,157,25,0	warp	ama_tavern1-2	1,1,amatsu,214,116
+ama_in01,166,73,0	warp	ama_inn1-1	1,1,ama_in01,162,31
+ama_in01,162,34,0	warp	ama_inn1-2	1,1,ama_in01,166,77
+
+amatsu,85,235,0	warp	ama_castle1-1	1,1,ama_in02,223,45
+ama_in02,226,45,0	warp	ama_castle1-2	1,1,amatsu,88,235
+ama_in02,65,37,0	warp	ama_castle2-1	1,1,ama_in02,195,41
+ama_in02,195,44,0	warp	ama_castle2-2	1,1,ama_in02,65,40
+ama_in02,59,141,0	warp	ama_castle3-1	1,1,ama_in02,56,41
+ama_in02,56,44,0	warp	ama_castle3-2	1,1,ama_in02,59,144
+ama_in02,215,149,0	warp	ama_castle4-1	1,1,ama_in02,59,156
+ama_in02,59,160,0	warp	ama_castle4-2	1,1,ama_in02,215,152
+ama_in02,126,164,0	warp	ama_castle5-1	1,1,ama_in02,219,161
+ama_in02,222,161,0	warp	ama_castle5-2	1,1,ama_in02,129,164
+
+//============================================================ 
+// Old changelog
+//============================================================ 
 //= 1.3 Fixed a warp-back [erKURITA]
 //= 1.4 Added Ninja's Warps. Thanks to RockmanEXE for the info. [erKURITA]
 //= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
-//= 1.6 Movves Job Quest related warps to proper file. [L0ne_W0lf]
+//= 1.6 Moved Job Quest related warps to proper file. [L0ne_W0lf]
 //============================================================
-
-//= Amatsu ===================================================
-ama_in01,157,25,0	warp	warp1969	1,1,amatsu,213,116
-ama_in01,161,34,0	warp	warp1970	1,1,ama_in01,166,77
-ama_in01,166,73,0	warp	warp1971	1,1,ama_in01,162,32
-ama_in01,174,120,0	warp	warp2011	1,1,amatsu,217,146
-ama_in01,174,170,0	warp	warp2012	1,1,ama_fild01,174,328
-ama_in01,31,176,0	warp	warp2010	1,1,amatsu,42,110
-ama_in01,32,24,0	warp	warp1963	1,1,amatsu,98,117
-ama_in01,34,97,0	warp	warp1965	1,1,amatsu,168,178
-ama_in01,77,177,0	warp	warp1967	1,1,amatsu,246,160
-ama_in01,86,23,0	warp	warp2009	1,1,amatsu,129,117
-ama_in01,88,94,0	warp	warp2008	1,1,amatsu,52,145
-ama_in02,127,163,0	warp	warp1980	1,1,ama_in02,220,161
-ama_in02,195,44,0	warp	warp1973a	1,1,ama_in02,65,40
-ama_in02,215,150,0	warp	warp1978	1,1,ama_in02,59,156
-ama_in02,222,161,0	warp	warp1979	1,1,ama_in02,130,163
-ama_in02,227,45,0	warp	warp1973b	1,1,amatsu,88,235
-ama_in02,56,44,0	warp	warp1975	1,1,ama_in02,59,144
-ama_in02,59,142,0	warp	warp1976	1,1,ama_in02,56,41
-ama_in02,59,159,0	warp	warp1977	1,1,ama_in02,215,152
-ama_in02,65,38,0	warp	warp1974	1,1,ama_in02,195,41
-amatsu,132,117,0	warp	warp1989	1,1,ama_in01,88,22
-amatsu,168,180,0	warp	warp1964	1,1,ama_in01,34,99
-amatsu,216,116,0	warp	warp1968	1,1,ama_in01,162,25
-amatsu,217,149,0	warp	warp1987	1,1,ama_in01,174,122
-amatsu,247,290,0	warp	warp1960	1,1,ama_fild01,73,32
-amatsu,249,160,0	warp	warp1966	1,1,ama_in01,79,178
-amatsu,40,110,0	warp	warp1995	1,1,ama_in01,28,176
-amatsu,52,148,0	warp	warp1994	1,1,ama_in01,88,97
-amatsu,85,235,0	warp	warp1972	1,1,ama_in02,224,45
-amatsu,96,117,0	warp	warp1962	1,1,ama_in01,29,23
diff --git a/npc/warps/dungeons/ama_dun.txt b/npc/warps/dungeons/ama_dun.txt
index 68defa5e9..91d360651 100644
--- a/npc/warps/dungeons/ama_dun.txt
+++ b/npc/warps/dungeons/ama_dun.txt
@@ -3,19 +3,17 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
-//= Warp Points for Amatsu
+//= [Aegis Conversion]
+//= Warp Points for Amatsu Dungeon
 //===== Additional Comments: =================================
-//= Split off amatsu.txt
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-//= Amatsu Dungeon ===========================================
-//disabled due to amatsu dungeon quest
-//ama_dun01,228,6,0	warp	warp8007	1,1,ama_test,50,87
-ama_dun01,234,143,0	warp	warp8008	1,1,ama_dun02,31,41
-ama_dun02,196,124,0	warp	warp8010	1,1,ama_dun03,119,14
-ama_dun02,29,41,0	warp	warp8009	1,1,ama_dun01,231,143
-ama_dun03,119,9,0	warp	warp8011	1,1,ama_dun02,196,121
+ama_dun01,235,144,0	warp	ama_dun1-1	1,1,ama_dun02,33,40
+ama_dun02,30,40,0	warp	ama_dun1-2	1,1,ama_dun01,232,144
+ama_dun02,196,123,0	warp	ama_dun2-1	1,1,ama_dun03,120,12
+ama_dun03,120,9,0	warp	ama_dun2-2	1,1,ama_dun02,196,120
diff --git a/npc/warps/fields/amatsu_fild.txt b/npc/warps/fields/amatsu_fild.txt
index cc61996e8..5b692921b 100644
--- a/npc/warps/fields/amatsu_fild.txt
+++ b/npc/warps/fields/amatsu_fild.txt
@@ -3,20 +3,19 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
-//= Warp Points for Amatsu Field's
+//= [Aegis COnversion]
+//= Warp Points for Amatsu Field
 //===== Additional Comments: =================================
-//= Split off amatsu.txt
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-//= Amatsu Fields ============================================
-// removed
-//ama_fild,154,301,0	warp	warp1998	1,1,prontera,163,186
-//ama_fild,174,132,0	warp	warp1996	1,1,prontera,163,186
-//ama_fild,193,302,0	warp	warp1997	1,1,prontera,163,186
-//ama_fild,330,141,0	warp	warp1999	1,1,prontera,163,186
-ama_fild01,174,332,0	warp	warp8003	1,1,ama_in01,175,174
-ama_fild01,75,29,0	warp	warp1961	1,1,amatsu,247,287
+amatsu,248,292,0	warp	ama_fild1-1	1,1,ama_fild01,75,33
+ama_fild01,75,30,0	warp	ama_fild1-2	1,1,amatsu,248,289
+ama_fild01,174,331,0	warp	ama_shrine1-1	1,1,ama_in01,175,174
+ama_in01,175,171,0	warp	ama_shrine1.2	1,1,ama_fild01,174,328
+ama_fild01,330,141,0	warp	ama_craftsman1-1	1,1,ama_in01,174,124
+ama_in01,174,121,0	warp	ama_craftsman1.2	1,1,ama_fild01,330,138