diff options
author | daegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-08-01 04:29:56 +0000 |
---|---|---|
committer | daegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-08-01 04:29:56 +0000 |
commit | 8832adba3ec9df0f7f890154f69f0993b8d1d8e5 (patch) | |
tree | 0e73afe6a780abf29fe035301f1354f24762da7a /npc/re/merchants/shops_re.txt | |
parent | fa533907d49c7e288be33efb55fcb094f8e48591 (diff) | |
download | hercules-8832adba3ec9df0f7f890154f69f0993b8d1d8e5.tar.gz hercules-8832adba3ec9df0f7f890154f69f0993b8d1d8e5.tar.bz2 hercules-8832adba3ec9df0f7f890154f69f0993b8d1d8e5.tar.xz hercules-8832adba3ec9df0f7f890154f69f0993b8d1d8e5.zip |
Full npc folder reorganization. (I hope I didn't break anything D:)
-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders.
-NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences.
-For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates.
-All pre-renewal files has been reverted back to their pre-renewal behavior.
TODO:
-Correct pre-re quest rewards.
-Check for pre-re/re differences in mapflags.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16545 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/re/merchants/shops_re.txt')
-rw-r--r-- | npc/re/merchants/shops_re.txt | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/npc/re/merchants/shops_re.txt b/npc/re/merchants/shops_re.txt deleted file mode 100644 index 4f0ad37e3..000000000 --- a/npc/re/merchants/shops_re.txt +++ /dev/null @@ -1,42 +0,0 @@ -//===== rAthena Script ======================================= -//= Shops -//===== By: ================================================== -//= rAthena Dev Team -//===== Current Version: ===================================== -//= 3.1 -//===== Compatible With: ===================================== -//= rAthena 1.0+ -//===== Description: ========================================= -//= Renewal-specific town shop NPCs. -//===== Additional Comments: ================================= -//= 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 |