diff options
author | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
commit | bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch) | |
tree | 79f9aec5171e8aed2d701bf67167f260e05f41db /npc/re/merchants/flute.txt | |
parent | 239d480487e24294975f35ed55f210837ad1088e (diff) | |
parent | ce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff) | |
download | hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2 hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip |
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
Diffstat (limited to 'npc/re/merchants/flute.txt')
-rw-r--r-- | npc/re/merchants/flute.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt index 343308268..d2c9515b2 100644 --- a/npc/re/merchants/flute.txt +++ b/npc/re/merchants/flute.txt @@ -43,10 +43,10 @@ if (eaclass()&EAJL_THIRD) { mes "[Falcon Flute Trader]"; mes "For Rangers, however, I have a special price of 10,000 zeny!"; - set .@price,10000; + .@price = 10000; next; } else - set .@price,12500; + .@price = 12500; if(select("Don't buy one:Buy a Falcon Flute") == 1) { mes "[Falcon Flute Trader]"; mes "That's too bad. If you need one, come back!"; |