From a729ad911231464e843883b14b765eb7a3185f55 Mon Sep 17 00:00:00 2001 From: jmanfffreak Date: Wed, 28 Dec 2011 16:41:45 +0000 Subject: Fixed issue in niflheim quest where the script set a variable not related to the quest at all (bugreport:4104). Added check in Knight job change test to prevent repeating the quest (bugreport:4099). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15292 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/cities/niflheim.txt | 2 +- npc/jobs/2-1/knight.txt | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt index fff3fb007..4df2ddba0 100644 --- a/npc/cities/niflheim.txt +++ b/npc/cities/niflheim.txt @@ -245,7 +245,7 @@ niflheim,350,258,1 script Cursed Spirit#nif 802,{ switch(rand(1,5)) { case 1: if (morison_meat < 15) { - set MISC_QUEST,MISC_QUEST | 1; + set morrison_meat,15; mes "[Ashe Bruce]"; mes "You... You broke the curse!"; mes "How did you know that spell?!"; diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index d8b33b285..9d4dca8ff 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -1223,14 +1223,18 @@ prt_in,79,94,4 script Sir Windsor#knt 733,{ mes ".....What?"; next; } - else + else { set .@mes$,"I want to try again!:..."; + next; + } if (select(.@mes$) == 1) { mes "[Sir Windsor]"; mes "..."; next; set KNIGHT_Q,7; - changequest 9004,9005; + if (checkquest(9004) != -1) { + changequest 9004,9005; + } mes "[Sir Windsor]"; mes "..."; mes "......"; -- cgit v1.2.3-70-g09d2