- Added svn:eol-style=native property on some recently added text files.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16258 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 67 insertions, 67 deletions

diff --git a/npc/merchants/shops_re.txt b/npc/merchants/shops_re.txt
index a68854aab..5fa158ce0 100644
--- a/npc/merchants/shops_re.txt
+++ b/npc/merchants/shops_re.txt
@@ -1,67 +1,67 @@
-//===== rAthena Script ======================================= 

-//= Shops

-//===== By: ================================================== 

-//= rAthena Dev Team

-//===== Current Version: ===================================== 

-//= 3.0

-//===== Compatible With: ===================================== 

-//= rAthena 1.0+

-//===== Description: ========================================= 

-//=

-//===== 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]

-//============================================================ 

-

-//=======================================================

-// Einbroch

-//=======================================================

-einbroch,122,250,4	shop	Black Marketeer#ein	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1

-

-//=======================================================

-// Lighthalzen

-//=======================================================

-lhz_in03,181,17,4	shop	Black Marketeer#lhz	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1

-s_atelier,15,65,5	shop	Part-Timer#sc_lgt	89,6123:-1,6120:-1

-

-//=======================================================

-// Mid Camp

-//=======================================================

-mid_camp,129,284,4	shop	Trap Specialist#mid	66,7940:-1,12341:-1

-mid_camp,184,263,4	shop	Black Marketeer#mid	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1

-

-//=======================================================

-// Prontera

-//=======================================================

-prt_in,175,137,4	shop	Black Marketeer#prt	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1

-s_atelier,17,110,1	shop	Part-Timer#sc_prt	67,6123:-1,6120:-1

-

-//=======================================================

-// Rachel

-//=======================================================

-ra_in01,257,266,4	shop	Black Marketeer#ra	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1

-s_atelier,137,60,3	shop	Part-Timer#sc_ra	70,6123:-1,6120:-1

+//===== rAthena Script ======================================= 
+//= Shops
+//===== By: ================================================== 
+//= rAthena Dev Team
+//===== Current Version: ===================================== 
+//= 3.0
+//===== Compatible With: ===================================== 
+//= rAthena 1.0+
+//===== Description: ========================================= 
+//=
+//===== 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]
+//============================================================ 
+
+//=======================================================
+// Einbroch
+//=======================================================
+einbroch,122,250,4	shop	Black Marketeer#ein	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+
+//=======================================================
+// Lighthalzen
+//=======================================================
+lhz_in03,181,17,4	shop	Black Marketeer#lhz	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+s_atelier,15,65,5	shop	Part-Timer#sc_lgt	89,6123:-1,6120:-1
+
+//=======================================================
+// Mid Camp
+//=======================================================
+mid_camp,129,284,4	shop	Trap Specialist#mid	66,7940:-1,12341:-1
+mid_camp,184,263,4	shop	Black Marketeer#mid	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+
+//=======================================================
+// Prontera
+//=======================================================
+prt_in,175,137,4	shop	Black Marketeer#prt	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+s_atelier,17,110,1	shop	Part-Timer#sc_prt	67,6123:-1,6120:-1
+
+//=======================================================
+// Rachel
+//=======================================================
+ra_in01,257,266,4	shop	Black Marketeer#ra	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+s_atelier,137,60,3	shop	Part-Timer#sc_ra	70,6123:-1,6120:-1