summaryrefslogtreecommitdiff
path: root/npc/warps
diff options
context:
space:
mode:
Diffstat (limited to 'npc/warps')
-rw-r--r--npc/warps/cities/comodo.txt71
-rw-r--r--npc/warps/cities/gonryun.txt49
-rw-r--r--npc/warps/cities/lutie.txt51
-rw-r--r--npc/warps/dungeons/beach_dun.txt20
-rw-r--r--npc/warps/dungeons/gon_dun.txt61
-rw-r--r--npc/warps/dungeons/xmas_dun.txt13
-rw-r--r--npc/warps/fields/com_fild.txt83
-rw-r--r--npc/warps/fields/lutie_fild.txt11
8 files changed, 180 insertions, 179 deletions
diff --git a/npc/warps/cities/comodo.txt b/npc/warps/cities/comodo.txt
index f63c8ee42..5c7993dae 100644
--- a/npc/warps/cities/comodo.txt
+++ b/npc/warps/cities/comodo.txt
@@ -3,48 +3,43 @@
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
+//= [Aegis Conversion]
//= Warp Points Comodo city
-//= Rogue guild
//===== Additional Comments: =================================
-//= No comment!
+//= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//============================================================
-
-//Comodo City =====================================================
-comodo,115,291,0 warp cmd09 1,1,cmd_in02,67,132
-comodo,126,98,0 warp cmd02 1,1,cmd_in02,144,97
-comodo,130,195,0 warp cmd05 1,1,cmd_in02,143,173
-comodo,140,111,0 warp cmd04 1,1,cmd_in02,178,132
-comodo,140,90,0 warp cmd01 1,1,cmd_in02,74,25
-comodo,145,328,0 warp cmd11 1,1,cmd_in01,120,71
-comodo,153,97,0 warp cmd03 1,1,cmd_in02,212,97
-comodo,176,358,0 warp cmd002 1,1,beach_dun2,154,25
-comodo,192,294,0 warp cmd17 1,1,cmd_in01,177,123
-comodo,236,298,0 warp cmd08 1,1,cmd_in01,179,81
-comodo,25,214,0 warp cmd001 1,1,beach_dun,266,67
-comodo,265,74,0 warp cmd06 1,1,cmd_in01,123,180
-comodo,271,271,0 warp cmd10 1,1,cmd_in01,113,125
-comodo,332,175,0 warp cmd003 1,1,beach_dun3,23,260
-comodo,92,128,0 warp cmd07 1,1,cmd_in01,85,174
-cmd_in01,109,125,0 warp cmd10-1 1,1,comodo,269,273
-cmd_in01,120,67,0 warp cmd11-1 1,1,comodo,145,324
-cmd_in01,123,186,0 warp cmd06-1 1,1,comodo,265,79
-cmd_in01,183,123,0 warp cmd17-1 1,1,comodo,195,294
-cmd_in01,183,81,0 warp cmd08-1 1,1,comodo,239,296
-cmd_in01,90,174,0 warp cmd07-1 1,1,comodo,97,128
-cmd_in02,139,169,0 warp cmd05-1 1,1,comodo,127,191
-cmd_in02,139,97,0 warp cmd02-1 1,1,comodo,122,98
-cmd_in02,168,113,0 warp cmd15-1 1,1,cmd_in02,63,73
-cmd_in02,178,136,0 warp cmd04-1 1,1,comodo,140,115
-cmd_in02,187,78,0 warp cmd14-2 1,1,cmd_in02,84,37
-cmd_in02,208,206,0 warp cmd16 1,1,cmd_in02,97,211
-cmd_in02,216,97,0 warp cmd03-1 1,1,comodo,157,97
-cmd_in02,58,74,0 warp cmd15 1,1,cmd_in02,166,116
-cmd_in02,69,129,0 warp cmd09-1 4,4,comodo,115,288
-cmd_in02,74,21,0 warp cmd01-1 1,1,comodo,140,86
-cmd_in02,90,37,0 warp cmd14 1,1,cmd_in02,191,77
-cmd_in02,98,216,0 warp cmd16-1 1,1,cmd_in02,207,210
+comodo,92,128,0 warp cmd_tools1-1 1,1,cmd_in01,85,174
+cmd_in01,90,174,0 warp cmd_tools1-2 1,1,comodo,97,128
+comodo,265,74,0 warp cmd_weapon1-1 1,1,cmd_in01,123,180
+cmd_in01,123,186,0 warp cmd_weapon1-2 1,1,comodo,265,79
+comodo,271,271,0 warp cmd_house1-1 1,1,cmd_in01,113,125
+cmd_in01,109,125,0 warp cmd_house1-2 1,1,comodo,269,273
+comodo,192,294,0 warp cmd_house2-1 1,1,cmd_in01,177,123
+cmd_in01,183,123,0 warp cmd_house2-2 1,1,comodo,195,294
+comodo,145,328,0 warp cmd_house3-1 1,1,cmd_in01,120,71
+cmd_in01,120,67,0 warp cmd_house3-2 1,1,comodo,145,324
+comodo,236,298,0 warp cmd_house4-1 1,1,cmd_in01,179,81
+cmd_in01,183,81,0 warp cmd_house4-2 1,1,comodo,239,296
+comodo,130,195,0 warp cmd_KAFRA1-1 1,1,cmd_in02,143,173
+cmd_in02,139,169,0 warp cmd_KAFRA1-2 1,1,comodo,127,191
+cmd_in02,208,206,0 warp cmd_KAFRA2-1 1,1,cmd_in02,97,211
+cmd_in02,98,216,0 warp cmd_KAFRA12-2 1,1,cmd_in02,207,210
+comodo,115,291,0 warp cmd_chief1-1 1,1,cmd_in02,67,132
+cmd_in02,69,129,0 warp cmd_chief1-2 1,1,comodo,115,288
+comodo,140,111,0 warp cmd_casino1-1 1,1,cmd_in02,178,132
+cmd_in02,178,136,0 warp cmd_casino1-2 1,1,comodo,140,115
+comodo,153,97,0 warp cmd_casino2-1 1,1,cmd_in02,212,97
+cmd_in02,216,97,0 warp cmd_casino2-2 1,1,comodo,157,97
+comodo,126,98,0 warp cmd_casino3-1 1,1,cmd_in02,144,97
+cmd_in02,139,97,0 warp cmd_casino3-2 1,1,comodo,122,98
+comodo,140,90,0 warp cmd_casino4-1 1,1,cmd_in02,74,25
+cmd_in02,74,21,0 warp cmd_casino4-2 1,1,comodo,140,86
+cmd_in02,168,113,0 warp cmd_casino5-1 1,1,cmd_in02,63,73
+cmd_in02,58,74,0 warp cmd_casino5-2 1,1,cmd_in02,166,116
+cmd_in02,187,78,0 warp cmd_casino6-1 1,1,cmd_in02,84,37
+cmd_in02,90,37,0 warp cmd_casino6-2 1,1,cmd_in02,191,77 \ No newline at end of file
diff --git a/npc/warps/cities/gonryun.txt b/npc/warps/cities/gonryun.txt
index afbba5ac9..98e17572a 100644
--- a/npc/warps/cities/gonryun.txt
+++ b/npc/warps/cities/gonryun.txt
@@ -1,34 +1,35 @@
//===== eAthena Script =======================================
-//= Gonryun Town Warp Script
+//= Kunlun Town 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
//===== Additional Comments: =================================
-//= No comment!
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//============================================================
-//= Gonryun ==================================================
-gonryun,161,8,0 warp gon02 1,1,gon_fild01,191,261
-gonryun,195,93,0 warp gon03 1,1,gon_in,95,23
-gonryun,109,131,0 warp gon15 1,1,gon_in,44,24
-gonryun,215,114,0 warp gon05 1,1,gon_in,152,24
-gonryun,107,184,0 warp gon13 1,1,gon_in,72,70
-gonryun,221,162,0 warp gon11 1,1,gon_in,112,98
-gonryun,159,201,0 warp gon19 1,1,gon_dun01,153,48
-gon_in,95,26,0 warp gon04 1,1,gonryun,195,96
-gon_in,149,24,0 warp gon06 1,1,gonryun,212,114
-gon_in,184,11,0 warp gon07 1,1,gon_in,189,85
-gon_in,186,85,0 warp gon08 1,1,gon_in,181,11
-gon_in,186,107,0 warp gon09 1,1,gon_in,181,36
-gon_in,184,36,0 warp gon10 1,1,gon_in,189,107
-gon_in,109,98,0 warp gon12 1,1,gonryun,218,162
-gon_in,72,67,0 warp gon14 1,1,gonryun,107,181
-gon_in,47,24,0 warp gon16 1,1,gonryun,112,131
-gon_in,42,35,0 warp gon17 1,1,gon_in,34,97
-gon_in,31,97,0 warp gon18 1,1,gon_in,39,35
-gon_fild01,192,266,0 warp gon01 1,1,gonryun,161,11
+gonryun,221,162,0 warp gon_house1-1 1,1,gon_in,112,98
+gon_in,109,98,0 warp gon_house1-2 1,1,gonryun,218,162
+gonryun,195,93,0 warp gon_house2-1 1,1,gon_in,95,23
+gon_in,95,26,0 warp gon_house2=2 1,1,gonryun,195,96
+gonryun,107,184,0 warp gon_tea1-1 1,1,gon_in,72,70
+gon_in,72,67,0 warp gon_tea2-1 1,1,gonryun,107,181
+gonryun,215,114,0 warp gon_tavern1-1 1,1,gon_in,152,24
+gon_in,149,24,0 warp gon_tavern1-2 1,1,gonryun,212,114
+gon_in,184,36,0 warp gon_inn1-1 1,1,gon_in,189,107
+gon_in,186,107,0 warp gon_inn1-2 1,1,gon_in,181,36
+gon_in,184,11,0 warp gon_inn2-1 1,1,gon_in,189,85
+gon_in,186,85,0 warp gon_inn2-2 1,1,gon_in,181,11
+gonryun,109,131,0 warp gon_castle1-1 1,1,gon_in,44,24
+gon_in,47,24,0 warp gon_castle1-2 1,1,gonryun,112,131
+gon_in,42,35,0 warp gon_castle2-1 1,1,gon_in,34,97
+gon_in,31,97,0 warp gon_castle2-2 1,1,gon_in,39,35
+gonryun,161,8,0 warp gon_fild1-1 1,1,gon_fild01,191,261
+gon_fild01,192,265,0 warp gon_fild1-2 1,1,gonryun,161,11
+
+
diff --git a/npc/warps/cities/lutie.txt b/npc/warps/cities/lutie.txt
index a86a7b111..114439865 100644
--- a/npc/warps/cities/lutie.txt
+++ b/npc/warps/cities/lutie.txt
@@ -3,36 +3,37 @@
//===== By: ==================================================
//= Athena (1.0) Nana (1.1)
//===== Current Version: =====================================
-//= 1.2a
+//= 1.3
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 2+
//===== Description: =========================================
+//= [Aegis Conversion]
//= Warp Points for Lutie
//===== Additional Comments: =================================
//= 1.2a Re-fixed endless warping loop
+//= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//============================================================
-xmas,150,41,0 warp xmas2-1 3,3,xmas_fild01,80,246
-xmas,120,131,0 warp xmas3 3,3,xmas_in,41,33
-xmas_in,46,33,0 warp xmas3-1 3,3,xmas,125,131
-xmas,120,161,0 warp xmas4 3,3,xmas_in,33,91
-xmas_in,38,89,0 warp xmas4-1 3,3,xmas,125,159
-xmas,175,132,0 warp xmas5 3,3,xmas_in,158,31
-xmas_in,153,31,0 warp xmas5-1 3,3,xmas,170,132
-xmas,174,161,0 warp xmas6 3,3,xmas_in,166,98
-xmas_in,163,93,0 warp xmas6-1 3,3,xmas,169,158
-xmas,182,169,0 warp xmas7 3,3,xmas_in,174,108
-xmas_in,179,109,0 warp xmas7-1 3,3,xmas,185,168
-xmas,142,240,0 warp xmas8 3,3,xmas_in,95,87
-xmas_in,95,82,0 warp xmas8-1 3,3,xmas,142,235
-xmas,149,240,0 warp xmas9 3,3,xmas_in,105,87
-xmas_in,105,82,0 warp xmas9-1 3,3,xmas,149,235
-xmas,149,256,0 warp xmas10 3,3,xmas_in,105,112
-xmas_in,105,117,0 warp xmas10-1 2,2,xmas,149,261
-xmas,142,256,0 warp xmas11 3,3,xmas_in,96,114
-xmas_in,95,117,0 warp xmas11-1 2,2,xmas,142,261
-xmas,104,290,0 warp xmas12 3,3,xmas_in,30,166
-xmas_in,30,161,0 warp xmas12-1 3,3,xmas,104,285
-xmas,189,279,0 warp xmas13 3,3,xmas_in,168,166
-xmas_in,168,161,0 warp xmas13-1 3,3,xmas,189,274
-xmas,143,313,0 warp xmas14 3,3,xmas_dun01,205,17
+xmas,149,41,0 warp x_fild_out 8,1,xmas_fild01,80,248
+xmas,120,131,0 warp xmas_tool1-1 1,1,xmas_in,43,33
+xmas_in,46,33,0 warp xmas_tool1-2 1,1,xmas,123,131
+xmas,174,131,0 warp xmas_gift1-1 1,1,xmas_in,155,32
+xmas_in,153,32,0 warp xmas_gift1-2 1,1,xmas,172,131
+xmas,119,162,0 warp xmas_house1-1 1,1,xmas_in,36,91
+xmas_in,38,89,0 warp xmas_house1-2 1,1,xmas,122,159
+xmas,189,278,0 warp xmas_house2-1 1,1,xmas_in,168,164
+xmas_in,168,160,0 warp xmas_house2-2 1,1,xmas,189,275
+xmas,173,160,0 warp xmas_weapon1-1 1,1,xmas_in,165,95
+xmas_in,163,93,0 warp xmas_weapon1-2 1,1,xmas,172,158
+xmas,181,169,0 warp xmas_weapon2-1 1,1,xmas_in,177,107
+xmas_in,179,109,0 warp xmas_weapon2-2 1,1,xmas,184,168
+xmas,142,239,0 warp xmas_santa1-1 1,1,xmas_in,94,85
+xmas_in,94,83,0 warp xmas_santa1-2 1,1,xmas,142,237
+xmas,149,239,0 warp xmas_santa2-1 1,1,xmas_in,104,85
+xmas_in,104,83,0 warp xmas_santa2-2 1,1,xmas,149,237
+xmas,142,258,0 warp xmas_santa3-1 1,1,xmas_in,94,115
+xmas_in,94,117,0 warp xmas_santa3-2 1,1,xmas,142,260
+xmas,149,258,0 warp xmas_santa4-1 1,1,xmas_in,104,115
+xmas_in,104,117,0 warp xmas_santa4-2 1,1,xmas,149,260
+xmas,104,289,0 warp xmas_church1-1 1,1,xmas_in,30,163
+xmas_in,30,161,0 warp xmas_church2-2 1,1,xmas,104,286
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
diff --git a/npc/warps/fields/com_fild.txt b/npc/warps/fields/com_fild.txt
index 5e60150b3..a44fff690 100644
--- a/npc/warps/fields/com_fild.txt
+++ b/npc/warps/fields/com_fild.txt
@@ -1,53 +1,50 @@
//===== eAthena Script =======================================
-//= Comodo Warp Script
+//= Comodo Field Warp Script
//===== By: ==================================================
//= Nana
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
-//= Warp Points Comodo Fields
+//= [Aegis Conversion]
+//= Warp Points for Comodo Fields
//===== Additional Comments: =================================
-//= No comment!
+//= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
//============================================================
-//= Comodo Fields ============================================
-cmd_fild01,222,24,0 warp cmdf01 1,1,cmd_fild02,222,372
-cmd_fild01,26,318,0 warp cmdf001 1,1,beach_dun3,281,56
-cmd_fild01,362,263,0 warp cmdf03 1,1,cmd_fild03,27,269
-cmd_fild01,362,73,0 warp cmdf02 1,1,cmd_fild03,27,68
-cmd_fild02,222,376,0 warp cmdf01-1 1,1,cmd_fild01,222,30
-cmd_fild02,358,95,0 warp cmdf04 1,1,cmd_fild04,35,94
-cmd_fild02,382,269,0 warp cmdf05 1,1,cmd_fild04,25,275
-cmd_fild03,181,17,0 warp cmdf06 1,1,cmd_fild04,181,367
-cmd_fild03,23,269,0 warp cmdf03-1 1,1,cmd_fild01,359,260
-cmd_fild03,23,68,0 warp cmdf02-1 1,1,cmd_fild01,359,76
-cmd_fild03,384,165,0 warp cmdf07 1,1,cmd_fild05,26,161
-cmd_fild04,180,372,0 warp cmdf06-1 1,1,cmd_fild03,183,23
-cmd_fild04,21,275,0 warp cmdf05-1 1,1,cmd_fild02,378,264
-cmd_fild04,31,92,0 warp cmdf04-1 1,1,cmd_fild02,351,92
-cmd_fild04,376,287,0 warp cmdf08 1,1,cmd_fild06,26,288
-cmd_fild05,148,19,0 warp cmdf09 1,1,cmd_fild06,150,374
-cmd_fild05,21,163,0 warp cmdf07-1 1,1,cmd_fild03,377,167
-cmd_fild06,150,380,0 warp cmdf09-1 1,1,cmd_fild05,146,27
-cmd_fild06,151,27,0 warp cmfd10 1,1,cmd_fild07,147,370
-cmd_fild06,21,285,0 warp cmdf08-1 1,1,cmd_fild04,371,288
-cmd_fild06,368,96,0 warp cmdf11 1,1,cmd_fild08,25,102
-cmd_fild06,372,359,0 warp cmdf12 1,1,cmd_fild08,31,359
-cmd_fild06,379,174,0 warp cmdf13 1,1,cmd_fild08,28,166
-cmd_fild07,149,379,0 warp cmdf10-1 10,1,cmd_fild06,147,36
-cmd_fild07,389,186,0 warp cmdf14-1 1,3,cmd_fild09,18,170
-cmd_fild08,15,102,0 warp cmdf11-1 1,1,cmd_fild06,361,96
-cmd_fild08,25,170,0 warp cmdf13-1 1,1,cmd_fild06,374,167
-cmd_fild08,25,355,0 warp cmdf12-1 1,1,cmd_fild06,369,359
-cmd_fild08,309,48,0 warp cmdf16 2,1,cmd_fild09,307,374
-cmd_fild08,76,31,0 warp cmdf15 2,1,cmd_fild09,76,375
-cmd_fild09,12,170,0 warp cmdf14-2 1,4,cmd_fild07,382,184
-cmd_fild09,309,381,0 warp cmdf16-1 2,1,cmd_fild08,309,60
-cmd_fild09,75,382,0 warp cmdf15-1 2,1,cmd_fild08,75,42
-
-//Others =======================
-cmd_fild08,354,324,0 warp cmd008 1,1,moc_fild12,26,305
-cmd_fild09,369,164,0 warp cmd009 2,2,moc_fild18,55,170
-moc_fild18,51,170,0 warp cmd010 1,3,cmd_fild09,363,164
+cmd_fild01,222,24,0 warp cmd_fild01-1 1,1,cmd_fild02,222,372
+cmd_fild01,362,73,0 warp cmd_fild01-2 1,1,cmd_fild03,27,68
+cmd_fild01,362,263,0 warp cmd_fild01-3 1,1,cmd_fild03,27,269
+cmd_fild02,222,376,0 warp cmd_fild02-1 1,1,cmd_fild01,222,30
+cmd_fild02,382,269,0 warp cmd_fild02-2 1,1,cmd_fild04,25,275
+cmd_fild02,358,95,0 warp cmd_fild02-3 1,1,cmd_fild04,35,94
+cmd_fild03,23,269,0 warp cmd_fild03-1 1,1,cmd_fild01,359,260
+cmd_fild03,23,68,0 warp cmd_fild03-2 1,1,cmd_fild01,359,76
+cmd_fild03,181,17,0 warp cmd_fild03-3 1,1,cmd_fild04,181,367
+cmd_fild03,384,165,0 warp cmd_fild03-4 1,1,cmd_fild05,26,161
+cmd_fild04,21,275,0 warp cmd_fild04-1 1,1,cmd_fild02,378,264
+cmd_fild04,31,92,0 warp cmd_fild04-2 1,1,cmd_fild02,351,92
+cmd_fild04,376,287,0 warp cmd_fild04-3 1,1,cmd_fild06,26,288
+cmd_fild04,180,372,0 warp cmd_fild04-4 1,1,cmd_fild03,183,23
+cmd_fild05,21,163,0 warp cmd_fild05-1 1,1,cmd_fild03,377,167
+cmd_fild05,148,19,0 warp cmd_fild05-2 1,1,cmd_fild06,150,374
+cmd_fild06,150,380,0 warp cmd_fild06-3 1,1,cmd_fild05,146,27
+cmd_fild06,21,285,0 warp cmd_fild06-4 1,1,cmd_fild04,371,288
+cmd_fild06,151,27,0 warp cmd_fild06-5 1,1,cmd_fild07,147,370
+cmd_fild06,368,96,0 warp cmd_fild06-6 1,1,cmd_fild08,25,102
+cmd_fild06,379,174,0 warp cmd_fild06-7 1,1,cmd_fild08,28,166
+cmd_fild06,372,359,0 warp cmd_fild06-8 1,1,cmd_fild08,31,359
+cmd_fild07,149,379,0 warp cmd_fild07-1 10,1,cmd_fild06,147,36
+cmd_fild07,389,186,0 warp cmd_fild07-2 1,3,cmd_fild09,18,170
+cmd_fild08,25,355,0 warp cmd_fild08-1 1,1,cmd_fild06,366,359
+cmd_fild08,25,170,0 warp cmd_fild08-2 1,1,cmd_fild06,374,167
+cmd_fild08,15,102,0 warp cmd_fild08-3 1,1,cmd_fild06,361,96
+cmd_fild08,76,31,0 warp cmd_fild08-4 2,1,cmd_fild09,76,375
+cmd_fild08,309,48,0 warp cmd_fild08-5 2,1,cmd_fild09,307,374
+cmd_fild08,354,324,0 warp cmd_fild08-6 1,1,moc_fild12,26,305
+cmd_fild09,12,170,0 warp cmd_fild09-1 1,4,cmd_fild07,382,184
+cmd_fild09,369,164,0 warp cmd_fild09-2 2,2,moc_fild18,55,170
+cmd_fild09,309,381,0 warp cmd_fild09-3 2,1,cmd_fild08,309,60
+cmd_fild09,75,382,0 warp cmd_fild09-4 2,1,cmd_fild08,75,42
+moc_fild18,51,170,0 warp moc_fild18-1 1,3,cmd_fild09,363,164
diff --git a/npc/warps/fields/lutie_fild.txt b/npc/warps/fields/lutie_fild.txt
index a7d0f3921..2adb2ed5d 100644
--- a/npc/warps/fields/lutie_fild.txt
+++ b/npc/warps/fields/lutie_fild.txt
@@ -3,15 +3,16 @@
//===== By: ==================================================
//= Nana (1.0)
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 2+
//===== Description: =========================================
+//= [Aegis Conversion]
//= Warp Points for Lutie Field
//===== Additional Comments: =================================
-//= No Comment!
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//============================================================
-//= Lutie Field ==============================================
-xmas_fild01,80,251,0 warp xmas2 2,2,xmas,150,45
-xmas_fild01,85,49,0 warp xmas001 10,3,aldebaran,140,240
+xmas_fild01,69,252,0 warp xmas_fild1-1 10,2,xmas,149,44
+xmas_fild01,90,252,0 warp xmax_fild1-2 10,2,xmas,149,44
+xmas_fild01,84,48,0 warp xmas_fild2 10,2,aldebaran,140,234