* Updated Kunlun NPCs and warps.

- Didn't update the Kunlun 'Power' npcs
- Updated Lutie and Comodo warps.
* Fixed some slight inconsistencies with the some script headers.

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

3 files changed, 50 insertions, 44 deletions

diff --git a/npc/warps/dungeons/beach_dun.txt b/npc/warps/dungeons/beach_dun.txt
index ba6e36989..4fd5f181c 100644
--- a/npc/warps/dungeons/beach_dun.txt
+++ b/npc/warps/dungeons/beach_dun.txt
@@ -3,17 +3,21 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
-//= Warp Points Comodo Dungeon
+//= [Aegis Conversion]
+//= Comodo Beach Dungeon warp script
 //===== Additional Comments: =================================
-//= No comment!
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-//Beach Dungeon ==============================================
-beach_dun,276,67,0	warp	cmd004	1,1,comodo,31,215
-beach_dun2,154,13,0	warp	cmd005	2,1,comodo,176,353
-beach_dun3,17,265,0	warp	cmd007	1,1,comodo,328,175
-beach_dun3,286,57,0	warp	cmd006	1,1,cmd_fild01,30,317
+comodo,24,214,0	warp	cmd_beach_dun1-1	1,1,beach_dun,266,67
+beach_dun,276,67,0	warp	cmd_beach_dun1-2	1,1,comodo,31,215
+comodo,176,358,0	warp	cmd_beach_dun2-1	1,1,beach_dun2,154,25
+beach_dun2,154,13,0	warp	cmd_beach_dun2-2	2,1,comodo,176,353
+comodo,333,175,0	warp	cmd_beach_dun3-1	1,1,beach_dun3,23,260
+beach_dun3,17,265,0	warp	cmd_beach_dun3-2	1,1,comodo,328,175
+beach_dun3,286,57,0	warp	cmd_beach_dun4-1	1,1,cmd_fild01,30,317
+cmd_fild01,26,318,0	warp	cmd_beach_dun4-2	1,1,beach_dun3,281,56
diff --git a/npc/warps/dungeons/gon_dun.txt b/npc/warps/dungeons/gon_dun.txt
index 847f4bde8..7924fb513 100644
--- a/npc/warps/dungeons/gon_dun.txt
+++ b/npc/warps/dungeons/gon_dun.txt
@@ -1,40 +1,41 @@
 //===== eAthena Script =======================================
-//= Gonryun Dungeon Warp Script
+//= Kunlun Dungeon Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 5+
 //===== Description: =========================================
-//= Warp Points for Gonryun
+//= [Aegis Conversion]
+//= Warp Points for Kunlun dungeon
 //===== Additional Comments: =================================
-//= No comment!
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-//= Gonryun Dungeon ==========================================
-gon_dun01,153,45,0	warp	gon20	1,1,gonryun,159,198
-gon_dun01,162,273,0	warp	gon21	1,1,gon_dun02,17,113
-gon_dun02,14,113,0	warp	gon22	1,1,gon_dun01,162,270
-gon_dun02,56,119,0	warp	gon23	1,1,gon_dun02,47,210/*‘ŠŒŬF*/
-gon_dun02,92,190,0	warp	gon24	1,1,gon_dun02,199,20/*‘ŠŒŬE*/
-gon_dun02,44,213,0	warp	gon25	1,1,gon_dun02,51,119/*‘ŠŒŬF*/
-gon_dun02,44,166,0	warp	gon26	1,1,gon_dun02,97,121/*Šm’è*/
-gon_dun02,94,118,0	warp	gon27	1,1,gon_dun02,177,189/*Šm’è*/
-gon_dun02,76,100,0	warp	gon28	1,1,gon_dun02,145,62/*Šm’è*/
-gon_dun02,63,66,0	warp	gon29	1,1,gon_dun02,203,94/*‘ŠŒŬA*/
-gon_dun02,86,44,0	warp	gon30	1,1,gon_dun02,145,233/*Šm’è*/
-gon_dun02,148,236,0	warp	gon31	1,1,gon_dun02,234,194/*‘ŠŒŬD*/
-gon_dun02,171,258,0	warp	gon32	1,1,gon_dun02,76,96/*Šm’è*/
-gon_dun02,180,189,0	warp	gon33	1,1,gon_dun02,170,164/*Šm’è*/
-gon_dun02,165,189,0	warp	gon34	1,1,gon_dun02,235,135/*‘ŠŒŬC*/
-gon_dun02,170,161,0	warp	gon35	1,1,gon_dun02,89,41/*Šm’è*/
-gon_dun02,168,92,0	warp	gon36	1,1,gon_dun02,273,76/*‘ŠŒŬB*/
-gon_dun02,145,66,0	warp	gon37	1,1,gon_dun02,199,20/*Šm’è*/
-gon_dun02,234,191,0	warp	gon38	1,1,gon_dun02,145,233/*‘ŠŒŬD*/
-gon_dun02,235,138,0	warp	gon39	1,1,gon_dun02,168,189/*‘ŠŒŬC*/
-gon_dun02,199,94,0	warp	gon40	1,1,gon_dun02,60,70/*‘ŠŒŬA*/
-gon_dun02,276,76,0	warp	gon41	1,1,gon_dun02,163,87/*‘ŠŒŬB*/
-gon_dun02,196,20,0	warp	gon42	1,1,gon_dun02,95,190/*‘ŠŒŬE*/
-gon_dun02,251,268,0	warp	gon43	1,1,gon_dun03,68,9
-gon_dun03,68,6,0	warp	gon44	1,1,gon_dun02,251,265
+gonryun,159,201,0	warp	gon_dun1-1	1,1,gon_dun01,153,48
+gon_dun01,153,45,0	warp	gon_dun1-2	1,1,gonryun,159,198
+gon_dun01,162,273,0	warp	gon_dun2-1	1,1,gon_dun02,17,113
+gon_dun02,14,113,0	warp	gon_dun2-2	1,1,gon_dun01,162,270
+gon_dun02,44,213,0	warp	gon_dun3-1	1,1,gon_dun02,51,119
+gon_dun02,92,190,0	warp	gon_dun3-2	1,1,gon_dun02,199,20
+gon_dun02,44,166,0	warp	gon_dun3-3	1,1,gon_dun02,97,121
+gon_dun02,148,236,0	warp	gon_dun3-4	1,1,gon_dun02,234,194
+gon_dun02,171,258,0	warp	gon_dun3-5	1,1,gon_dun02,76,96
+gon_dun02,234,191,0	warp	gon_dun3-6	1,1,gon_dun02,145,233
+gon_dun02,165,189,0	warp	gon_dun3-7	1,1,gon_dun02,235,135
+gon_dun02,180,189,0	warp	gon_dun3-8	1,1,gon_dun02,170,164
+gon_dun02,170,161,0	warp	gon_dun3-9	1,1,gon_dun02,89,41
+gon_dun02,56,119,0	warp	gon_dun3-10	1,1,gon_dun02,47,210
+gon_dun02,94,118,0	warp	gon_dun3-11	1,1,gon_dun02,177,189
+gon_dun02,76,100,0	warp	gon_dun3-12	1,1,gon_dun02,145,62
+gon_dun02,63,66,0	warp	gon_dun3-14	1,1,gon_dun02,203,94
+gon_dun02,86,44,0	warp	gon_dun3-15	1,1,gon_dun02,145,233
+gon_dun02,168,92,0	warp	gon_dun3-16	1,1,gon_dun02,273,76
+gon_dun02,145,66,0	warp	gon_dun3-17	1,1,gon_dun02,199,20
+gon_dun02,235,138,0	warp	gon_dun3-18	1,1,gon_dun02,168,189
+gon_dun02,199,94,0	warp	gon_dun3-19	1,1,gon_dun02,60,70
+gon_dun02,276,76,0	warp	gon_dun3-20	1,1,gon_dun02,163,87
+gon_dun02,196,20,0	warp	gon_dun3-21	1,1,gon_dun02,95,190
+gon_dun02,251,268,0	warp	gon_dun4-1	1,1,gon_dun03,68,9
+gon_dun03,68,6,0	warp	gon_dun4-2	1,1,gon_dun02,251,265
diff --git a/npc/warps/dungeons/xmas_dun.txt b/npc/warps/dungeons/xmas_dun.txt
index ff14558bb..fbcb6b511 100644
--- a/npc/warps/dungeons/xmas_dun.txt
+++ b/npc/warps/dungeons/xmas_dun.txt
@@ -3,16 +3,17 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 2+
 //===== Description: =========================================
-//= Warp Points for Lutie Dungeon (Toy Factory)
+//= Warp Points for Toy Factory
 //===== Additional Comments: =================================
 //= 1.1 Fixed endless warping loop
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-//= Toy Factory ==============================================
-xmas_dun01,128,133,0	warp	xmas15	3,3,xmas_dun02,129,133
-xmas_dun01,205,13,0	warp	xmas14-1	3,3,xmas,143,308
-xmas_dun02,129,129,0	warp	xmas15-1	3,3,xmas_dun01,128,128
+xmas,143,314,0	warp	xmas_dun1-1	1,1,xmas_dun01,205,16
+xmas_dun01,205,13,0	warp	xmas_dun1-2	1,1,xmas,143,311
+xmas_dun01,129,130,0	warp	xmas_dun2-1	1,1,xmas_dun02,131,130
+xmas_dun02,129,130,0	warp	xmas_dun2-2	1,1,xmas_dun01,132,130
\ No newline at end of file