Disabled and removed all renewal-only scripts from pre-re folder. You still can enable them in pre-renewal scripts conf files, but scripts are read from the re folder. Follow up r16387.

Splitted some renewal-only NPCs from renters.txt into another file.

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

1 files changed, 22 insertions, 13 deletions

diff --git a/npc/re/scripts_warps.conf b/npc/re/scripts_warps.conf
index 9c3fd8d31..a55970805 100644
--- a/npc/re/scripts_warps.conf
+++ b/npc/re/scripts_warps.conf
@@ -1,4 +1,26 @@
 // --------------------------------------------------------------
+// -                       RE Warp Scripts                      -
+// --------------------------------------------------------------
+
+// --------------------------- Cities ---------------------------
+npc: npc/re/warps/cities/brasilis.txt
+npc: npc/re/warps/cities/dewata.txt
+npc: npc/re/warps/cities/dicastes.txt
+npc: npc/re/warps/cities/eclage.txt
+npc: npc/re/warps/cities/malangdo.txt
+npc: npc/re/warps/cities/malaya.txt
+// -------------------------- Dungeons --------------------------
+npc: npc/re/warps/dungeons/bra_dun.txt
+npc: npc/re/warps/dungeons/dic_dun.txt
+npc: npc/re/warps/dungeons/ecl_dun.txt
+// --------------------------- Fields ---------------------------
+npc: npc/re/warps/fields/bif_fild.txt
+npc: npc/re/warps/fields/bra_fild.txt
+npc: npc/re/warps/fields/dic_fild.txt
+npc: npc/re/warps/fields/man_fild.txt
+
+
+// --------------------------------------------------------------
 // -                        Warp Scripts                        -
 // --------------------------------------------------------------
 
@@ -7,11 +29,7 @@ npc: npc/re/warps/cities/alberta.txt
 npc: npc/re/warps/cities/aldebaran.txt
 npc: npc/re/warps/cities/amatsu.txt
 npc: npc/re/warps/cities/ayothaya.txt
-npc: npc/re/warps/cities/brasilis.txt
 npc: npc/re/warps/cities/comodo.txt
-npc: npc/re/warps/cities/dewata.txt
-npc: npc/re/warps/cities/dicastes.txt
-npc: npc/re/warps/cities/eclage.txt
 npc: npc/re/warps/cities/einbech.txt
 npc: npc/re/warps/cities/einbroch.txt
 npc: npc/re/warps/cities/geffen.txt
@@ -21,8 +39,6 @@ npc: npc/re/warps/cities/izlude.txt
 npc: npc/re/warps/cities/lighthalzen.txt
 npc: npc/re/warps/cities/louyang.txt
 npc: npc/re/warps/cities/lutie.txt
-npc: npc/re/warps/cities/malangdo.txt
-npc: npc/re/warps/cities/malaya.txt
 npc: npc/re/warps/cities/manuk.txt
 npc: npc/re/warps/cities/mid_camp.txt
 npc: npc/re/warps/cities/morroc.txt
@@ -45,10 +61,7 @@ npc: npc/re/warps/dungeons/ama_dun.txt
 npc: npc/re/warps/dungeons/anthell.txt
 npc: npc/re/warps/dungeons/ayo_dun.txt
 npc: npc/re/warps/dungeons/beach_dun.txt
-npc: npc/re/warps/dungeons/bra_dun.txt
 npc: npc/re/warps/dungeons/c_tower.txt
-npc: npc/re/warps/dungeons/dic_dun.txt
-npc: npc/re/warps/dungeons/ecl_dun.txt
 npc: npc/re/warps/dungeons/ein_dun.txt
 npc: npc/re/warps/dungeons/gef_dun.txt
 npc: npc/re/warps/dungeons/gon_dun.txt
@@ -77,10 +90,7 @@ npc: npc/re/warps/dungeons/xmas_dun.txt
 // --------------------------- Fields ---------------------------
 npc: npc/re/warps/fields/abyss_warper.txt
 npc: npc/re/warps/fields/amatsu_fild.txt
-npc: npc/re/warps/fields/bif_fild.txt
-npc: npc/re/warps/fields/bra_fild.txt
 npc: npc/re/warps/fields/com_fild.txt
-npc: npc/re/warps/fields/dic_fild.txt
 npc: npc/re/warps/fields/ein_fild.txt
 npc: npc/re/warps/fields/gefenia.txt
 npc: npc/re/warps/fields/geffen_fild.txt
@@ -89,7 +99,6 @@ npc: npc/re/warps/fields/hugel_fild.txt
 npc: npc/re/warps/fields/jawaii.txt
 npc: npc/re/warps/fields/lhalzen_fild.txt
 npc: npc/re/warps/fields/lutie_fild.txt
-npc: npc/re/warps/fields/man_fild.txt
 npc: npc/re/warps/fields/morroc_fild.txt
 npc: npc/re/warps/fields/mtmjolnir.txt
 npc: npc/re/warps/fields/payon_fild.txt