From 3b4b0876efdaa78bb55a6ab287fdbb0d50ead2e6 Mon Sep 17 00:00:00 2001
From: Matheus Macabu <mkbu95@gmail.com>
Date: Sat, 18 May 2013 16:04:10 -0300
Subject: Great. Forgot to add some files.

Signed-off-by: Matheus Macabu <mkbu95@gmail.com>
---
 npc/pre-re/scripts_main.conf |  4 ++--
 npc/re/scripts_main.conf     |  4 ++--
 npc/scripts_mapflags.conf    | 56 ++++++++++++++++++++++----------------------
 3 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'npc')

diff --git a/npc/pre-re/scripts_main.conf b/npc/pre-re/scripts_main.conf
index e029447b5..db7ed1411 100644
--- a/npc/pre-re/scripts_main.conf
+++ b/npc/pre-re/scripts_main.conf
@@ -26,7 +26,7 @@ npc: npc/other/Global_Functions.txt
 npc: npc/other/CashShop_Functions.txt
 
 // ------------------- Common Script Files ----------------------
-import: npc/scripts_athena.conf
+import: npc/scripts.conf
 import: npc/scripts_guild.conf
 import: npc/scripts_jobs.conf
 import: npc/scripts_mapflags.conf
@@ -34,7 +34,7 @@ import: npc/scripts_monsters.conf
 import: npc/scripts_warps.conf
 
 // ----------------- Pre-Renewal Script Files -------------------
-import: npc/pre-re/scripts_athena.conf
+import: npc/pre-re/scripts.conf
 import: npc/pre-re/scripts_jobs.conf
 import: npc/pre-re/scripts_monsters.conf
 import: npc/pre-re/scripts_warps.conf
diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf
index 2bca12324..d9dfcf267 100644
--- a/npc/re/scripts_main.conf
+++ b/npc/re/scripts_main.conf
@@ -26,7 +26,7 @@ npc: npc/other/Global_Functions.txt
 npc: npc/other/CashShop_Functions.txt
 
 // ------------------- Common Script Files ----------------------
-import: npc/scripts_athena.conf
+import: npc/scripts.conf
 import: npc/scripts_guild.conf
 import: npc/scripts_jobs.conf
 import: npc/scripts_mapflags.conf
@@ -34,7 +34,7 @@ import: npc/scripts_monsters.conf
 import: npc/scripts_warps.conf
 
 // ------------------- Renewal Script Files ---------------------
-import: npc/re/scripts_athena.conf
+import: npc/re/scripts.conf
 import: npc/re/scripts_jobs.conf
 import: npc/re/scripts_monsters.conf
 import: npc/re/scripts_warps.conf
diff --git a/npc/scripts_mapflags.conf b/npc/scripts_mapflags.conf
index 78adeba20..c0d2787f8 100644
--- a/npc/scripts_mapflags.conf
+++ b/npc/scripts_mapflags.conf
@@ -1,31 +1,31 @@
 // --------------------------------------------------------------
 // -                         Map  Flags                         -
 // --------------------------------------------------------------
-npc: conf/mapflag/nopvp.txt
-npc: conf/mapflag/gvg.txt
-npc: conf/mapflag/jail.txt
-npc: conf/mapflag/nightmare.txt
-npc: conf/mapflag/nobranch.txt
-npc: conf/mapflag/noexp.txt
-npc: conf/mapflag/noicewall.txt
-npc: conf/mapflag/noloot.txt
-npc: conf/mapflag/nomemo.txt
-npc: conf/mapflag/nopenalty.txt
-npc: conf/mapflag/nosave.txt
-npc: conf/mapflag/noteleport.txt
-npc: conf/mapflag/noreturn.txt
-npc: conf/mapflag/noskill.txt
-npc: conf/mapflag/nowarp.txt
-npc: conf/mapflag/nowarpto.txt
-npc: conf/mapflag/partylock.txt
-npc: conf/mapflag/pvp.txt
-npc: conf/mapflag/pvp_noparty.txt
-npc: conf/mapflag/pvp_noguild.txt
-npc: conf/mapflag/night.txt
-npc: conf/mapflag/zone.txt
-npc: conf/mapflag/battleground.txt
-npc: conf/mapflag/novending.txt
-npc: conf/mapflag/town.txt
-npc: conf/mapflag/reset.txt
-npc: conf/mapflag/skillmodifier.txt
-npc: conf/mapflag/skillduration.txt
\ No newline at end of file
+npc: npc/mapflag/nopvp.txt
+npc: npc/mapflag/gvg.txt
+npc: npc/mapflag/jail.txt
+npc: npc/mapflag/nightmare.txt
+npc: npc/mapflag/nobranch.txt
+npc: npc/mapflag/noexp.txt
+npc: npc/mapflag/noicewall.txt
+npc: npc/mapflag/noloot.txt
+npc: npc/mapflag/nomemo.txt
+npc: npc/mapflag/nopenalty.txt
+npc: npc/mapflag/nosave.txt
+npc: npc/mapflag/noteleport.txt
+npc: npc/mapflag/noreturn.txt
+npc: npc/mapflag/noskill.txt
+npc: npc/mapflag/nowarp.txt
+npc: npc/mapflag/nowarpto.txt
+npc: npc/mapflag/partylock.txt
+npc: npc/mapflag/pvp.txt
+npc: npc/mapflag/pvp_noparty.txt
+npc: npc/mapflag/pvp_noguild.txt
+npc: npc/mapflag/night.txt
+npc: npc/mapflag/zone.txt
+npc: npc/mapflag/battleground.txt
+npc: npc/mapflag/novending.txt
+npc: npc/mapflag/town.txt
+npc: npc/mapflag/reset.txt
+npc: npc/mapflag/skillmodifier.txt
+npc: npc/mapflag/skillduration.txt
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2