Full npc folder reorganization. (I hope I didn't break anything D:)

-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders.
-NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences.
-For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates.
-All pre-renewal files has been reverted back to their pre-renewal behavior.

TODO:
-Correct pre-re quest rewards.
-Check for pre-re/re differences in mapflags.

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

1 files changed, 17 insertions, 99 deletions

diff --git a/npc/re/scripts_warps.conf b/npc/re/scripts_warps.conf
index 9a8b8890f..ff4c10975 100644
--- a/npc/re/scripts_warps.conf
+++ b/npc/re/scripts_warps.conf
@@ -1,123 +1,41 @@
 // --------------------------------------------------------------
-// -                        Warp Scripts                        -
+// -                    Renewal Warp Scripts                    -
 // --------------------------------------------------------------
 
 // --------------------------- Cities ---------------------------
-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/comodo.txt
-npc: npc/re/warps/cities/einbech.txt
-npc: npc/re/warps/cities/einbroch.txt
-npc: npc/re/warps/cities/geffen.txt
-npc: npc/re/warps/cities/gonryun.txt
-npc: npc/re/warps/cities/hugel.txt
+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/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/manuk.txt
-npc: npc/re/warps/cities/mid_camp.txt
-npc: npc/re/warps/cities/morroc.txt
-npc: npc/re/warps/cities/moscovia.txt
-npc: npc/re/warps/cities/nameless.txt
-npc: npc/re/warps/cities/niflheim.txt
-npc: npc/re/warps/cities/payon.txt
-npc: npc/re/warps/cities/prontera.txt
-npc: npc/re/warps/cities/splendide.txt
+npc: npc/re/warps/cities/malangdo.txt
+npc: npc/re/warps/cities/malaya.txt
 npc: npc/re/warps/cities/rachel.txt
-npc: npc/re/warps/cities/umbala.txt
-npc: npc/re/warps/cities/veins.txt
 npc: npc/re/warps/cities/yggdrasil.txt
-npc: npc/re/warps/cities/yuno.txt
+
 // -------------------------- Dungeons --------------------------
-npc: npc/re/warps/dungeons/abbey.txt
-npc: npc/re/warps/dungeons/abyss.txt
-npc: npc/re/warps/dungeons/alde_dun.txt
-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/c_tower.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
-npc: npc/re/warps/dungeons/ice_dun.txt
-npc: npc/re/warps/dungeons/in_sphinx.txt
+npc: npc/re/warps/dungeons/bra_dun.txt
+npc: npc/re/warps/dungeons/dic_dun.txt
+npc: npc/re/warps/dungeons/ecl_dun.txt
 npc: npc/re/warps/dungeons/iz_dun.txt
-npc: npc/re/warps/dungeons/juperos.txt
-npc: npc/re/warps/dungeons/kh_dun.txt
-npc: npc/re/warps/dungeons/lhz_dun.txt
-npc: npc/re/warps/dungeons/lou_dun.txt
-npc: npc/re/warps/dungeons/mag_dun.txt
-npc: npc/re/warps/dungeons/mjo_dun.txt
-npc: npc/re/warps/dungeons/moc_pryd.txt
-npc: npc/re/warps/dungeons/mosk_dun.txt
-npc: npc/re/warps/dungeons/odin.txt
-npc: npc/re/warps/dungeons/orcsdun.txt
-npc: npc/re/warps/dungeons/pay_dun.txt
-npc: npc/re/warps/dungeons/prt_maze.txt
-npc: npc/re/warps/dungeons/ra_san.txt
-npc: npc/re/warps/dungeons/tha_t.txt
-npc: npc/re/warps/dungeons/thor_v.txt
-npc: npc/re/warps/dungeons/treasure.txt
-npc: npc/re/warps/dungeons/tur_dun.txt
-//npc: npc/re/warps/dungeons/um_dun.txt
-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/ein_fild.txt
-npc: npc/re/warps/fields/gefenia.txt
+npc: npc/re/warps/fields/dic_fild.txt
 npc: npc/re/warps/fields/geffen_fild.txt
-npc: npc/re/warps/fields/glastheim.txt
 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/morroc_fild.txt
-npc: npc/re/warps/fields/mtmjolnir.txt
 npc: npc/re/warps/fields/payon_fild.txt
 npc: npc/re/warps/fields/prontera_fild.txt
 npc: npc/re/warps/fields/rachel_fild.txt
-npc: npc/re/warps/fields/spl_fild.txt
-npc: npc/re/warps/fields/umbala_fild.txt
 npc: npc/re/warps/fields/veins_fild.txt
 npc: npc/re/warps/fields/yuno_fild.txt
+
 // --------------------------- Others ---------------------------
-npc: npc/re/warps/other/bossnia.txt
-npc: npc/re/warps/guild/guildcastles.txt
 npc: npc/re/warps/other/jobquests.txt
-npc: npc/re/warps/other/airplane.txt
 npc: npc/re/warps/other/other.txt
-npc: npc/re/warps/other/arena.txt
-npc: npc/re/warps/other/kiel.txt
-npc: npc/re/warps/other/sign.txt
-npc: npc/re/warps/other/god.txt
 npc: npc/re/warps/other/paradise.txt
 npc: npc/re/warps/other/s_workshop.txt
-npc: npc/re/warps/pvp/pvp.txt
-
-// --------------------------------------------------------------
-// -                       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
-// --------------------------------------------------------------
+npc: npc/re/warps/other/sign.txt