summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorMasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-25 13:45:36 +0000
committerMasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-25 13:45:36 +0000
commit26b7ca72f244cb2c525f376612aa0b93dd3f5f7b (patch)
treefbd54f7e0ed73a885f0418876ccda7892962c261 /npc
parentef7fd2530b23bf435a65ddd6a08fd1e2d64f80b0 (diff)
downloadhercules-26b7ca72f244cb2c525f376612aa0b93dd3f5f7b.tar.gz
hercules-26b7ca72f244cb2c525f376612aa0b93dd3f5f7b.tar.bz2
hercules-26b7ca72f244cb2c525f376612aa0b93dd3f5f7b.tar.xz
hercules-26b7ca72f244cb2c525f376612aa0b93dd3f5f7b.zip
A shop in Prontera... Blah blah, too lazy to write more about it.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7330 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt5
-rw-r--r--npc/merchants/shops.txt1
2 files changed, 4 insertions, 2 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index d8387bd48..4561a68c6 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -36,9 +36,10 @@ Musashiden
Date Added
======
+06/25
+ * Added a shop NPC to Prontera, it's required for the Hellion Quest. [MasterOfMuppets]
06/24
- *Fixed some typos and coordinates [Musashiden]
-
+ * Fixed some typos and coordinates [Musashiden]
06/23
* Merged JFunc 2-1, 2-2 functions, fixed bugs with missing dialogues [Lupus]
and changed job numbers to constants
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 38fbee896..9c829471b 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -256,6 +256,7 @@ prontera.gat,105,87,1 shop Gift Merchant 91,734:-1,735:-1,736:-1,737:-1,746:-1
prontera.gat,218,211,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
prontera.gat,248,153,1 shop Doll Merchant 85,740:-1,741:-1,742:-1
prontera.gat,156,212,2 shop Food Seller 700,7454:-1,7452:-1,7482:-1,580:-1
+prontera.gat,48,58,7 shop Vegetable Gardener 91,515:-1,516:-1,535:-1
prt_church.gat,108,124,1 shop Nun 79,2608:-1,2216:-1,2323:-1,2325:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1,5092:-1
prt_fild05.gat,290,221,1 shop Tool Dealer 83,1750:-1,611:-1,501:-1,502:-1,506:-1,601:-1,602:-1,645:-1,656:-1
prt_in.gat,211,169,1 shop Wedding Goods Merchant 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1