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/merchants/old_pharmacist.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/merchants/old_pharmacist.txt')
| -rw-r--r-- | npc/merchants/old_pharmacist.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt index d74b3287d..1889ea3b9 100644 --- a/npc/merchants/old_pharmacist.txt +++ b/npc/merchants/old_pharmacist.txt @@ -56,13 +56,13 @@ alberta_in,16,28,4 script Pharmacist 1_M_PUBMASTER,{ next; mes "[Old Pharmacist]"; if (countitem(507) < countitem(713)) { - set .@max,countitem(507); + .@max = countitem(507); } else if (countitem(508) < countitem(713)) { - set .@max,countitem(508); + .@max = countitem(508); } else { - set .@max,countitem(713); + .@max = countitem(713); } if ((countitem(507) < 1) || (countitem(508) < 1) || (countitem(713) == 0)) { mes "You rascal! What did you expect?! Coming here with nothing. Tsk!"; @@ -186,9 +186,9 @@ L_Making: next; mes "[Old Pharmacist]"; if ((countitem(getarg(0))/2) < countitem(713)) { - set .@max,countitem(getarg(0))/2; + .@max = countitem(getarg(0))/2; } else { - set .@max,countitem(713); + .@max = countitem(713); } if ((countitem(getarg(0)) < 2) || (countitem(713) == 0)) { mes "You rascal! What did you expect?! Coming here with nothing. Tsk!"; |