summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorjmanfffreak <jmanfffreak@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-28 16:41:45 +0000
committerjmanfffreak <jmanfffreak@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-28 16:41:45 +0000
commita729ad911231464e843883b14b765eb7a3185f55 (patch)
tree124d58f6028df448237b9271919c942653b01389 /npc
parentc14f77fca09ba5adbead00201b6660ae4cc88cb0 (diff)
downloadhercules-a729ad911231464e843883b14b765eb7a3185f55.tar.gz
hercules-a729ad911231464e843883b14b765eb7a3185f55.tar.bz2
hercules-a729ad911231464e843883b14b765eb7a3185f55.tar.xz
hercules-a729ad911231464e843883b14b765eb7a3185f55.zip
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
Diffstat (limited to 'npc')
-rw-r--r--npc/cities/niflheim.txt2
-rw-r--r--npc/jobs/2-1/knight.txt8
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 "......";