From 27ca3344ff39d80a9fc476f055694999a9ba0033 Mon Sep 17 00:00:00 2001
From: skyleo <leo-pflug@web.de>
Date: Mon, 8 Aug 2016 16:02:17 +0200
Subject: Fixed wrong requirements for Crazy Uproar Quest. Alchemists &
 Blacksmiths needed to be JLVL 15 or higher.

---
 npc/quests/skills/merchant_skills.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'npc')

diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index 8a187f70f..ee84bd837 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -36,7 +36,7 @@
 //================= Description ===========================================
 //= Quests for skills: Crazy Uproar, Change Cart, Cart Revolution
 //================= Current Version =======================================
-//= 1.8
+//= 1.9
 //=========================================================================
 
 alberta,83,96,5	script	Necko	4W_M_02,7,7,{
@@ -65,7 +65,7 @@ alberta,83,96,5	script	Necko	4W_M_02,7,7,{
 			mes "Ppyakikakikakakakakakakaka!!";
 			close;
 		}
-		else if (JobLevel < 15) {
+		else if (BaseJob == Job_Merchant && JobLevel < 15) {
 			mes "[Necko]";
 			mes "Oh, did you come because";
 			mes "you are infatuated with my voice?";
@@ -86,7 +86,7 @@ alberta,83,96,5	script	Necko	4W_M_02,7,7,{
 			mes "Kyukwakakakakakakakakakaka!";
 			close;
 		}
-		else if ((countitem(Scarlet_Jewel) > 6) && (countitem(Banana_Juice) > 0) && (countitem(Mushroom_Spore) > 49) && (JobLevel >= 15 || (BaseJob == Job_Blacksmith || BaseJob == Job_Alchemist))) {
+		else if ((countitem(Scarlet_Jewel) > 6) && (countitem(Banana_Juice) > 0) && (countitem(Mushroom_Spore) > 49)) {
 			mes "[Necko]";
 			mes "Oh! You!";
 			mes "You are qualified to learn how to shout!";
-- 
cgit v1.2.3-70-g09d2