* Various fixes to NPCs, from bugreports.

- Fixed condition error in old pharmacist. (bugreport:597)
- Fixed missing function in novice WoE (bugreport:1728)
- Fixed a minor errors in dancer quest (bugreport:1766)
- Corrected duration of wedding status (bugreport:1775)
- Fixed missing function in novice WoE (bugreport:1788)


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12925 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 5 insertions, 3 deletions

diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index 530eed128..27d23b865 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= DZeroX
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena SVN Trunk
 //===== Description: =========================================
@@ -21,6 +21,7 @@
 //= 1.1a Removed .GATs [Lupus]
 //= 1.1b Fixed a bug in Orange Potion creating. Copy&Pasting = bad. [L0ne_W0lf]
 //= 1.2 Added checkweight, and input min/max values. [L0ne_W0lf]
+//= 1.3 Fixed minor condition check bug. (bugreport:597) [L0ne_W0lf]
 //============================================================
 
 alberta_in,16,28,4	script	Old Pharmacist	61,{
@@ -59,9 +60,10 @@ alberta_in,16,28,4	script	Old Pharmacist	61,{
 						if (countitem(507) < countitem(713)) {
 							set .@max,countitem(507);
 						}
-						if (countitem(508) < countitem(713)) {
+						else if (countitem(508) < countitem(713)) {
 							set .@max,countitem(508);
-						} else {
+						}
+						else {
 							set .@max,countitem(713);
 						}
 						if ((countitem(507) < 1) || (countitem(508) < 1) || (countitem(713) == 0)) {