summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/quests_louyang.txt1
-rw-r--r--npc/quests/skills/merchant_skills.txt6
2 files changed, 4 insertions, 3 deletions
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index 21e56ee25..fad528368 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -1429,6 +1429,7 @@ lou_in02,265,69,5 script Doctor#lyang 4_F_CHNDOCTOR,{
mes "^3355FF10 Sprout^000000 and";
mes "^3355FF5 Honey Pot^000000.";
ch_par = 17;
+ changequest 11056,11057;
close;
}
else if (ch_par == 17) {
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!";