summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-06-05 17:27:44 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-06-05 17:27:44 +0000
commit728d2739587a389cffb834b5d8e1669cca42c205 (patch)
tree181e870f8839c19d3b44a45b217c1d92ff9c0a7c /npc
parent68a41fa7c4b27edb56ff1b079d488fd2cfebb0fc (diff)
downloadhercules-728d2739587a389cffb834b5d8e1669cca42c205.tar.gz
hercules-728d2739587a389cffb834b5d8e1669cca42c205.tar.bz2
hercules-728d2739587a389cffb834b5d8e1669cca42c205.tar.xz
hercules-728d2739587a389cffb834b5d8e1669cca42c205.zip
* Corrected Brasilis Fruit Merchant. (bugreport:4278)
* Implemented some new items, most 13.2 equipment. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14331 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/merchants/shops.txt5
2 files changed, 5 insertions, 2 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index eda232280..5d5ccf22a 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
======
+2010/06/05
+ * Rev. 14331 Corrected Brasilis Fruit Merchant. (bugreport:4278) [L0ne_W0lf]
2010/06/01
* Rev. 14330 Actually applied the right update to the comodo weapon shop. [L0ne_W0lf]
* Rev. 14329 Actually added Manuk/Splendide shop files from r14327. [L0ne_W0lf]
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index b92576a32..43fcd3744 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena Dev Team
//===== Current Version: =====================================
-//= 2.7a
+//= 2.7b
//===== Compatible With: =====================================
//= eAthena 1.0+
//===== Description: =========================================
@@ -30,6 +30,7 @@
//= Added Fire and Silver arrow to Einbroch tool dealer.
//= Re-added Bill of Birds to Morroc Item Collectors.
//= 2.7a Actually applied the right update to the comodo weapon shop. [L0ne_W0lf]
+//= 2.7b Corrected Brasilis Fruit Merchant. (bugreport:4278) [L0ne_W0lf]
//============================================================
//=======================================================
@@ -76,7 +77,7 @@ brasilis,252,257,5 shop Tool Dealer#bra 478,645:-1,656:-1,601:-1,602:-1,1065:-1,
brasilis,244,243,3 shop Weapon Dealer#bra 477,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1
brasilis,201,309,4 shop Pet Groomer#bra 476,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
// Apple -> Acai_Fruit
-brasilis,221,128,4 shop Fruit Merchant#bra 476,12369:-1,513:-1,512:-1
+brasilis,221,128,4 shop Fruit Merchant#bra 476,11515:-1,513:-1,11516:-1
//=======================================================
// Comodo