summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2013-01-05 12:48:14 +0000
committerrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2013-01-05 12:48:14 +0000
commitc4ef5986ea0c7550604a298ecf449c1367d45d04 (patch)
tree336785d9e878e19c983121be5314dff86b49107e /npc
parent59029a6c7a0365521aa80519081fdfc7d958cca0 (diff)
downloadhercules-c4ef5986ea0c7550604a298ecf449c1367d45d04.tar.gz
hercules-c4ef5986ea0c7550604a298ecf449c1367d45d04.tar.bz2
hercules-c4ef5986ea0c7550604a298ecf449c1367d45d04.tar.xz
hercules-c4ef5986ea0c7550604a298ecf449c1367d45d04.zip
Fixed bugreport:6332 updated NJ_TATAMIGAESHI to its RE behavior.
Fixed bugreport:7101 where MO_EXTREMITYFIST don't consume sp when used against plant type monster. Fixed bugreport:7116 missing duration for HW_MAGICPOWER. Fixed bugreport:7117 where WL_WHITEIMPRISON doesn't work properly. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17078 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/re/scripts_main.conf17
1 files changed, 1 insertions, 16 deletions
diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf
index 2bca12324..9eb71bb69 100644
--- a/npc/re/scripts_main.conf
+++ b/npc/re/scripts_main.conf
@@ -26,19 +26,4 @@ npc: npc/other/Global_Functions.txt
npc: npc/other/CashShop_Functions.txt
// ------------------- 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_monsters.conf
-import: npc/re/scripts_warps.conf
-
-// ------------------- Custom Script Files ----------------------
-// - Your NPCs go in this file!
-import: npc/scripts_custom.conf
+npc: npc/re/m.txt