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, 19 insertions, 11 deletions

diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf
index 7a6a7d8f8..d4d80461f 100644
--- a/npc/re/scripts_main.conf
+++ b/npc/re/scripts_main.conf
@@ -1,5 +1,5 @@
 // --------------------------------------------------------------
-// -                rAthena Primary Scripts File                -
+// -             rAthena Renewal Primary Scripts File           -
 // --------------------------------------------------------------
 //  The idea of this new system is to make scripts more organized
 // since the old system was rather messy with all the NPCs in one
@@ -16,21 +16,29 @@
 // only as information/reference.
 //
 // --------------------------------------------------------------
+
 // ------------------ Global Scripts Functions ------------------
 // Utilitarian functions used by many scripts.
 npc: npc/re/other/Global_Functions.txt
-// --------------------------------------------------------------
-// -------------------- Cash Shop Functions --------------------
+
+// -------------------- Cash Shop Functions ---------------------
 // Used by cash shop items in the Item Database.
 npc: npc/re/other/CashShop_Functions.txt
-// --------------------------------------------------------------
-// ------------------------ Script Files ------------------------
-import: npc/re/scripts_mapflags.conf
-import: npc/re/scripts_warps.conf
-import: npc/re/scripts_monsters.conf
+
+// ------------------- Common Script Files ----------------------
+import: npc/scripts_athena.conf
+import: npc/scripts_guild.conf
+import: npc/scripts_jobs.conf
+import: npc/scripts_mapflags.conf
+import: npc/scripts_monsters.conf
+import: npc/scripts_warps.conf
+
+// ------------------- Renewal Script Files ---------------------
 import: npc/re/scripts_athena.conf
 import: npc/re/scripts_jobs.conf
-import: npc/re/scripts_guild.conf
-// -- Your NPCs go in this file!
+import: npc/re/scripts_monsters.conf
+import: npc/re/scripts_warps.conf
+
+// ------------------- Custom Script Files ----------------------
+// - Your NPCs go in this file!
 import: npc/scripts_custom.conf
-// --------------------------------------------------------------