diff options
| author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
| commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
| tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/re/merchants/flute.txt | |
| parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
| parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
| download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/re/merchants/flute.txt')
| -rw-r--r-- | npc/re/merchants/flute.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt index b882c490f..03ef82559 100644 --- a/npc/re/merchants/flute.txt +++ b/npc/re/merchants/flute.txt @@ -84,10 +84,10 @@ mes "Isn't it a beautiful day today?"; close; } -hu_in01,386,306,3 duplicate(fflute) Falcon Flute Trader#fft 51 -pay_arche,91,134,3 duplicate(fflute) Falcon Flute Trader#fft2 51 +hu_in01,386,306,3 duplicate(fflute) Falcon Flute Trader#fft 1_M_BARD +pay_arche,91,134,3 duplicate(fflute) Falcon Flute Trader#fft2 1_M_BARD -tur_dun01,89,170,5 script Expert Flute Crafter 59,{ +tur_dun01,89,170,5 script Expert Flute Crafter 1_M_ORIENT01,{ if (Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) { if (countitem(6124)) { mes "[Expert Flute Crafter]"; |