summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2013-01-05 14:21:22 +0000
committerrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2013-01-05 14:21:22 +0000
commit92880a66754afb8b3b4285276c70c0fc6aa75c1f (patch)
tree7691c6ef9b18a4f65567b92ae2fc5bfd580f6b10
parentc4ef5986ea0c7550604a298ecf449c1367d45d04 (diff)
downloadhercules-92880a66754afb8b3b4285276c70c0fc6aa75c1f.tar.gz
hercules-92880a66754afb8b3b4285276c70c0fc6aa75c1f.tar.bz2
hercules-92880a66754afb8b3b4285276c70c0fc6aa75c1f.tar.xz
hercules-92880a66754afb8b3b4285276c70c0fc6aa75c1f.zip
Reverted 're/scripts_main.conf' from r17078..sorry folks..:)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17079 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/re/scripts_main.conf17
1 files changed, 16 insertions, 1 deletions
diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf
index 9eb71bb69..2bca12324 100644
--- a/npc/re/scripts_main.conf
+++ b/npc/re/scripts_main.conf
@@ -26,4 +26,19 @@ npc: npc/other/Global_Functions.txt
npc: npc/other/CashShop_Functions.txt
// ------------------- Common Script Files ----------------------
-npc: npc/re/m.txt
+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_monsters.conf
+import: npc/re/scripts_warps.conf
+
+// ------------------- Custom Script Files ----------------------
+// - Your NPCs go in this file!
+import: npc/scripts_custom.conf