summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-01-25 02:18:10 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-01-25 02:18:10 +0000
commit5bd53de85cf7750edf92c11c3f1084b2a9b5956e (patch)
tree0456f4e0dae4eb69639667cfdb652df749993ae3 /npc
parentb4cc548e5e13d4759aacbd44fdb2c74ceb9ce9a1 (diff)
downloadhercules-5bd53de85cf7750edf92c11c3f1084b2a9b5956e.tar.gz
hercules-5bd53de85cf7750edf92c11c3f1084b2a9b5956e.tar.bz2
hercules-5bd53de85cf7750edf92c11c3f1084b2a9b5956e.tar.xz
hercules-5bd53de85cf7750edf92c11c3f1084b2a9b5956e.zip
Cleaned up missed files and conf file notes from r14229.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14230 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/scripts_eamonsters.conf67
-rw-r--r--npc/scripts_jmonsters.conf19
-rw-r--r--npc/scripts_main.conf5
4 files changed, 1 insertions, 91 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 002f0ffe7..d3c9c8a62 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
2010/01/24
+ * Rev. 14230 Cleaned up missed files and conf file notes from r14229. [L0ne_W0lf]
* Removed npc/eamobs/. Reason: Old/Unsupported/Unofficial/Unused. [Paradox924X]
2010/01/22
* Rev. 14224 Updated the Enlarge Weight Limit NPC. It is now a conversion of an aegis script, with iRO dialog. [L0ne_W0lf]
diff --git a/npc/scripts_eamonsters.conf b/npc/scripts_eamonsters.conf
deleted file mode 100644
index dcad1149e..000000000
--- a/npc/scripts_eamonsters.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-// --------------------------------------------------------------
-// - Monster Scripts -
-// --------------------------------------------------------------
-npc: npc/mobs/citycleaners.txt
-npc: npc/mobs/pvp.txt
-
-npc: npc/eamobs/fields/comodo.txt
-npc: npc/eamobs/fields/mjolnir.txt
-npc: npc/eamobs/fields/umbala.txt
-
-npc: npc/mobs/fields/amatsu.txt
-npc: npc/mobs/fields/ayothaya.txt
-npc: npc/mobs/fields/einbroch.txt
-npc: npc/mobs/fields/geffen.txt
-npc: npc/mobs/fields/gonryun.txt
-npc: npc/mobs/fields/hugel.txt
-npc: npc/mobs/fields/jawaii.txt
-npc: npc/mobs/fields/lighthalzen.txt
-npc: npc/mobs/fields/louyang.txt
-npc: npc/mobs/fields/lutie.txt
-npc: npc/mobs/fields/morocc.txt
-npc: npc/mobs/fields/niflheim.txt
-npc: npc/mobs/fields/payon.txt
-npc: npc/mobs/fields/prontera.txt
-npc: npc/mobs/fields/rachel.txt
-npc: npc/mobs/fields/veins.txt
-npc: npc/mobs/fields/yuno.txt
-
-npc: npc/eamobs/dungeons/byalan.txt
-npc: npc/eamobs/dungeons/clocktower.txt
-npc: npc/eamobs/dungeons/coalmine.txt
-npc: npc/eamobs/dungeons/geftower.txt
-npc: npc/eamobs/dungeons/glastheim.txt
-npc: npc/eamobs/dungeons/jupedun.txt
-npc: npc/eamobs/dungeons/moc_pyramid.txt
-npc: npc/eamobs/dungeons/moc_sphinx.txt
-npc: npc/eamobs/dungeons/sunkenship.txt
-
-npc: npc/mobs/dungeons/abbey.txt
-npc: npc/mobs/dungeons/abyss.txt
-npc: npc/mobs/dungeons/ama_dun.txt
-npc: npc/mobs/dungeons/anthell.txt
-npc: npc/mobs/dungeons/ayo_dun.txt
-npc: npc/mobs/dungeons/beach_dun.txt
-npc: npc/mobs/dungeons/ein_dun.txt
-npc: npc/mobs/dungeons/gefenia.txt
-npc: npc/mobs/dungeons/gld_dun.txt
-npc: npc/mobs/dungeons/gon_dun.txt
-npc: npc/mobs/dungeons/ice_dun.txt
-npc: npc/mobs/dungeons/kh_dun.txt
-npc: npc/mobs/dungeons/lhz_dun.txt
-npc: npc/mobs/dungeons/lou_dun.txt
-npc: npc/mobs/dungeons/mag_dun.txt
-//npc: npc/mobs/dungeons/mosk_dun.txt
-npc: npc/mobs/dungeons/odin.txt
-npc: npc/mobs/dungeons/orcsdun.txt
-npc: npc/mobs/dungeons/pay_dun.txt
-npc: npc/mobs/dungeons/prt_maze.txt
-npc: npc/mobs/dungeons/prt_sew.txt
-npc: npc/mobs/dungeons/ra_san.txt
-npc: npc/mobs/dungeons/tha_t.txt
-npc: npc/mobs/dungeons/thor_v.txt
-npc: npc/mobs/dungeons/tur_dun.txt
-npc: npc/mobs/dungeons/um_dun.txt
-npc: npc/mobs/dungeons/xmas_dun.txt
-npc: npc/mobs/dungeons/yggdrasil.txt
-// --------------------------------------------------------------
diff --git a/npc/scripts_jmonsters.conf b/npc/scripts_jmonsters.conf
deleted file mode 100644
index dae7b95cd..000000000
--- a/npc/scripts_jmonsters.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-// --------------------------------------------------------------
-// - Monster Scripts -
-// --------------------------------------------------------------
-
-npc: npc/eamobs/jro/jro.txt
-
-// -- Those maps are missing in jRO X.3 spawns
-// -- Uncomment them if you want to have monsters on the
-// -- missing maps as well
-//npc: npc/eamobs/jro/other.txt
-//npc: npc/mobs/fields/rachel.txt
-//npc: npc/mobs/fields/veins.txt
-//npc: npc/mobs/dungeons/kh_dun.txt
-//npc: npc/mobs/dungeons/ice_dun.txt
-//npc: npc/mobs/dungeons/odin.txt
-//npc: npc/mobs/dungeons/ra_san.txt
-//npc: npc/mobs/dungeons/thor_v.txt
-//npc: npc/mobs/dungeons/abbey.txt
-// --------------------------------------------------------------
diff --git a/npc/scripts_main.conf b/npc/scripts_main.conf
index fda24f8ee..fb239db6c 100644
--- a/npc/scripts_main.conf
+++ b/npc/scripts_main.conf
@@ -27,12 +27,7 @@ npc: npc/other/CashShop_Functions.txt
// ------------------------ Script Files ------------------------
import: npc/scripts_mapflags.conf
import: npc/scripts_warps.conf
-// -- scripts_monsters.conf is official spawns
-// -- scripts_eamonsters.conf is modified for eAthena in an attempt to have more balanced/fair spawns
-// -- script_jmonsters.conf is the official jRO spawns which differ from kRO ones
import: npc/scripts_monsters.conf
-//import: npc/scripts_eamonsters.conf
-//import: npc/scripts_jmonsters.conf
import: npc/scripts_athena.conf
import: npc/scripts_jobs.conf
import: npc/scripts_guild.conf