diff options
| author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
| commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
| tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/pre-re/merchants | |
| parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
| parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
| download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/pre-re/merchants')
| -rw-r--r-- | npc/pre-re/merchants/ammo_boxes.txt | 2 | ||||
| -rw-r--r-- | npc/pre-re/merchants/ammo_dealer.txt | 2 | ||||
| -rw-r--r-- | npc/pre-re/merchants/shops.txt | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/npc/pre-re/merchants/ammo_boxes.txt b/npc/pre-re/merchants/ammo_boxes.txt index 28b220e17..a78adaca6 100644 --- a/npc/pre-re/merchants/ammo_boxes.txt +++ b/npc/pre-re/merchants/ammo_boxes.txt @@ -10,4 +10,4 @@ //= 1.0 First version, Pre-Renewal duplicates. //============================================================ -izlude,171,127,3 duplicate(mdk) Magazine Dealer Kenny#iz 83 +izlude,171,127,3 duplicate(mdk) Magazine Dealer Kenny#iz 4_M_01 diff --git a/npc/pre-re/merchants/ammo_dealer.txt b/npc/pre-re/merchants/ammo_dealer.txt index 4286121b2..8cf77542b 100644 --- a/npc/pre-re/merchants/ammo_dealer.txt +++ b/npc/pre-re/merchants/ammo_dealer.txt @@ -10,4 +10,4 @@ //= 1.0 First version, Pre-Renewal duplicates. //============================================================ -izlude,171,133,3 duplicate(bdt) Bullet Dealer Tony#iz 86 +izlude,171,133,3 duplicate(bdt) Bullet Dealer Tony#iz 4_M_04 diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt index 60864123d..d303f35b4 100644 --- a/npc/pre-re/merchants/shops.txt +++ b/npc/pre-re/merchants/shops.txt @@ -14,9 +14,9 @@ //======================================================= // Izlude //======================================================= -izlude,105,99,0 shop Butcher#iz 54,517:-1 -izlude,94,98,4 shop Fruit Gardener#iz 53,512:-1,513:-1,515:-1,516:-1 -izlude,105,92,7 shop Vendor from Milk Ranch#i 90,519:-1 -izlude,164,138,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 -izlude_in,115,61,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,121,64,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 +izlude,105,99,0 shop Butcher#iz 1_M_JOBGUIDER,517:-1 +izlude,94,98,4 shop Fruit Gardener#iz 1_M_INNKEEPER,512:-1,513:-1,515:-1,516:-1 +izlude,105,92,7 shop Vendor from Milk Ranch#i 4_F_01,519:-1 +izlude,164,138,4 shop Pet Groomer#iz 4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 +izlude_in,115,61,0 shop Tool Dealer#iz 1_M_01,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,121,64,3 shop Trading Merchant#iz 4_M_HUMERCHANT,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1 |