summaryrefslogtreecommitdiff
path: root/npc/re/scripts.conf
diff options
context:
space:
mode:
authorMatias <matiassw@gmail.com>2013-06-25 16:59:44 -0400
committerMatias <matiassw@gmail.com>2013-06-25 16:59:44 -0400
commitb40371d3a0772031d12f2782c10976413c6f34b9 (patch)
tree7aeed5544a9df524a834cc739d3f596b66d6a006 /npc/re/scripts.conf
parent25914bae30eced388cf8640eead19fbb11a65ade (diff)
parent5785dbae3f513da20611e3147dadef2b9c911443 (diff)
downloadhercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.gz
hercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.bz2
hercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.xz
hercules-b40371d3a0772031d12f2782c10976413c6f34b9.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'npc/re/scripts.conf')
-rw-r--r--npc/re/scripts.conf5
1 files changed, 5 insertions, 0 deletions
diff --git a/npc/re/scripts.conf b/npc/re/scripts.conf
index 47b2cb7e0..c1e40dae6 100644
--- a/npc/re/scripts.conf
+++ b/npc/re/scripts.conf
@@ -13,6 +13,7 @@ npc: npc/re/cities/dicastes.txt
npc: npc/re/cities/izlude.txt
npc: npc/re/cities/jawaii.txt
npc: npc/re/cities/malangdo.txt
+npc: npc/re/cities/malaya.txt
npc: npc/re/cities/mora.txt
// --------------------------- Guides ---------------------------
@@ -33,6 +34,7 @@ npc: npc/re/guides/guides_juno.txt
npc: npc/re/guides/guides_lighthalzen.txt
npc: npc/re/guides/guides_louyang.txt
npc: npc/re/guides/guides_lutie.txt
+npc: npc/re/guides/guides_mora.txt
npc: npc/re/guides/guides_morroc.txt
npc: npc/re/guides/guides_moscovia.txt
npc: npc/re/guides/guides_niflheim.txt
@@ -50,10 +52,12 @@ npc: npc/re/merchants/3rd_trader.txt
npc: npc/re/merchants/diamond.txt
npc: npc/re/merchants/flute.txt
npc: npc/re/merchants/inn.txt
+npc: npc/re/merchants/quivers.txt
npc: npc/re/merchants/refine.txt
npc: npc/re/merchants/renters.txt
npc: npc/re/merchants/shops.txt
npc: npc/re/merchants/enchan_mal.txt
+npc: npc/re/merchants/enchan_mora.txt
npc: npc/re/merchants/coin_exchange.txt
// --------------------------- Others ---------------------------
@@ -84,5 +88,6 @@ npc: npc/re/quests/quests_izlude.txt
npc: npc/re/quests/quests_lighthalzen.txt
npc: npc/re/quests/quests_malangdo.txt
npc: npc/re/quests/quests_veins.txt
+npc: npc/re/quests/quests_mora.txt
npc: npc/re/quests/monstertamers.txt
npc: npc/re/quests/quests_13_1.txt