summaryrefslogtreecommitdiff
path: root/npc/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/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/merchants/shops.txt')
-rw-r--r--npc/merchants/shops.txt30
1 files changed, 15 insertions, 15 deletions
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index b9c47b659..2e339a59a 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -1,18 +1,18 @@
//===== Hercules Script ======================================
//= Shops
-//===== By: ==================================================
+//===== By: ==================================================
//= rAthena Dev Team
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 3.4
-//===== Description: =========================================
+//===== Description: =========================================
//= Town shop NPCs.
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= For earlier update notes see the bottom.
//= 2.0 updated several shop npcs. [L0ne_W0lf]
-//= Added proper Venom Knife dealer, and consiquently removed wenom Knives from weapon dealers.
-//= Moved all Cooking related NPCs to their own section.
-//= Re-alphabetized sections. Some of them were out of place.
-//= Removed commented out shops.
+//= Added proper Venom Knife dealer, and consiquently removed wenom Knives from weapon dealers.
+//= Moved all Cooking related NPCs to their own section.
+//= Re-alphabetized sections. Some of them were out of place.
+//= Removed commented out shops.
//= 2.0b Einbech tool dealer got lost somewhere along the way, re-added. [L0ne_W0lf]
//= 2.1 Fixed missing item from "Fresh Fish" from cooking addition shops. [L0ne_W0lf]
//= 2.1a Fixed the second "Line" selling in Comodo Weapon shop. (Should have been Whip) [L0ne_W0lf]
@@ -35,8 +35,8 @@
//= 3.1 Moved some merchants to a separate renewal file. [Kenpachi]
//= 3.2 Added Missing Items to the pet Groomers in prontera, payon, and yuno. BugReport:6680[Spre]
//= 3.3 Moved more shops to Renewal file. [Euphy]
-//= 3.4 Removed some Izlude shops [Streusel]
-//============================================================
+//= 3.4 Moved Izlude shops to pre-re/re paths. [Streusel]
+//============================================================
//=======================================================
// Alberta
@@ -322,12 +322,12 @@ ayothaya,203,178,3 shop Chef Assistant#ayo 83,7455:-1,577:-1
xmas,152,137,5 shop Chef Assistant#xmas 83,7457:-1,577:-1
niflheim,209,180,5 shop Chef Assistant#nif 83,581:-1
-//===== Additional Comments(old): =================================
+//===== Additional Comments(old): =================================
//= swapped shop titles in GONRYUN, thanks to Kashy
//= 1.3a Fixed Louyang map name. Added additional shops in Yuno. [kobra_k88]
//= 1.4 Added Niflheim Shops
//= 1.5 New Payon Locations [Darkchild]
-//= Moved shops in Umbala.txt here. Commented out the duplicate ones.[kobra_k88]
+//= Moved shops in Umbala.txt here. Commented out the duplicate ones.[kobra_k88]
//= 1.6 Removed GRAPE ID 514 from shops (caused exploits)
//= 1.7 Removed juices from custom amatsu shops (it's a quest item + levelup exploit)
//= 1.8 Corrected Niflheim Shops and Morroc Jewel Merchant [celest]
@@ -350,13 +350,13 @@ niflheim,209,180,5 shop Chef Assistant#nif 83,581:-1
//= - Guys, I suggest we crop these comments and put them at the bottom soon
//= 1.22 Thx8) Removed Berserk Potions from all shops but Comodo [Lupus]
//= 1.3 Added Gunslinger shops. Credits goes to RockmanEXE for the info [erKURITA]
-//= Added Bucket Hat to Flu Mask dealer and modified it's name to a more logical one :P [erKURITA]
+//= Added Bucket Hat to Flu Mask dealer and modified it's name to a more logical one :P [erKURITA]
//= 1.4 Added an ingredient seller to Morroc, thanks to Muad_Dib [MasterOfMuppets]
//= a Removed doubled Morocc Ing.Seller, arranged the rest Ing.Sellers according to the city names [Lupus]
//= 1.4b Commented out temp Gunslinger shops. [Lupus]
//= 1.5 Removed Temp gunslinger shops and moved up the official ones. [erKURITA]
-//= Added Official Ninja shops in their correct location and commented a few
-//= shops. Thanks to RockmanEXE and Muad_Dib [erKURITA]
+//= Added Official Ninja shops in their correct location and commented a few
+//= shops. Thanks to RockmanEXE and Muad_Dib [erKURITA]
//= 1.6 Implemented a missing Tool Shop in Lighthalzen [MasterOfMuppets]
//= 1.7 Added some missing iRO - Lighthalzen NPCs [Musashiden]
//= 1.8 Added Rachel Official shops. Special Thanks to RockmanEXE. [erKURITA]