summaryrefslogtreecommitdiff
path: root/npc/re/merchants/shops.txt
diff options
context:
space:
mode:
authorj-tkay <j-tkay@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-08 17:11:22 +0000
committerj-tkay <j-tkay@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-08 17:11:22 +0000
commitceaf736a558229d1783324a78458c02dd1de597b (patch)
tree42d0be87b9ad82f8c9532a456284bdc7efd6c67b /npc/re/merchants/shops.txt
parentd9f07c906f597ba9721c5eff727c8091adbfd239 (diff)
downloadhercules-ceaf736a558229d1783324a78458c02dd1de597b.tar.gz
hercules-ceaf736a558229d1783324a78458c02dd1de597b.tar.bz2
hercules-ceaf736a558229d1783324a78458c02dd1de597b.tar.xz
hercules-ceaf736a558229d1783324a78458c02dd1de597b.zip
- Updated and adapted El Dicastes NPC from official script. Credits to Muad_Dib!
- Standardized header. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17009 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/re/merchants/shops.txt')
-rw-r--r--npc/re/merchants/shops.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 969482dd2..c07a7df7f 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= rAthena Dev Team
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= Renewal-specific town shop NPCs.
//===== Additional Comments: =================================
//= 1.0 Moved some merchants to a separate renewal file. [Kenpachi]
+//= 1.1 Added Dicastes merchants. [Joseph]
//============================================================
//=======================================================
@@ -48,3 +49,9 @@ s_atelier,17,110,1 shop Part-Timer#sc_prt 67,6123:-1,6120:-1
//=======================================================
ra_in01,257,266,4 shop Black Marketeer#ra 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
s_atelier,137,60,3 shop Part-Timer#sc_ra 70,6123:-1,6120:-1
+
+//=======================================================
+// Dicastes
+//=======================================================
+dic_in01,238,107,5 shop Peddler#dic 900,601:-1,602:-1,611:-1,610:-1
+dicastes01,207,200,6 shop Points Merchant#dic 66,6360:-1,6361:-1,6362:-1,6363:-1