summaryrefslogtreecommitdiff
path: root/npc/events/easter_2010.txt
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-10-20 04:20:29 +0200
committerHaru <haru@dotalux.com>2014-10-28 00:27:54 +0100
commit32169c383f2658192b6b8cb02d7f818a361dda03 (patch)
treeff1f1d902920d922b74eb879070e8c9973daa0dd /npc/events/easter_2010.txt
parent3e395756f10befe9aa0707169d8af7897706eb93 (diff)
downloadhercules-32169c383f2658192b6b8cb02d7f818a361dda03.tar.gz
hercules-32169c383f2658192b6b8cb02d7f818a361dda03.tar.bz2
hercules-32169c383f2658192b6b8cb02d7f818a361dda03.tar.xz
hercules-32169c383f2658192b6b8cb02d7f818a361dda03.zip
Removed use of 'checkquest' from scripts (common folder)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/events/easter_2010.txt')
-rw-r--r--npc/events/easter_2010.txt160
1 files changed, 78 insertions, 82 deletions
diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt
index 292b91948..8276e0774 100644
--- a/npc/events/easter_2010.txt
+++ b/npc/events/easter_2010.txt
@@ -36,8 +36,8 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{
mes "Take care~!";
close;
}
- set .@quest1, checkquest(9117);
- if (.@quest1 == -1) {
+ .@quest1 = questprogress(9117);
+ if (!.@quest1) {
playbgm "30.mp3"; // One Step Closer
mes "[Rina]";
mes "Hi~!";
@@ -96,7 +96,7 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{
mes "Let me know when you are ready.";
setquest 9117;
close;
- } else if (.@quest1 == 0 || .@quest1 == 1) {
+ } else if (.@quest1 == 1) {
L_HuntingInfo:
mes "[Rina]";
mes "What you need to do is";
@@ -123,8 +123,8 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{
npcskill "AL_BLESSING",1,0,0;
end;
} else if (.@quest1 == 2) {
- if (checkquest(9118) < 2 || checkquest(9119) < 2 || checkquest(9120) < 2 || checkquest(9121) < 2) {
- if (checkquest(9118,HUNTING) == 2 || checkquest(9119,HUNTING) == 2 || checkquest(9120,HUNTING) == 2 || checkquest(9121,HUNTING) == 2) {
+ if (questprogress(9118) != 2 || questprogress(9119) != 2 || questprogress(9120) != 2 || questprogress(9121) != 2) {
+ if (questprogress(9118,HUNTING) == 2 || questprogress(9119,HUNTING) == 2 || questprogress(9120,HUNTING) == 2 || questprogress(9121,HUNTING) == 2) {
mes "[Rina]";
mes "You did it.";
mes "I can feel that my body is recovering.";
@@ -144,8 +144,7 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{
end;
}
}
- set .@quest2, checkquest(9122);
- if (.@quest2 == 0 || .@quest2 == 1) {
+ if (questprogress(9122) == 1) {
mes "[Rina]";
mes "I will check one thing.";
mes "For this task,";
@@ -215,87 +214,84 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{
close2;
emotion e_sigh;
end;
- } else {
- set .@quest3, checkquest(9123);
- if (.@quest3 == 0 || .@quest3 == 1) {
- emotion e_kis;
+ }
+ if (questprogress(9123) == 1) {
+ emotion e_kis;
+ mes "[Rina]";
+ mes "You're back~!";
+ mes "My curse has been released.";
+ mes "Thank you so much.";
+ next;
+ if (checkweight(5852,1) == 0) {
mes "[Rina]";
- mes "You're back~!";
- mes "My curse has been released.";
- mes "Thank you so much.";
- next;
- if (checkweight(5852,1) == 0) {
- mes "[Rina]";
- mes "Your bag is too full.";
- mes "I have a present for you";
- mes "so make your bag lighter.";
- mes "I'll wait for you.";
- close;
- }
- completequest 9123;
- getitem 5852,1; //Easter_Egg_Shell
- set .@BaseExp, (BaseLevel * (BaseLevel / 4)) * ((BaseLevel / 29) + (BaseLevel / 6)) + (5 * BaseLevel / 2);
- if (ADVJOB == 0) {
- if (BaseLevel < 40) set .@nBaseExp, .@BaseExp;
- else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel);
- else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 20));
- else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10));
- else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5));
- else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3));
- else if (BaseLevel < 99) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2));
- else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2) * 2);
-
- set .@nJobExp, (JobLevel * (JobLevel - 3) * (JobLevel / 25 + 1) + (16 - (JobLevel * 2))) * 2;
- } else {
- if (BaseLevel < 30) set .@nBaseExp, .@BaseExp;
- else if (BaseLevel < 40) set .@nBaseExp, .@BaseExp + (BaseLevel * 10);
- else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * 2);
- else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10));
- else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5));
- else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3));
- else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2));
- else if (BaseLevel < 98) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel);
- else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel * 2);
+ mes "Your bag is too full.";
+ mes "I have a present for you";
+ mes "so make your bag lighter.";
+ mes "I'll wait for you.";
+ close;
+ }
+ completequest 9123;
+ getitem 5852,1; //Easter_Egg_Shell
+ .@BaseExp = (BaseLevel * (BaseLevel / 4)) * ((BaseLevel / 29) + (BaseLevel / 6)) + (5 * BaseLevel / 2);
+ if (ADVJOB == 0) {
+ if (BaseLevel < 40) set .@nBaseExp, .@BaseExp;
+ else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel);
+ else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 20));
+ else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10));
+ else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5));
+ else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3));
+ else if (BaseLevel < 99) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2));
+ else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2) * 2);
- set .@nJobExp, (JobLevel * JobLevel * (JobLevel / 5 + 2) + (20 - JobLevel)) * 3;
- }
- getexp .@nBaseExp,.@nJobExp;
- mes "[Rina]";
- mes "This is the present for you.";
- mes "It's not a big one";
- mes "but please take it";
- mes "as a token of my gratitude.";
- next;
- mes "[Rina]";
- mes "I'll take a rest for a few days";
- mes "and then I'll go on an adventure.";
- mes "See you again.";
- close2;
- consumeitem 607; //Yggdrasilberry
- consumeitem 12068; //Luk_Dish03
- consumeitem 12063; //Dex_Dish03
- consumeitem 12053; //Vit_Dish03
- npcskill "AL_INCAGI",1,0,0;
- npcskill "AL_BLESSING",1,0,0;
- end;
+ set .@nJobExp, (JobLevel * (JobLevel - 3) * (JobLevel / 25 + 1) + (16 - (JobLevel * 2))) * 2;
} else {
- mes "[Rina]";
- mes "Thank you for releasing my curse.";
- mes "I'll take a rest for a few days";
- mes "and then go on an adventure again.";
- mes "Have a happy day~!";
- close2;
- consumeitem 607; //Yggdrasilberry
- npcskill "AL_INCAGI",1,0,0;
- npcskill "AL_BLESSING",1,0,0;
- end;
+ if (BaseLevel < 30) set .@nBaseExp, .@BaseExp;
+ else if (BaseLevel < 40) set .@nBaseExp, .@BaseExp + (BaseLevel * 10);
+ else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * 2);
+ else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10));
+ else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5));
+ else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3));
+ else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2));
+ else if (BaseLevel < 98) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel);
+ else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel * 2);
+
+ set .@nJobExp, (JobLevel * JobLevel * (JobLevel / 5 + 2) + (20 - JobLevel)) * 3;
}
+ getexp .@nBaseExp,.@nJobExp;
+ mes "[Rina]";
+ mes "This is the present for you.";
+ mes "It's not a big one";
+ mes "but please take it";
+ mes "as a token of my gratitude.";
+ next;
+ mes "[Rina]";
+ mes "I'll take a rest for a few days";
+ mes "and then I'll go on an adventure.";
+ mes "See you again.";
+ close2;
+ consumeitem 607; //Yggdrasilberry
+ consumeitem 12068; //Luk_Dish03
+ consumeitem 12063; //Dex_Dish03
+ consumeitem 12053; //Vit_Dish03
+ npcskill "AL_INCAGI",1,0,0;
+ npcskill "AL_BLESSING",1,0,0;
+ end;
}
+ mes "[Rina]";
+ mes "Thank you for releasing my curse.";
+ mes "I'll take a rest for a few days";
+ mes "and then go on an adventure again.";
+ mes "Have a happy day~!";
+ close2;
+ consumeitem 607; //Yggdrasilberry
+ npcskill "AL_INCAGI",1,0,0;
+ npcskill "AL_BLESSING",1,0,0;
+ end;
}
geffen,207,114,4 script #Hiddne01Easter CLEAR_NPC,{
if (oversea_event2 > 519) {
- OnRelease:
+OnRelease:
specialeffect EF_PATTACK;
mes "- I found ^0000FFthe strange mark^000000. -";
next;
@@ -304,7 +300,7 @@ geffen,207,114,4 script #Hiddne01Easter CLEAR_NPC,{
mes "- ^0000FFRina^000000 has been released";
mes "- from the curse.";
mes "- ^006400Let's go back to Rina!^000000";
- if (checkquest(9122) < 2) {
+ if (questprogress(9122) != 2) {
completequest 9122;
setquest 9123;
}
@@ -333,7 +329,7 @@ rachel,36,132,4 script #Hiddne04Easter CLEAR_NPC,{
prontera,204,297,3 script Rina's Little Friend 4_DRAGON_EGG,{
disable_items;
- if (checkquest(9117) == -1) {
+ if (!questprogress(9117)) {
emotion e_swt2;
mes "[Rina's Little Friend]";
mes ".......";
@@ -341,7 +337,7 @@ prontera,204,297,3 script Rina's Little Friend 4_DRAGON_EGG,{
mes "^787878( No response. )^000000";
close;
}
- if (checkquest(9123) == 2) {
+ if (questprogress(9123) == 2) {
emotion e_meh;
mes "[Rina's Little Friend]";
mes "Hi.";