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, 35 insertions, 45 deletions

diff --git a/npc/re/scripts_monsters.conf b/npc/re/scripts_monsters.conf
index 967dd5dcc..27ccaa733 100644
--- a/npc/re/scripts_monsters.conf
+++ b/npc/re/scripts_monsters.conf
@@ -1,35 +1,8 @@
 // --------------------------------------------------------------
-// -                      Monster  Scripts                      -
+// -                   Renewal Monster Scripts                  -
 // --------------------------------------------------------------
-npc: npc/re/mobs/citycleaners.txt
-npc: npc/re/mobs/pvp.txt
-npc: npc/re/mobs/jail.txt
-npc: npc/re/mobs/bossnia.txt
-
-npc: npc/re/mobs/fields/amatsu.txt
-npc: npc/re/mobs/fields/ayothaya.txt
-npc: npc/re/mobs/fields/comodo.txt
-npc: npc/re/mobs/fields/einbroch.txt
-npc: npc/re/mobs/fields/geffen.txt
-npc: npc/re/mobs/fields/gonryun.txt
-npc: npc/re/mobs/fields/hugel.txt
-npc: npc/re/mobs/fields/jawaii.txt
-npc: npc/re/mobs/fields/lighthalzen.txt
-npc: npc/re/mobs/fields/louyang.txt
-npc: npc/re/mobs/fields/lutie.txt
-npc: npc/re/mobs/fields/manuk.txt
-npc: npc/re/mobs/fields/mjolnir.txt
-npc: npc/re/mobs/fields/morocc.txt
-npc: npc/re/mobs/fields/moscovia.txt
-npc: npc/re/mobs/fields/niflheim.txt
-npc: npc/re/mobs/fields/payon.txt
-npc: npc/re/mobs/fields/prontera.txt
-npc: npc/re/mobs/fields/rachel.txt
-npc: npc/re/mobs/fields/splendide.txt
-npc: npc/re/mobs/fields/umbala.txt
-npc: npc/re/mobs/fields/veins.txt
-npc: npc/re/mobs/fields/yuno.txt
 
+// -------------------------- Dungeons --------------------------
 npc: npc/re/mobs/dungeons/abbey.txt
 npc: npc/re/mobs/dungeons/abyss.txt
 npc: npc/re/mobs/dungeons/alde_dun.txt
@@ -37,7 +10,10 @@ npc: npc/re/mobs/dungeons/ama_dun.txt
 npc: npc/re/mobs/dungeons/anthell.txt
 npc: npc/re/mobs/dungeons/ayo_dun.txt
 npc: npc/re/mobs/dungeons/beach_dun.txt
+npc: npc/re/mobs/dungeons/bra_dun.txt
 npc: npc/re/mobs/dungeons/c_tower.txt
+npc: npc/re/mobs/dungeons/dew_dun.txt
+npc: npc/re/mobs/dungeons/dic_dun.txt
 npc: npc/re/mobs/dungeons/ein_dun.txt
 npc: npc/re/mobs/dungeons/gef_dun.txt
 npc: npc/re/mobs/dungeons/gefenia.txt
@@ -52,11 +28,13 @@ npc: npc/re/mobs/dungeons/juperos.txt
 npc: npc/re/mobs/dungeons/kh_dun.txt
 npc: npc/re/mobs/dungeons/lhz_dun.txt
 npc: npc/re/mobs/dungeons/lou_dun.txt
-npc: npc/re/mobs/dungeons/nyd_dun.txt
+npc: npc/re/mobs/dungeons/ma_dun.txt
 npc: npc/re/mobs/dungeons/mag_dun.txt
+npc: npc/re/mobs/dungeons/mal_dun.txt
 npc: npc/re/mobs/dungeons/mjo_dun.txt
 npc: npc/re/mobs/dungeons/moc_pryd.txt
 npc: npc/re/mobs/dungeons/mosk_dun.txt
+npc: npc/re/mobs/dungeons/nyd_dun.txt
 npc: npc/re/mobs/dungeons/odin.txt
 npc: npc/re/mobs/dungeons/orcsdun.txt
 npc: npc/re/mobs/dungeons/pay_dun.txt
@@ -68,24 +46,36 @@ npc: npc/re/mobs/dungeons/thor_v.txt
 npc: npc/re/mobs/dungeons/treasure.txt
 npc: npc/re/mobs/dungeons/tur_dun.txt
 npc: npc/re/mobs/dungeons/xmas_dun.txt
-npc: npc/re/mobs/dungeons/yggdrasil.txt
 
-// --------------------------------------------------------------
-// -                     RE Monster  Scripts                    -
-// --------------------------------------------------------------
-npc: npc/re/mobs/towns/brasilis.txt
-
-npc: npc/re/mobs/fields/brasilis.txt
+// --------------------------- Fields ---------------------------
+npc: npc/re/mobs/fields/amatsu.txt
+npc: npc/re/mobs/fields/ayothaya.txt
 npc: npc/re/mobs/fields/bifrost.txt
+npc: npc/re/mobs/fields/brasilis.txt
+npc: npc/re/mobs/fields/comodo.txt
 npc: npc/re/mobs/fields/dewata.txt
 npc: npc/re/mobs/fields/dicastes.txt
+npc: npc/re/mobs/fields/einbroch.txt
+npc: npc/re/mobs/fields/geffen.txt
+npc: npc/re/mobs/fields/gonryun.txt
+npc: npc/re/mobs/fields/hugel.txt
+npc: npc/re/mobs/fields/jawaii.txt
+npc: npc/re/mobs/fields/lighthalzen.txt
+npc: npc/re/mobs/fields/louyang.txt
+npc: npc/re/mobs/fields/lutie.txt
 npc: npc/re/mobs/fields/malaya.txt
+npc: npc/re/mobs/fields/manuk.txt
+npc: npc/re/mobs/fields/mjolnir.txt
+npc: npc/re/mobs/fields/morocc.txt
+npc: npc/re/mobs/fields/moscovia.txt
+npc: npc/re/mobs/fields/niflheim.txt
+npc: npc/re/mobs/fields/payon.txt
+npc: npc/re/mobs/fields/prontera.txt
+npc: npc/re/mobs/fields/rachel.txt
+npc: npc/re/mobs/fields/splendide.txt
+npc: npc/re/mobs/fields/umbala.txt
+npc: npc/re/mobs/fields/veins.txt
+npc: npc/re/mobs/fields/yuno.txt
 
-npc: npc/re/mobs/dungeons/bra_dun.txt
-npc: npc/re/mobs/dungeons/dew_dun.txt
-npc: npc/re/mobs/dungeons/dic_dun.txt
-npc: npc/re/mobs/dungeons/iz_dun_re.txt
-npc: npc/re/mobs/dungeons/lhz_dun_re.txt
-npc: npc/re/mobs/dungeons/ma_dun.txt
-npc: npc/re/mobs/dungeons/mal_dun.txt
-// --------------------------------------------------------------
+// --------------------------- Towns ----------------------------
+npc: npc/re/mobs/towns/brasilis.txt