summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSirius <zopokx@gmail.com>2013-05-28 02:34:56 -0700
committerSirius <zopokx@gmail.com>2013-05-28 02:34:56 -0700
commitf7fa80ee689635a01c3c137f7a0611b210cc8ae0 (patch)
tree1190555209c80c650a218a88fe97128d9bcf93c1
parent810f6e7c0ae4e4353eeeefb5c6d670ecd0ca27cd (diff)
downloadhercules-f7fa80ee689635a01c3c137f7a0611b210cc8ae0.tar.gz
hercules-f7fa80ee689635a01c3c137f7a0611b210cc8ae0.tar.bz2
hercules-f7fa80ee689635a01c3c137f7a0611b210cc8ae0.tar.xz
hercules-f7fa80ee689635a01c3c137f7a0611b210cc8ae0.zip
Fixed console error using Euphy's reference.
-rw-r--r--npc/re/quests/eden/56-70.txt80
1 files changed, 47 insertions, 33 deletions
diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt
index 12beeae26..c503a274b 100644
--- a/npc/re/quests/eden/56-70.txt
+++ b/npc/re/quests/eden/56-70.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 2.0
+//= 2.1
//===== Description: =========================================
//= Repetable Quests for Players between Baselevel 56 - 70.
//===== Additional Comments: =================================
@@ -13,6 +13,7 @@
//= 1.3 Fixed Puppet Master's Agony Quest (12217 -> 3259). [Joseph]
//= 1.4 Fixed invalid check (Magic Wand Quest). [Joseph]
//= 2.0 Optimised [Zopokx]
+//= 2.1 Fixed some errors using Euphy's reference [Zopokx]
//============================================================
moc_para01,42,38,3 script Mission [56 - 70] 857,{
@@ -70,33 +71,44 @@ L_Quest:
next;
mes "This mission doesn't have time limits.";
}
+ close;
}
- else if ((checkquest(getarg(0)) == 1) && (countitem(getarg(3)) < getarg(4)) && (countitem(getarg(5,0)) < getarg(6,1))){
- mes "You have an on-going mission. Would you like to check the details?";
- next;
- if(select("Check the details.:Cancel.") == 2) { close; }
- callsub L_CheckDetails, getarg(0);
- }
- else if ((checkquest(getarg(0)) == 1) && (countitem(getarg(3)) >= getarg(4)) && (countitem(getarg(5,0)) >= getarg(6,0))){
- mes "I have done pretty well for the mission. Should I report it now?";
- next;
- if(select("Report the mission.:Do not report it yet.") == 2) { close; }
- delitem getarg(3),getarg(4);
- if (getarg(5,0) > 0) { delitem getarg(5),getarg(6); }
- getexp getarg(1),getarg(2);
- erasequest getarg(0);
- mes "You have completed the mission. Get rewards.";
+ if (checkquest(getarg(0)) == 1) {
+ if (getargcount() > 5) {
+ if ((countitem(getarg(3)) >= getarg(4)) && (countitem(getarg(5)) >= getarg(6))) { set .@complete, 1; }
+ else { set .@complete, 0; }
+ } else {
+ if (countitem(getarg(3)) >= getarg(4)) { set .@complete, 1; }
+ else { set .@complete, 0; }
+ }
+ if (.@complete) {
+ mes "I have done pretty well for the mission. Should I report it now?";
+ next;
+ if(select("Report the mission.:Do not report it yet.") == 2) { close; }
+ delitem getarg(3),getarg(4);
+ if (getarg(5,0) > 0) { delitem getarg(5),getarg(6); }
+ getexp getarg(1),getarg(2);
+ erasequest getarg(0);
+ mes "You have completed the mission. Get rewards.";
+ } else {
+ mes "You have an on-going mission. Would you like to check the details?";
+ next;
+ if(select("Check the details.:Cancel.") == 1)
+ callsub L_CheckDetails, getarg(0);
+ }
}
close;
+ end;
L_HuntingQuest:
if (checkquest(getarg(0)) <= 0) {
callsub L_CheckDetails, getarg(0);
+ next;
mes " ";
next;
mes "Would you like to accept this mission?";
next;
- if(select("Accept the mission.:Do not accept the mission.") == 2) {
+ if(select("Accept the mission.:Do not accept the mission.") == 1) {
if ((BaseLevel < 56) || (BaseLevel > 70)) {
mes "These missions are not fit for my level. I should look for other missions.";
close;
@@ -110,26 +122,29 @@ L_HuntingQuest:
else if (checkquest(getarg(0),HUNTING) == 1) {
mes "You have an on-going mission. Would you like to check the details?";
next;
- if(select("Check the details.:Cancel.") == 2) { close; }
- callsub L_CheckDetails, getarg(0);
+ if(select("Check the details.:Cancel.") == 1)
+ callsub L_CheckDetails, getarg(0);
}
else if (checkquest(getarg(0),HUNTING) == 2) {
- if (getarg(3,0)){
- if (countitem(getarg(3)) < getarg(4)) {
- mes "I don't have enough "+getitemname(getarg(3))+".";
- mes "I need to gather "+getarg(4)+" "+getitemname(getarg(3))+" to complete this mission.";
- close;
- }
+ if (getargcount() > 3) {
+ if (countitem(getarg(3)) >= getarg(4)) { set .@complete, 1; }
+ else { set .@complete, 0; }
+ } else { set .@complete, 1; }
+ if (.@complete) {
+ mes "I have done pretty well for the mission. Should I report it now?";
+ next;
+ if(select("Report the mission.:Do not report it yet.") == 2) { close; }
+ if (getarg(3,0) > 0) { delitem getarg(3),getarg(4); }
+ getexp getarg(1),getarg(2);
+ erasequest getarg(0);
+ mes "You have completed the mission. Get rewards.";
+ } else {
+ mes "I don't have enough "+getitemname(getarg(3))+".";
+ mes "I need to gather "+getarg(4)+" "+getitemname(getarg(3))+" to complete this mission.";
}
- mes "I have done pretty well for the mission. Should I report it now?";
- next;
- if(select("Report the mission.:Do not report it yet.") == 2) { close; }
- if (getarg(3,0) > 0) { delitem getarg(3),getarg(4); }
- getexp getarg(1),getarg(2);
- erasequest getarg(0);
- mes "You have completed the mission. Get rewards.";
}
close;
+ end;
L_CheckDetails:
switch(getarg(0)){
@@ -347,6 +362,5 @@ L_CheckDetails:
mes "-- Payon blacksmith Antonio --";
break;
}
- next;
return;
}