summaryrefslogtreecommitdiff
path: root/npc/events/easter_2010.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/events/easter_2010.txt')
-rw-r--r--npc/events/easter_2010.txt74
1 files changed, 38 insertions, 36 deletions
diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt
index 18979e744..154fb95c5 100644
--- a/npc/events/easter_2010.txt
+++ b/npc/events/easter_2010.txt
@@ -74,7 +74,7 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{
mes "and then needs to solve";
mes "several problems instead of me.";
next;
- if (select("Let's help ^800080Rina^000000.:Just skip it.") == 2) {
+ if (select("Let's help ^800080Rina^000000.", "Just skip it.") == 2) {
emotion e_sigh;
mes "[Rina]";
mes "To help me,";
@@ -95,7 +95,7 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{
mes " ";
mes "^787878( A mysterious atmosphere hangs in the air. )^000000";
next;
- specialeffect2 EF_COUPLECASTING;
+ specialeffect(EF_COUPLECASTING, AREA, playerattached());
next;
mes "[Rina]";
mes "Blah blah blah...";
@@ -104,7 +104,7 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{
mes " ";
mes "^787878( ... This is a strange spell. )^000000";
next;
- specialeffect2 EF_SIGNUM;
+ specialeffect(EF_SIGNUM, AREA, playerattached());
mes "[Rina]";
mes "Haaaaah~";
mes "^800080Oath-taking ceremony^000000 is done enough now.";
@@ -119,31 +119,7 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{
setquest 9117;
close;
} else if (.@quest1 == 1) {
- L_HuntingInfo:
- mes "[Rina]";
- mes "What you need to do is";
- mes "to choose one monster among";
- mes "^FF0000DEVIRUCHI,^000000 ^FF0000WRAITH DEAD,^000000";
- mes "^FF0000DULLAHAN,^000000 ^FF0000NIGHTMARE TERROR^000000";
- mes "and then kill ^0000FF50^000000 monsters";
- mes "and come back to me.";
- next;
- mes "[Rina]";
- mes "It must be a tough task,";
- mes "but you are the right person";
- mes "who did the oath-taking ceremony.";
- mes "I hope you succeed.";
- if (.@quest1 < 2) {
- completequest 9117;
- setquest 9118;
- setquest 9119;
- setquest 9120;
- setquest 9121;
- }
- close2;
- npcskill "AL_INCAGI",1,0,0;
- npcskill "AL_BLESSING",1,0,0;
- end;
+ callsub(L_HuntingInfo, .@quest1);
} else if (.@quest1 == 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) {
@@ -162,7 +138,7 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{
completequest 9121;
setquest 9122;
} else
- goto L_HuntingInfo;
+ callsub(L_HuntingInfo, .@quest1);
end;
}
}
@@ -184,7 +160,7 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{
mes "^787878- whether you can listen -^000000";
mes "^787878- to the music sound. -^000000";
next;
- if(select("[I'm ready to listen to the BGM.]:[I can't listen to the BGM.]") == 2) {
+ if(select("[I'm ready to listen to the BGM.]", "[I can't listen to the BGM.]") == 2) {
mes "[Rina]";
mes "I am so shocked that";
mes "you cannot feel the music.";
@@ -309,6 +285,32 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{
npcskill "AL_INCAGI",1,0,0;
npcskill "AL_BLESSING",1,0,0;
end;
+
+L_HuntingInfo:
+ mes "[Rina]";
+ mes "What you need to do is";
+ mes "to choose one monster among";
+ mes "^FF0000DEVIRUCHI,^000000 ^FF0000WRAITH DEAD,^000000";
+ mes "^FF0000DULLAHAN,^000000 ^FF0000NIGHTMARE TERROR^000000";
+ mes "and then kill ^0000FF50^000000 monsters";
+ mes "and come back to me.";
+ next;
+ mes "[Rina]";
+ mes "It must be a tough task,";
+ mes "but you are the right person";
+ mes "who did the oath-taking ceremony.";
+ mes "I hope you succeed.";
+ if (getarg(0) < 2) {
+ completequest 9117;
+ setquest 9118;
+ setquest 9119;
+ setquest 9120;
+ setquest 9121;
+ }
+ close2;
+ npcskill "AL_INCAGI",1,0,0;
+ npcskill "AL_BLESSING",1,0,0;
+ end;
}
geffen,207,114,4 script #Hiddne01Easter CLEAR_NPC,{
@@ -317,7 +319,7 @@ OnRelease:
specialeffect EF_PATTACK;
mes "- I found ^0000FFthe strange mark^000000. -";
next;
- specialeffect2 EF_HOLYHIT;
+ specialeffect(EF_HOLYHIT, AREA, playerattached());
mes "- I can definitely feel that";
mes "- ^0000FFRina^000000 has been released";
mes "- from the curse.";
@@ -366,7 +368,7 @@ prontera,204,297,3 script Rina's Little Friend 4_DRAGON_EGG,{
mes "I guess you're the trustworthy friend.";
mes "Are you here to make a deal with me?";
next;
- switch(select("Yes.:No.:What do you mean?")) {
+ switch(select("Yes.", "No.", "What do you mean?")) {
case 1:
if (ADVJOB == 0) {
if (BaseLevel < 70)
@@ -389,7 +391,7 @@ prontera,204,297,3 script Rina's Little Friend 4_DRAGON_EGG,{
mes "I will start it right now.";
mes "Are you ready for it?";
next;
- if(select("Yes, let's start it.:No, stop it.") == 2) {
+ if(select("Yes, let's start it.", "No, stop it.") == 2) {
mes "[Rina's Little Friend]";
mes "Heh. It's boring.";
close;
@@ -491,7 +493,7 @@ prontera,204,297,3 script Rina's Little Friend 4_DRAGON_EGG,{
mes "It may be end in failure";
mes "and it can be something like Pet Egg.";
next;
- if(select("Ask the cost.:Stop listening because it feels like a trick.") == 2) {
+ if(select("Ask the cost.", "Stop listening because it feels like a trick.") == 2) {
mes "[Rina's Little Friend]";
mes "Well... I don't really care.";
mes "Good bye.";
@@ -552,7 +554,7 @@ prontera,116,82,5 script Traveler#01Easter 4_M_03,{
mes "Hmm, I think I might";
mes "see you around here before.";
next;
- if(select("Listen some more.:Just ignore it.") == 2) {
+ if(select("Listen some more.", "Just ignore it.") == 2) {
mes "[Traveler]";
mes "As I expected,";
mes "you are a silent person. Ha ha.";
@@ -578,7 +580,7 @@ prontera,116,82,5 script Traveler#01Easter 4_M_03,{
mes "that new adventurer?";
mes "Or that is just your face look. Ha ha.";
next;
- if(select("I'm interested in it.:I don't care at all.") == 2) {
+ if(select("I'm interested in it.", "I don't care at all.") == 2) {
mes "[Traveler]";
mes "Ah~ I see~!";
mes "Then, Good bye.";