summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/scripts_warps.conf2
-rw-r--r--npc/warps/cities/rachel.txt2
-rw-r--r--npc/warps/cities/yggdrasil.txt5
-rw-r--r--npc/warps/disabled_warps.txt45
-rw-r--r--npc/warps/dungeons/abyss.txt14
-rw-r--r--npc/warps/dungeons/anthell.txt8
-rw-r--r--npc/warps/fields/com_fild.txt8
-rw-r--r--npc/warps/fields/geffen_fild.txt20
-rw-r--r--npc/warps/fields/hugel_fild.txt37
-rw-r--r--npc/warps/fields/payon_fild.txt48
-rw-r--r--npc/warps/fields/rachel_fild.txt30
-rw-r--r--npc/warps/fields/veins_fild.txt19
-rw-r--r--npc/warps/fields/yuno_fild.txt47
14 files changed, 130 insertions, 158 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 5a290bc71..44fad0822 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,8 @@
Date Added
======
+2010/10/10
+ * Rev. 14421 Renewal Update to warp portals, and deleted disabled_warps.txt. [L0ne_W0lf]
+ - Only disabled warps, some coordinates might have slipped past me.
2010/09/18
* Rev 14409 Updates, and bugfixes, the usual stuff. [L0ne_W0lf]
* Updated Sage quest skill quest with the file curtosy of 5511.
diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf
index 48d0423e5..f65289920 100644
--- a/npc/scripts_warps.conf
+++ b/npc/scripts_warps.conf
@@ -65,7 +65,7 @@ npc: npc/warps/dungeons/tha_t.txt
npc: npc/warps/dungeons/thor_v.txt
npc: npc/warps/dungeons/treasure.txt
npc: npc/warps/dungeons/tur_dun.txt
-npc: npc/warps/dungeons/um_dun.txt
+//npc: npc/warps/dungeons/um_dun.txt
npc: npc/warps/dungeons/xmas_dun.txt
// --------------------------- Fields ---------------------------
npc: npc/warps/fields/abyss_warper.txt
diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt
index f614f778f..8dc9f9675 100644
--- a/npc/warps/cities/rachel.txt
+++ b/npc/warps/cities/rachel.txt
@@ -105,7 +105,7 @@ ra_temsky,99,135,0 warp rachel71 1,1,ra_temsky,99,113
ra_temsky,137,139,0 warp rachel72 1,1,ra_temsky,109,143
ra_temsky,62,139,0 warp rachel73 1,1,ra_temsky,91,143
-rachel,25,125,0 warp rachel74 1,1,ra_fild11,353,226
+//rachel,25,125,0 warp rachel74 1,1,ra_fild11,353,226
rachel,275,125,0 warp rachel75 1,1,ra_fild12,40,226
rachel,130,21,0 warp rachel76 1,1,ve_fild02,195,377
diff --git a/npc/warps/cities/yggdrasil.txt b/npc/warps/cities/yggdrasil.txt
index 84a51400f..da7f05ece 100644
--- a/npc/warps/cities/yggdrasil.txt
+++ b/npc/warps/cities/yggdrasil.txt
@@ -13,7 +13,10 @@
//============================================================
//Umbala Entrance
-um_dun02,125,163,0 warp nwarp1 1,1,yggdrasil01,40,63
+//um_dun02,125,163,0 warp nwarp1 1,1,yggdrasil01,40,63
+
+// RE Yggdrasil Entrance
+umbala,106,285,1 warp ygGate_yg1 1,1,yggdrasil01,39,63
//Niflheim Exit
yggdrasil01,249,262,0 warp nwarp5 1,1,nif_fild01,315,66
diff --git a/npc/warps/disabled_warps.txt b/npc/warps/disabled_warps.txt
deleted file mode 100644
index f980083d1..000000000
--- a/npc/warps/disabled_warps.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-//===== eAthena Script =======================================
-//= Disabled Warps
-//===== By: ==================================================
-//= Nana (1.0)
-//===== Current Version: =====================================
-//= 1.2
-//===== Description: =========================================
-//= Disabled Warp's for entire Athena
-//===== Additional Comments: =================================
-//= No comment!
-//============================================================
-
-//= Beach Dungeon ============================================
-//beach_dun,89,28,0 warp cmd00a 3,3,beach_dun2,15,182
-//beach_dun2,13,182,0 warp cmd00b 3,3,beach_dun,89,30
-
-//= Comodo Field
-//moc_fild12,35,303,0 warp cmd011 3,3,cmd_fild08,331,319
-//cmd_fild09,14,120,0 warp cmdf14-3 3,3,cmd_fild07,386,96
-
-
-//= Morroc Field =============================================
-//moc_fild04,219,327,0 warp mocf016 3,4,anthell01,35,262
-//moc_fild15,258,253,0 warp mocf017 3,3,anthell01,35,262
-
-//= Ant Hell =================================================
-//anthell01,35,267,0 warp ant001 1,1,moc_fild04,213,327
-//anthell02,171,169,0 warp ant002 1,2,moc_fild04,213,327
-
-//= Morroc Ruins =============================================
-//morocc_in,108,179,0 warp w280 3,2,morocc,284,175
-
-//= Morroc Town ==============================================
-//morocc_in,72,67,0 warp w341 2,2,morocc_in,44,162
-
-//= Izlude Town ==============================================
-//= Due to Job Quest
-//izlude_in,62,170,0 warp w1039 1,1,izlude_in,68,165
-
-//= Payon Cave
-//pay_dun03,127,62,0 warp payd04 1,2,pay_dun04,201,204
-
-// Airplane (no direct access there)
-//airplane,255,55,0 warp ein044 1,1,airplane,90,68
-//airplane,88,68,0 warp ein044a 1,1,airplane,253,55
diff --git a/npc/warps/dungeons/abyss.txt b/npc/warps/dungeons/abyss.txt
index 71abfabcf..4d39ff591 100644
--- a/npc/warps/dungeons/abyss.txt
+++ b/npc/warps/dungeons/abyss.txt
@@ -3,18 +3,18 @@
//===== By: ==================================================
//= Muad-Dib (1.0)
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 10+
//===== Description: =========================================
//= Warp Points for Abyss Lake Dungeon
//===== Additional Comments: =================================
//= 1.0 Thanks to Muad-Dib for the temp warps [Lupus]
+//= 1.1 Renewal warp adjustments.
//============================================================
-//hu_fild05,197,210,0 warp abysslakedunwarp001 2,3,abyss_01,264,271
-abyss_01,267,274,0 warp abysslakedunwarp002 1,1,hu_fild05,192,207
-abyss_01,26,23,0 warp abysslakedunwarp003 1,1,abyss_02,275,270
-abyss_02,278,270,0 warp abysslakedunwarp004 1,1,abyss_01,26,26
-abyss_02,145,281,0 warp abysslakedunwarp005 1,1,abyss_03,116,27
-abyss_03,116,24,0 warp abysslakedunwarp006 1,1,abyss_02,145,278
+abyss_01,25,24,0 warp abysslakedunwarp001 1,1,abyss_02,271,270
+abyss_02,145,280,0 warp abysslakedunwarp002 1,1,abyss_03,115,30
+abyss_02,277,270,0 warp abysslakedunwarp003 1,1,abyss_01,25,30
+abyss_03,115,25,0 warp abysslakedunwarp004 1,1,abyss_02,145,275
+abyss_01,265,274,0 warp abysslakedunwarp005 1,1,hu_fild05,177,211
diff --git a/npc/warps/dungeons/anthell.txt b/npc/warps/dungeons/anthell.txt
index 44625e45d..f10a14db8 100644
--- a/npc/warps/dungeons/anthell.txt
+++ b/npc/warps/dungeons/anthell.txt
@@ -15,10 +15,10 @@
//============================================================
//= Ant Hell =================================================
-moc_fild20,156,143,0 warp moc_ant1-1 3,4,anthell01,35,262
-anthell01,35,267,0 warp moc_ant1-2 1,1,moc_fild20,164,145
-moc_fild20,337,315,0 warp moc_ant2-1 3,3,anthell01,35,262
-anthell02,172,169,0 warp moc_ant2-2 1,1,moc_fild20,330,314
+cmd_fild08,335,355,0 warp moc_ant1-1 3,4,anthell01,35,262
+anthell01,35,267,0 warp moc_ant1-2 1,1,cmd_fild08,330,355
+cmd_fild08,348,82,0 warp moc_ant2-1 3,3,anthell02,168,170
+anthell02,172,169,0 warp moc_ant2-2 1,1,cmd_fild08,344,82
anthell01,253,32,0 warp ant01 2,1,anthell02,34,263
anthell02,32,267,0 warp ant01-1 2,2,anthell01,253,35
diff --git a/npc/warps/fields/com_fild.txt b/npc/warps/fields/com_fild.txt
index a44fff690..020034d94 100644
--- a/npc/warps/fields/com_fild.txt
+++ b/npc/warps/fields/com_fild.txt
@@ -22,14 +22,14 @@ 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_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_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
diff --git a/npc/warps/fields/geffen_fild.txt b/npc/warps/fields/geffen_fild.txt
index 778b1b063..d3bb984cd 100644
--- a/npc/warps/fields/geffen_fild.txt
+++ b/npc/warps/fields/geffen_fild.txt
@@ -45,7 +45,7 @@ gef_fild07,18,191,0 warp geff10 2,4,gef_fild08,357,187
gef_fild07,40,19,0 warp geff13 1,1,gef_fild13,41,369
gef_fild08,200,355,0 warp geff09-1 4,2,gef_fild06,218,20
gef_fild08,360,187,0 warp geff10-1 2,4,gef_fild07,21,191
-gef_fild08,215,18,0 warp geff14 1,1,gef_fild12,221,369
+//gef_fild08,215,18,0 warp geff14 1,1,gef_fild12,221,369
gef_fild09,23,56,0 warp geff18-1 1,1,gef_fild13,376,56
gef_fild09,225,25,0 warp geff11 3,2,gef_fild10,251,368
gef_fild09,368,95,0 warp geff01-1 4,2,gef_fild01,19,102
@@ -57,16 +57,16 @@ gef_fild10,138,284,0 warp gef019 1,1,in_orcs01,29,114
gef_fild10,215,51,0 warp gef020 1,1,in_orcs01,162,53
gef_fild10,223,205,0 warp gef021 1,1,in_orcs01,108,89
gef_fild10,63,337,0 warp gef022 1,1,in_orcs01,30,157
-gef_fild10,27,219,0 warp geff19-1 1,1,gef_fild14,367,219
+//gef_fild10,27,219,0 warp geff19-1 1,1,gef_fild14,367,219
gef_fild11,377,293,0 warp gef023 2,4,prt_fild11,20,281
gef_fild11,111,364,0 warp geff12-1 6,3,gef_fild10,104,24
-gef_fild12,221,374,0 warp geff14-1 1,1,gef_fild08,215,25
-gef_fild12,368,180,0 warp geff15 1,1,gef_fild13,29,202
-gef_fild12,372,50,0 warp geff16 1,1,gef_fild13,29,59
-gef_fild13,200,25,0 warp geff17 1,1,gef_fild14,180,357
-gef_fild13,25,202,0 warp geff15-1 1,1,gef_fild12,364,180
-gef_fild13,26,59,0 warp geff16-1 1,1,gef_fild12,370,50
+//gef_fild12,221,374,0 warp geff14-1 1,1,gef_fild08,215,25
+//gef_fild12,368,180,0 warp geff15 1,1,gef_fild13,29,202
+//gef_fild12,372,50,0 warp geff16 1,1,gef_fild13,29,59
+//gef_fild13,200,25,0 warp geff17 1,1,gef_fild14,180,357
+//gef_fild13,25,202,0 warp geff15-1 1,1,gef_fild12,364,180
+//gef_fild13,26,59,0 warp geff16-1 1,1,gef_fild12,370,50
gef_fild13,380,56,0 warp geff18 1,1,gef_fild09,27,56
gef_fild13,41,373,0 warp geff13-1 1,1,gef_fild07,40,23
-gef_fild14,180,360,0 warp geff17-1 1,1,gef_fild13,200,29
-gef_fild14,371,219,0 warp geff19 1,1,gef_fild10,31,219
+//gef_fild14,180,360,0 warp geff17-1 1,1,gef_fild13,200,29
+//gef_fild14,371,219,0 warp geff19 1,1,gef_fild10,31,219
diff --git a/npc/warps/fields/hugel_fild.txt b/npc/warps/fields/hugel_fild.txt
index d8d9d2e41..327431b65 100644
--- a/npc/warps/fields/hugel_fild.txt
+++ b/npc/warps/fields/hugel_fild.txt
@@ -19,29 +19,34 @@ ein_fild04,343,293,0 warp hugel001 1,1,ein_fild05,80,294
ein_fild05,76,294,0 warp hugel001a 1,1,ein_fild04,336,292
ein_fild05,376,183,0 warp hugel002 1,1,ein_fild06,47,166
ein_fild06,42,171,0 warp hugel002a 1,1,ein_fild05,371,183
-ein_fild02,357,251,0 warp hugel003-1 1,1,yuno_fild04,38,280
-yuno_fild04,33,279,0 warp hugel003a-1 1,1,ein_fild02,350,250
-ein_fild01,349,369,0 warp hugel003 1,1,yuno_fild05,43,346
-yuno_fild05,41,350,0 warp hugel003a 1,1,ein_fild01,345,367
-ein_fild01,106,34,0 warp hugel004 1,1,ein_fild02,109,358
-ein_fild02,108,364,0 warp hugel004a 1,1,ein_fild01,106,40
-ein_fild01,234,34,0 warp hugel005 1,1,ein_fild02,258,343
-ein_fild02,257,350,0 warp hugel005a 1,1,ein_fild01,231,40
-ein_fild02,170,29,0 warp hugel006 1,1,ein_fild05,172,366
-ein_fild05,172,371,0 warp hugel006a 1,1,ein_fild02,170,37
+//ein_fild02,357,251,0 warp hugel003-1 1,1,yuno_fild04,38,280
+//yuno_fild04,33,279,0 warp hugel003a-1 1,1,ein_fild02,350,250
+//ein_fild01,349,369,0 warp hugel003 1,1,yuno_fild05,43,346
+//yuno_fild05,41,350,0 warp hugel003a 1,1,ein_fild01,345,367
+//ein_fild01,106,34,0 warp hugel004 1,1,ein_fild02,109,358
+//ein_fild02,108,364,0 warp hugel004a 1,1,ein_fild01,106,40
+//ein_fild01,234,34,0 warp hugel005 1,1,ein_fild02,258,343
+//ein_fild02,257,350,0 warp hugel005a 1,1,ein_fild01,231,40
+//ein_fild02,170,29,0 warp hugel006 1,1,ein_fild05,172,366
+//ein_fild05,172,371,0 warp hugel006a 1,1,ein_fild02,170,37
hu_fild01,366,185,0 warp hugel007 1,1,hu_fild02,22,168
hu_fild02,17,168,0 warp hugel007a 1,1,hu_fild01,361,189
hu_fild04,47,372,0 warp hugel008 1,1,hu_fild02,40,27
hu_fild02,40,22,0 warp hugel008a 1,1,hu_fild04,48,368
hu_fild04,294,379,0 warp hugel009 1,1,hu_fild02,280,31
hu_fild02,283,28,0 warp hugel009a 1,1,hu_fild04,289,376
-hu_fild05,284,356,0 warp hugel010 1,1,hu_fild03,288,26
-hu_fild03,288,19,0 warp hugel010a 1,1,hu_fild05,276,346
+//hu_fild05,284,356,0 warp hugel010 1,1,hu_fild03,288,26
+//hu_fild03,288,19,0 warp hugel010a 1,1,hu_fild05,276,346
hu_fild05,353,126,0 warp hugel011 1,1,hu_fild06,34,119
hu_fild06,28,119,0 warp hugel011a 1,1,hu_fild05,347,130
hu_fild02,374,339,0 warp hugel012 1,1,hu_fild03,24,337
-hu_fild03,20,338,0 warp hugel012a 1,1,hu_fild02,370,339
+//hu_fild03,20,338,0 warp hugel012a 1,1,hu_fild02,370,339
hu_fild02,378,162,0 warp hugel013 1,1,hu_fild03,30,163
-hu_fild03,25,163,0 warp hugel013a 1,1,hu_fild02,373,160
-yuno_fild09,377,184,0 warp hugel014 1,1,yuno_fild10,44,183
-yuno_fild10,39,183,0 warp hugel014a 1,1,yuno_fild09,371,184
+//hu_fild03,25,163,0 warp hugel013a 1,1,hu_fild02,373,160
+//yuno_fild09,377,184,0 warp hugel014 1,1,yuno_fild10,44,183
+//yuno_fild10,39,183,0 warp hugel014a 1,1,yuno_fild09,371,184
+
+// RE Addon
+ein_fild01,106,34,0 warp EinF01Dn01_EinF05Up01 1,1,ein_fild05,172,366
+ein_fild01,234,34,0 warp EinF01Dn02_EinF05Up02 1,1,ein_fild05,172,366
+ein_fild05,172,371,0 warp EinF05Up01_EinF01Dn01 1,1,ein_fild01,106,40
diff --git a/npc/warps/fields/payon_fild.txt b/npc/warps/fields/payon_fild.txt
index 255b57a56..3ae9920e4 100644
--- a/npc/warps/fields/payon_fild.txt
+++ b/npc/warps/fields/payon_fild.txt
@@ -14,28 +14,28 @@
//============================================================
//= Payon Field's ============================================
-pay_fild01,13,152,0 warp payf001 2,7,moc_fild03,299,170
-pay_fild01,278,14,0 warp payf01 13,2,pay_fild02,83,382
-pay_fild01,353,14,0 warp payf02 20,3,pay_fild02,160,381
-pay_fild01,379,201,0 warp payf03 2,6,pay_fild07,23,207
-pay_fild02,134,16,0 warp payf04 5,2,pay_fild05,127,375
-pay_fild02,16,175,0 warp payf06 2,4,pay_fild11,294,135
-pay_fild02,167,390,0 warp payf02-1 20,3,pay_fild01,354,18
-pay_fild02,284,108,0 warp payf07 2,7,pay_fild03,20,110
-pay_fild02,83,386,0 warp payf01-1 13,2,pay_fild01,278,18
-pay_fild03,15,110,0 warp payf07-1 2,10,pay_fild02,280,108
-pay_fild03,172,281,0 warp payf08 5,2,pay_fild07,167,20
-pay_fild03,313,16,0 warp payf09 4,2,pay_fild06,305,372
-pay_fild03,392,63,0 warp payf005 2,7,alberta,19,233
-pay_fild04,17,165,0 warp payf002 2,8,moc_fild01,376,162
-pay_fild04,194,17,0 warp payf003 7,2,moc_fild02,350,336
-pay_fild05,127,378,0 warp payf04-1 4,2,pay_fild02,134,19
-pay_fild05,271,284,0 warp payf10 2,4,pay_fild06,31,288
-pay_fild06,28,288,0 warp payf10-1 2,2,pay_fild05,268,284
-pay_fild06,305,375,0 warp payf09-1 6,2,pay_fild03,313,19
-pay_fild07,16,200,0 warp payf03-1 3,3,pay_fild01,371,205
-pay_fild07,163,17,0 warp payf08-1 5,2,pay_fild03,177,275
-pay_fild07,280,382,0 warp payf11 4,2,pay_fild08,160,19
+pay_fild01,13,152,0 warp payf001 2,7,moc_fild03,299,170
+pay_fild01,278,14,0 warp payf01 13,2,pay_fild02,83,382
+pay_fild01,353,14,0 warp payf02 20,3,pay_fild02,160,381
+pay_fild01,379,201,0 warp payf03 2,6,pay_fild07,23,207
+//pay_fild02,134,16,0 warp payf04 5,2,pay_fild05,127,375
+//pay_fild02,16,175,0 warp payf06 2,4,pay_fild11,294,135
+pay_fild02,167,390,0 warp payf02-1 20,3,pay_fild01,354,18
+pay_fild02,284,108,0 warp payf07 2,7,pay_fild03,20,110
+pay_fild02,83,386,0 warp payf01-1 13,2,pay_fild01,278,18
+pay_fild03,15,110,0 warp payf07-1 2,10,pay_fild02,280,108
+pay_fild03,172,281,0 warp payf08 5,2,pay_fild07,167,20
+pay_fild03,313,16,0 warp payf09 4,2,pay_fild06,305,372
+pay_fild03,392,63,0 warp payf005 2,7,alberta,19,233
+pay_fild04,17,165,0 warp payf002 2,8,moc_fild01,376,162
+pay_fild04,194,17,0 warp payf003 7,2,moc_fild02,350,336
+//pay_fild05,127,378,0 warp payf04-1 4,2,pay_fild02,134,19
+//pay_fild05,271,284,0 warp payf10 2,4,pay_fild06,31,288
+//pay_fild06,28,288,0 warp payf10-1 2,2,pay_fild05,268,284
+pay_fild06,305,375,0 warp payf09-1 6,2,pay_fild03,313,19
+pay_fild07,16,200,0 warp payf03-1 3,3,pay_fild01,371,205
+pay_fild07,163,17,0 warp payf08-1 5,2,pay_fild03,177,275
+pay_fild07,280,382,0 warp payf11 4,2,pay_fild08,160,19
pay_fild07,382,290,0 warp payf12 2,5,pay_fild10,19,290
pay_fild08,160,16,0 warp payf11-1 4,2,pay_fild07,280,379
pay_fild08,17,75,0 warp payf006 1,1,payon,265,92
@@ -45,5 +45,5 @@ pay_fild09,16,91,0 warp payf13-1 2,4,pay_fild08,259,91
pay_fild10,112,382,0 warp pay14-1 3,2,pay_fild09,112,19
pay_fild10,16,290,0 warp payf12-1 2,5,pay_fild07,379,290
pay_fild10,99,13,0 warp w1034 1,1,pay_fild10,148,252
-pay_fild11,297,135,0 warp payf06-1 2,4,pay_fild02,19,175
-pay_fild11,38,330,0 warp payf004 4,2,moc_fild03,179,19
+//pay_fild11,297,135,0 warp payf06-1 2,4,pay_fild02,19,175
+//pay_fild11,38,330,0 warp payf004 4,2,moc_fild03,179,19
diff --git a/npc/warps/fields/rachel_fild.txt b/npc/warps/fields/rachel_fild.txt
index f53d21039..2cf3b81e0 100644
--- a/npc/warps/fields/rachel_fild.txt
+++ b/npc/warps/fields/rachel_fild.txt
@@ -19,12 +19,12 @@ ra_fild01,306,38,0 warp ra001 1,1,ra_fild04,322,371
ra_fild04,322,378,0 warp ra002 1,1,ra_fild01,306,43
ra_fild04,362,351,0 warp ra003 1,1,ra_fild05,39,353
ra_fild05,33,353,0 warp ra004 1,1,ra_fild04,356,351
-ra_fild05,27,13,0 warp ra005 1,1,ra_fild09,30,337
-ra_fild09,29,343,0 warp ra006 1,1,ra_fild05,31,17
+//ra_fild05,27,13,0 warp ra005 1,1,ra_fild09,30,337
+//ra_fild09,29,343,0 warp ra006 1,1,ra_fild05,31,17
ra_fild04,263,54,0 warp ra007 1,1,ra_fild08,287,365
ra_fild08,287,370,0 warp ra008 1,1,ra_fild04,263,60
-ra_fild09,27,238,0 warp ra009 1,1,ra_fild08,360,234
-ra_fild08,368,234,0 warp ra010 1,1,ra_fild09,35,238
+//ra_fild09,27,238,0 warp ra009 1,1,ra_fild08,360,234
+//ra_fild08,368,234,0 warp ra010 1,1,ra_fild09,35,238
ra_fild04,23,176,0 warp ra011 1,1,ra_fild03,370,172
ra_fild03,374,168,0 warp ra012 1,1,ra_fild04,29,176
ra_fild05,348,274,0 warp ra013 1,1,ra_fild06,24,277
@@ -34,14 +34,14 @@ lhz_fild01,296,382,0 warp ra016 1,1,ra_fild06,298,25
ra_fild12,36,225,0 warp ra017 1,1,rachel,270,125
ra_fild08,165,29,0 warp ra018 1,1,ra_fild12,149,369
ra_fild12,149,374,0 warp ra019 1,1,ra_fild08,165,36
-ra_fild12,303,27,0 warp ra020 1,1,ra_fild13,295,341
-ra_fild13,295,346,0 warp ra021 1,1,ra_fild12,303,33
-ra_fild11,360,226,0 warp ra022 1,1,rachel,30,125
-ra_fild11,21,290,0 warp ra023 1,1,ra_fild10,379,283
-ra_fild10,384,287,0 warp ra024 1,1,ra_fild11,28,290
-ra_fild11,202,335,0 warp ra025a 1,1,ra_fild07,215,32
-ra_fild07,215,27,0 warp ra025b 1,1,ra_fild11,201,329
-ra_fild07,168,353,0 warp ra026 1,1,ra_fild02,171,45
-ra_fild02,168,36,0 warp ra027 1,1,ra_fild07,168,349
-ra_fild02,373,275,0 warp ra028 1,1,ra_fild03,28,294
-ra_fild03,23,294,0 warp ra029 1,1,ra_fild02,367,270
+//ra_fild12,303,27,0 warp ra020 1,1,ra_fild13,295,341
+//ra_fild13,295,346,0 warp ra021 1,1,ra_fild12,303,33
+//ra_fild11,360,226,0 warp ra022 1,1,rachel,30,125
+//ra_fild11,21,290,0 warp ra023 1,1,ra_fild10,379,283
+//ra_fild10,384,287,0 warp ra024 1,1,ra_fild11,28,290
+//ra_fild11,202,335,0 warp ra025a 1,1,ra_fild07,215,32
+//ra_fild07,215,27,0 warp ra025b 1,1,ra_fild11,201,329
+//ra_fild07,168,353,0 warp ra026 1,1,ra_fild02,171,45
+//ra_fild02,168,36,0 warp ra027 1,1,ra_fild07,168,349
+//ra_fild02,373,275,0 warp ra028 1,1,ra_fild03,28,294
+//ra_fild03,23,294,0 warp ra029 1,1,ra_fild02,367,270
diff --git a/npc/warps/fields/veins_fild.txt b/npc/warps/fields/veins_fild.txt
index 145b12dd4..fdb907413 100644
--- a/npc/warps/fields/veins_fild.txt
+++ b/npc/warps/fields/veins_fild.txt
@@ -14,22 +14,23 @@
ve_fild01,366,267,0 warp ve_fild1-1 1,1,ve_fild02,36,263
ve_fild01,184,20,0 warp ve_fild1-2 1,1,ve_fild04,174,334
-ra_fild11,233,27,0 warp ve_fild1-3 1,1,ve_fild01,243,363
-ve_fild01,243,368,0 warp ve_fild1-4 1,1,ra_fild11,232,32
+//ra_fild11,233,27,0 warp ve_fild1-3 1,1,ve_fild01,243,363
+//ve_fild01,243,368,0 warp ve_fild1-4 1,1,ra_fild11,232,32
ve_fild01,350,92,0 warp ve_fild1-5 1,1,ve_fild02,78,133
-ra_fild13,29,308,0 warp ve_fild2-1 1,1,ve_fild02,380,308
-ve_fild02,385,308,0 warp ve_fild2-2 1,1,ra_fild13,34,308
+//ra_fild13,29,308,0 warp ve_fild2-1 1,1,ve_fild02,380,308
+//ve_fild02,385,308,0 warp ve_fild2-2 1,1,ra_fild13,34,308
ve_fild02,195,382,0 warp ve_fild2-3 1,1,rachel,130,25
ve_fild02,31,263,0 warp ve_fild2-4 1,1,ve_fild01,361,267
ve_fild02,73,133,0 warp ve_fild2-5 1,1,ve_fild01,345,92
ve_fild03,355,223,0 warp ve_fild3-1 1,1,ve_fild04,49,249
-ve_fild03,222,43,0 warp ve_fild3-2 1,1,ve_fild05,200,325
+//ve_fild03,222,43,0 warp ve_fild3-2 1,1,ve_fild05,200,325
ve_fild04,174,339,0 warp ve_fild4-1 1,1,ve_fild01,184,25
ve_fild04,44,249,0 warp ve_fild4-2 1,1,ve_fild03,350,220
ve_fild04,115,50,0 warp ve_fild4-3 1,1,ve_fild06,80,183
-ve_fild05,200,330,0 warp ve_fild5-1 1,1,ve_fild03,222,48
-ve_fild05,359,192,0 warp ve_fild5-2 1,1,ve_fild06,80,183
+//ve_fild05,200,330,0 warp ve_fild5-1 1,1,ve_fild03,222,48
+//ve_fild05,359,192,0 warp ve_fild5-2 1,1,ve_fild06,80,183
ve_fild06,153,220,0 warp ve_fild6-1 1,1,veins,218,355
+/*
ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{
if (rand(2))
warp "ve_fild04",115,55;
@@ -37,8 +38,12 @@ ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{
warp "ve_fild05",354,191;
end;
}
+*/
ve_fild07,147,371,0 warp ve_fild7-1 1,1,veins,146,28
+// Renewal Addon
+ve_fild06,81,177,0 warp VeF06S_VeF04S 1,1,ve_fild04,115,55
+
//============================================================
// Old changelog
//============================================================
diff --git a/npc/warps/fields/yuno_fild.txt b/npc/warps/fields/yuno_fild.txt
index cd5afe441..331c4e853 100644
--- a/npc/warps/fields/yuno_fild.txt
+++ b/npc/warps/fields/yuno_fild.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Nana (1.0), Sara
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 5+
//===== Description: =========================================
@@ -11,6 +11,7 @@
//===== Additional Comments: =================================
//= 1.1 - Updated for the new Yuno Fields
//= 1.2 New field update - Hugel Field by Sara - Version 1
+//= 1.3 Renewal warp adjustments.
//============================================================
//= Yuno Field ===============================================
@@ -57,8 +58,8 @@ yuno_fild08,74,376,0 warp newjun12 1,1,yuno_fild02,70,25
yuno_fild02,70,23,0 warp newjun12a 1,1,yuno_fild08,74,374
yuno_fild08,286,386,0 warp newjun13 1,1,yuno_fild02,294,26
yuno_fild02,294,24,0 warp newjun13a 1,1,yuno_fild08,286,384
-yuno_fild04,42,369,0 warp newjun14 1,1,yuno_fild05,59,30
-yuno_fild05,59,28,0 warp newjun14a 1,1,yuno_fild04,42,367
+//yuno_fild04,42,369,0 warp newjun14 1,1,yuno_fild05,59,30
+//yuno_fild05,59,28,0 warp newjun14a 1,1,yuno_fild04,42,367
//= Al de Baran <-> Yuno Connection ==========================
@@ -67,23 +68,23 @@ yuno_fild01,208,17,0 warp yunfild-alde 1,1,aldebaran,140,242
//= Hugel Field
//= Version 1
-yuno_fild05,372,325,0 warp hu001 1,1,yuno_fild06,42,319
-yuno_fild06,40,319,0 warp hu001a 1,1,yuno_fild05,370,325
-yuno_fild06,217,27,0 warp hu002 1,1,yuno_fild03,214,381
-yuno_fild03,214,383,0 warp hu002a 1,1,yuno_fild06,217,29
-yuno_fild06,369,136,0 warp hu003 1,1,hu_fild04,28,126
-hu_fild04,26,126,0 warp hu003a 1,1,yuno_fild06,367,136
-hu_fild04,121,26,0 warp hu004 1,1,yuno_fild02,118,374
-yuno_fild02,118,376,0 warp hu004a 1,1,hu_fild04,121,28
-yuno_fild06,149,369,0 warp hu005 1,1,hu_fild01,139,37
-hu_fild01,139,35,0 warp hu005a 1,1,yuno_fild06,151,369
-hu_fild04,381,187,0 warp hu006 1,1,hu_fild05,34,202
-hu_fild05,32,202,0 warp hu006a 1,1,hu_fild04,379,187
-hu_fild05,91,42,0 warp hu007 1,1,hu_fild07,80,369
-hu_fild07,80,371,0 warp hu007a 1,1,hu_fild05,91,44
-hu_fild07,35,351,0 warp hu008 1,1,yuno_fild02,384,338
-yuno_fild02,384,340,0 warp hu008a 1,1,hu_fild07,37,351
-hu_fild07,56,36,0 warp hu009 1,1,yuno_fild09,47,375
-yuno_fild09,47,377,0 warp hu009a 1,1,hu_fild07,56,38
-hu_fild07,226,36,0 warp hu010 1,1,yuno_fild09,220,372
-yuno_fild09,220,374,0 warp hu010a 1,1,hu_fild07,226,38
+//yuno_fild05,370,321,0 warp hu001 1,1,yuno_fild06,48,322
+//yuno_fild06,41,319,0 warp hu001a 1,1,yuno_fild05,366,319
+yuno_fild06,214,27,0 warp hu002 1,1,yuno_fild03,215,375
+yuno_fild03,215,382,0 warp hu002a 1,1,yuno_fild06,218,33
+yuno_fild06,369,132,0 warp hu003 1,1,hu_fild04,34,126
+hu_fild04,27,126,0 warp hu003a 1,1,yuno_fild06,362,132
+hu_fild04,122,27,0 warp hu004 1,1,yuno_fild02,114,370
+yuno_fild02,117,375,0 warp hu004a 1,1,hu_fild04,122,35
+yuno_fild06,151,370,0 warp hu005 1,1,hu_fild01,135,42
+hu_fild01,141,36,0 warp hu005a 1,1,yuno_fild06,156,368
+hu_fild04,380,183,0 warp hu006 1,1,hu_fild05,39,206
+hu_fild05,33,198,0 warp hu006a 1,1,hu_fild04,373,181
+//hu_fild05,89,43,0 warp hu007 1,1,hu_fild07,80,365
+//hu_fild07,81,370,0 warp hu007a 1,1,hu_fild05,89,50
+//hu_fild07,36,352,0 warp hu008 1,1,yuno_fild02,378,336
+//yuno_fild02,383,339,0 warp hu008a 1,1,hu_fild07,42,351
+//hu_fild07,57,37,0 warp hu009 1,1,yuno_fild09,48,370
+//yuno_fild09,48,376,0 warp hu009a 1,1,hu_fild07,58,42
+//hu_fild07,226,38,0 warp hu010 1,1,yuno_fild09,220,368
+//yuno_fild09,220,373,0 warp hu010a 1,1,hu_fild07,224,43
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-30 04:48:48 +0000