From 729a171c5eab680888fcb65f78b67487887eaa9b Mon Sep 17 00:00:00 2001 From: euphyy Date: Wed, 4 Jul 2012 15:26:16 +0000 Subject: * Corrected and optimized 12 guide NPCs (/guides/) * Fixed a small typo in Warlock quest, bugreport:6164 (jobs\3-1\warlock.txt) * Fixed a couple of job constant typos in "Nameless Island Quests" (quests\quests_nameless.txt) * Removed non-RE changelogs from RE scripts git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16376 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/merchants/shops.txt | 4 ++-- npc/merchants/shops_re.txt | 29 ++--------------------------- 2 files changed, 4 insertions(+), 29 deletions(-) (limited to 'npc/merchants') diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index f8ad2529b..00adf71b4 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -3,11 +3,11 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 3.0 +//= 3.1 //===== Compatible With: ===================================== //= rAthena 1.0+ //===== Description: ========================================= -//= +//= Town shop NPCs. //===== Additional Comments: ================================= //= For earlier update notes see the bottom. //= 2.0 updated several shop npcs. [L0ne_W0lf] diff --git a/npc/merchants/shops_re.txt b/npc/merchants/shops_re.txt index 5fa158ce0..4f0ad37e3 100644 --- a/npc/merchants/shops_re.txt +++ b/npc/merchants/shops_re.txt @@ -3,37 +3,12 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 3.0 +//= 3.1 //===== Compatible With: ===================================== //= rAthena 1.0+ //===== Description: ========================================= -//= +//= Renewal-specific town shop NPCs. //===== 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. -//= 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] -//= 2.2 Added Veins shops. [L0ne_W0lf] -//= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] -//= 2.4 Fixed Jawaii Ice cream salesman. [L0ne_W0lf] -//= 2.5 Updated Morroc shops to episode 12.1. [L0ne_W0lf] -//= 2.6 Added Brasilis shops. [L0ne_W0lf] -//= Updated Pet Groomers with four new pet feeds. -//= 2.7 Added Trading merchants, (ninja& gunslinger) to Izlude and Alberta. [L0ne_W0lf] -//= Made Brasilis shop names unique, and uncommented. -//= Changed the whip sold in comodo weapon shop. (1956 ->1960) -//= 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] -//= 2.8 Updates to Brasilis Merchants. [L0ne_W0lf] -//= 2.9 Added missing Cooking Items for Material Seller. [tr0n] -//= 3.0 Added all new Shops which were available in the latest available official files. [Masao] //= 3.1 Moved some merchants to a separate renewal file. [Kenpachi] //============================================================ -- cgit v1.2.3-60-g2f50