From 7e0ffd54d0b3ba78d67d5ca09360ec3bcb47f3bb Mon Sep 17 00:00:00 2001 From: Playtester Date: Sun, 16 Apr 2006 12:20:40 +0000 Subject: 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 --- npc/merchants/grandpa_pharmacist.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'npc/merchants') 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; -- cgit v1.2.3-60-g2f50