diff options
| author | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-10 17:29:54 +0000 |
|---|---|---|
| committer | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-10 17:29:54 +0000 |
| commit | 1fc55f1687f9d99ac7270b28082a5f0727640469 (patch) | |
| tree | ade15bf22facf0aa62179274f0450b4d1f5605db /npc/re/merchants/shops.txt | |
| parent | baec4399395e25ceb93c5e236dc9841f958d2af6 (diff) | |
| download | hercules-1fc55f1687f9d99ac7270b28082a5f0727640469.tar.gz hercules-1fc55f1687f9d99ac7270b28082a5f0727640469.tar.bz2 hercules-1fc55f1687f9d99ac7270b28082a5f0727640469.tar.xz hercules-1fc55f1687f9d99ac7270b28082a5f0727640469.zip | |
* Added a missing shop item, bugreport:6878 (re\merchants\shops.txt)
* Fixed a few incorrect labels in Poring War script, bugreport:6794 (other\poring_war.txt)
* Follow-up r16900, added svn:eol-style=native property.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16903 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/re/merchants/shops.txt')
| -rw-r--r-- | npc/re/merchants/shops.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index fcdd6044b..969482dd2 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -15,7 +15,7 @@ //======================================================= // 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 +einbroch,122,250,4 shop Black Marketeer#ein 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-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 //======================================================= // Izlude @@ -28,23 +28,23 @@ izlude,174,164,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-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 +lhz_in03,181,17,4 shop Black Marketeer#lhz 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-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 +mid_camp,184,263,4 shop Black Marketeer#mid 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-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 +prt_in,175,137,4 shop Black Marketeer#prt 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-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 +ra_in01,257,266,4 shop Black Marketeer#ra 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-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 |