summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/merchants/grandpa_pharmacist.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 13cf20e7f..eedc6c746 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -28,6 +28,7 @@ Nexon
Date Added
======
04/16
+ * Fixed merchants/grandpa_pharmacist.txt thanks to KarLaeda [Playtester]
* Removed Cube room warps from the quest script [Lupus]
04/15
* Fixed Mobster's OnDead event [Playtester]
diff --git a/npc/merchants/grandpa_pharmacist.txt b/npc/merchants/grandpa_pharmacist.txt
index 666eefd84..bf80d131f 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((countitem(getarg(1)) < @herbnum) && (getarg(1) != 0)) goto L_NdHerbs;
+ if((getarg(1) != 0) && (countitem(getarg(1)) < @herbnum)) goto L_NdHerbs;
if(countitem(713) < 1) goto L_NdBottle;
if(Zeny < getarg(2)) goto L_NdZeny;