diff options
| author | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-16 12:20:40 +0000 |
|---|---|---|
| committer | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-16 12:20:40 +0000 |
| commit | 7e0ffd54d0b3ba78d67d5ca09360ec3bcb47f3bb (patch) | |
| tree | 85e2e03ee50b7479ef10b87b622242d1825e3197 /npc | |
| parent | b7c32095864ed8ac2547507ccbe0f5eacf11664a (diff) | |
| download | hercules-7e0ffd54d0b3ba78d67d5ca09360ec3bcb47f3bb.tar.gz hercules-7e0ffd54d0b3ba78d67d5ca09360ec3bcb47f3bb.tar.bz2 hercules-7e0ffd54d0b3ba78d67d5ca09360ec3bcb47f3bb.tar.xz hercules-7e0ffd54d0b3ba78d67d5ca09360ec3bcb47f3bb.zip | |
Final fix to npc/merchants/grandpa_pharmacist.txt
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6107 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/merchants/grandpa_pharmacist.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/merchants/grandpa_pharmacist.txt b/npc/merchants/grandpa_pharmacist.txt index bf80d131f..67ff9e02a 100644 --- a/npc/merchants/grandpa_pharmacist.txt +++ b/npc/merchants/grandpa_pharmacist.txt @@ -102,7 +102,7 @@ sF_Make: set @herbnum, 2;
if(getarg(1) != 0) set @herbnum, 1;
if(countitem(getarg(0)) < @herbnum) goto L_NdHerbs;
- if((getarg(1) != 0) && (countitem(getarg(1)) < @herbnum)) goto L_NdHerbs;
+ if(getarg(1) != 0) if(countitem(getarg(1)) < @herbnum) goto L_NdHerbs;
if(countitem(713) < 1) goto L_NdBottle;
if(Zeny < getarg(2)) goto L_NdZeny;
@@ -115,7 +115,7 @@ sF_Make: set @amount, 1000;
if(zeny/getarg(2) < @amount) set @amount, zeny/getarg(2);
if(countitem(getarg(0))/@herbnum < @amount) set @amount, countitem(getarg(0))/@herbnum;
- if((countitem(getarg(1))/@herbnum < @amount) && (countitem(getarg(1)) != 0)) set @amount, countitem(getarg(1))/@herbnum;
+ if(getarg(1) != 0) if (countitem(getarg(1))/@herbnum < @amount) set @amount, countitem(getarg(1))/@herbnum;
if(countitem(713) < @amount) set @amount, countitem(713);
if(@amount > 0) goto L_End;
mes "[Grampa Pharmacist]";
@@ -126,7 +126,7 @@ sF_Make: input @amount;
if(@amount<1 || @amount>1000) goto L_BadAmnt;
if(countitem(getarg(0))/@herbnum < @amount) goto L_NdHerbs;
- if((countitem(getarg(1))/@herbnum < @amount) && (countitem(getarg(1)) != 0)) goto L_NdHerbs;
+ if(getarg(1) != 0) if (countitem(getarg(1))/@herbnum < @amount) goto L_NdHerbs;
if(countitem(713) < @amount) goto L_NdBottle;
if(Zeny < (getarg(2)*@amount)) goto L_NdZeny;
|