summaryrefslogtreecommitdiff
path: root/npc/re/merchants/shops.txt
diff options
context:
space:
mode:
authorMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
committerMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
commite3afdc2af4c5e50c79237ee092e25f39b7428e47 (patch)
tree20cfd05dd6fc2e3e53173ef059f045cee1526d58 /npc/re/merchants/shops.txt
parent491892212d338903179909b89a5bfc2385e52261 (diff)
downloadhercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.gz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.bz2
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.xz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.zip
Update to last rAthena npc.
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
Diffstat (limited to 'npc/re/merchants/shops.txt')
-rw-r--r--npc/re/merchants/shops.txt39
1 files changed, 25 insertions, 14 deletions
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index b27e5cc1d..42fc5bd03 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -1,22 +1,21 @@
//===== Hercules Script ======================================
//= Shops
-//===== By: ==================================================
+//===== By: ==================================================
//= Hercules Dev Team
-//===== Current Version: =====================================
-//= 1.5
-//===== Compatible With: =====================================
-//= Hercules
-//===== Description: =========================================
+//===== Current Version: =====================================
+//= 1.7
+//===== Description: =========================================
//= Renewal-specific town shop NPCs.
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 Moved some merchants to a separate renewal file. [Kenpachi]
//= 1.1 Added Dicastes merchants. [Joseph]
//= 1.2 Moved more shops to Renewal file. [Euphy]
//= 1.3 Added Malangdo tool dealer. [Euphy]
//= 1.4 Moved Izlude merchants. [Streusel]
//= 1.5 Added Dewata merchants. [Lemongrass]
-//= 1.6 Added Mora and Porta Malaya merchants. [Euphy]
-//============================================================
+//= 1.6 Added Mora and Port Malaya merchants.
+//= 1.7 Added Izlude duplicates. [Euphy]
+//============================================================
//=======================================================
// Comodo
@@ -46,11 +45,23 @@ dicastes01,207,200,6 shop Points Merchant#dic 66,6360:-1,6361:-1,6362:-1,6363:-1
//=======================================================
// Izlude
//=======================================================
-izlude,160,186,0 shop Butcher#iz 54,517:-1
izlude,124,165,4 shop Fruit Gardener#iz 53,512:-1,513:-1,515:-1,516:-1
-izlude,128,158,6 shop Vendor from Milk Ranch#i 90,519:-1
-izlude_in,72,98,3 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
-izlude_in,57,109,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
+izlude_a,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_a 53
+izlude_b,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_b 53
+izlude_c,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_c 53
+izlude_d,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_d 53
+izlude,160,186,0 shop Butcher#iz 54,517:-1
+izlude_a,160,186,0 duplicate(Butcher#iz) Butcher#iz_a 54
+izlude_b,160,186,0 duplicate(Butcher#iz) Butcher#iz_b 54
+izlude_c,160,186,0 duplicate(Butcher#iz) Butcher#iz_c 54
+izlude_d,160,186,0 duplicate(Butcher#iz) Butcher#iz_d 54
+izlude,128,158,7 shop Vendor from Milk Ranch#i 90,519:-1
+izlude_a,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#a 90
+izlude_b,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#b 90
+izlude_c,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#c 90
+izlude_d,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#d 90
+izlude_in,72,98,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude_in,57,110,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
izlude_in,72,110,3 shop Trading Merchant#iz 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
//=======================================================
@@ -73,7 +84,7 @@ malangdo,232,163,5 shop Tool Dealer Myo 560,611:-1,1750:-1,645:-1,656:-1,601:-1,
//=======================================================
// Mora
//=======================================================
-mora,100,118,4 shop Tool Dealer#mora 517,11522:-1,11523:-1,11524:-1,602:-1,601:-1,611:-1,1773:-1,1774:-1,713:-1
+mora,100,118,4 shop Tool Dealer#mora 517,11522:-1,11523:-1,11524:-1,602:-1,601:-1,611:-1,1773:-1,1774:-1
mora,138,110,4 shop Mora Chef 518,11519:-1
//=======================================================