summaryrefslogtreecommitdiff
path: root/npc/events
diff options
context:
space:
mode:
Diffstat (limited to 'npc/events')
-rw-r--r--npc/events/MemorialDay_2008.txt17
-rw-r--r--npc/events/easter_2010.txt54
-rw-r--r--npc/events/nguild/nguild_ev_agit.txt8
-rw-r--r--npc/events/nguild/nguild_kafras.txt13
-rw-r--r--npc/events/nguild/nguild_managers.txt56
-rw-r--r--npc/events/xmas.txt30
6 files changed, 86 insertions, 92 deletions
diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt
index 41ff5b610..b87bba5f2 100644
--- a/npc/events/MemorialDay_2008.txt
+++ b/npc/events/MemorialDay_2008.txt
@@ -211,12 +211,7 @@ prontera,153,286,4 script Memorial Plaque#Memorial 4_BOARD3,{
next;
Memorial08 = 9;
getexp 93750,43750;
- goto L_CleanPlaque;
- } else if (Memorial08 >= 9) {
- goto L_CleanPlaque;
}
-
-L_CleanPlaque:
mes "- You see a message from the cleaned plaque.-";
next;
mes "-Although no sculptured marble should rise to their memory,-";
@@ -285,9 +280,9 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{
mes "I can provide you all the materials.";
next;
if (select("I'll gather the rest.", "Give me the materials.") == 2) {
- goto L_GiveUp;
+ callsub L_GiveUp;
}
- goto L_Continue;
+ callsub L_Continue;
} else {
mes "[Grast]";
mes "Oh, you've brought the materials I asked.";
@@ -313,9 +308,9 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{
mes "If you feel too burdened to gather them all, I can provide you all the materials.";
next;
if (select("I'll gather the rest.", "Give me the materials.") == 2) {
- goto L_GiveUp;
+ callsub L_GiveUp;
}
- goto L_Continue;
+ callsub L_Continue;
} else {
mes "[Grast]";
mes "Oh, you've brought everything I asked.";
@@ -342,9 +337,9 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{
mes "It's your call, " + strcharinfo(PC_NAME) + ".";
next;
if (select("I'll gather the rest.", "Give me the materials.") == 2) {
- goto L_GiveUp;
+ callsub L_GiveUp;
}
- goto L_Continue;
+ callsub L_Continue;
} else {
mes "[Grast]";
mes "Have you brought the materials I asked?";
diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt
index 645e0cacf..0ccd987cf 100644
--- a/npc/events/easter_2010.txt
+++ b/npc/events/easter_2010.txt
@@ -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;
}
}
@@ -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,{
diff --git a/npc/events/nguild/nguild_ev_agit.txt b/npc/events/nguild/nguild_ev_agit.txt
index 99545bfff..9bb76f728 100644
--- a/npc/events/nguild/nguild_ev_agit.txt
+++ b/npc/events/nguild/nguild_ev_agit.txt
@@ -125,7 +125,7 @@ OnAgitStart:
end;
OnAgitBreak:
callfunc "F_AgitBreak","nguild_alde","N01";
- goto OnAgitEliminate;
+ callsub OnAgitEliminate;
end;
OnGuildBreak:
callfunc "F_GuildBreak","nguild_alde","N01";
@@ -152,7 +152,7 @@ OnAgitStart:
end;
OnAgitBreak:
callfunc "F_AgitBreak","nguild_gef","N02";
- goto OnAgitEliminate;
+ callsub OnAgitEliminate;
end;
OnGuildBreak:
callfunc "F_GuildBreak","nguild_gef","N02";
@@ -179,7 +179,7 @@ OnAgitStart:
end;
OnAgitBreak:
callfunc "F_AgitBreak","nguild_pay","N03";
- goto OnAgitEliminate;
+ callsub OnAgitEliminate;
end;
OnGuildBreak:
callfunc "F_GuildBreak","nguild_pay","N03";
@@ -206,7 +206,7 @@ OnAgitStart:
end;
OnAgitBreak:
callfunc "F_AgitBreak","nguild_prt","N04";
- goto OnAgitEliminate;
+ callsub OnAgitEliminate;
end;
OnGuildBreak:
callfunc "F_GuildBreak","nguild_prt","N04";
diff --git a/npc/events/nguild/nguild_kafras.txt b/npc/events/nguild/nguild_kafras.txt
index 8b448bbe3..96371ec91 100644
--- a/npc/events/nguild/nguild_kafras.txt
+++ b/npc/events/nguild/nguild_kafras.txt
@@ -39,13 +39,12 @@
function script F_GKafra {
cutin "kafra_01",2;
@GID = getcastledata(getarg(0),1);
- if (getcharid(CHAR_ID_GUILD) == @GID && getgdskilllv(@GID,10001)) goto L_StartG;
-
- mes "[Kafra Service]";
- mes "I am contracted to provide service only for the ^ff0000" + getguildname(@GID) + "^000000 Guild. Please use another Kafra Corporation staff member around here. I am Sorry for your inconvenience.";
- cutin "",255;
- close;
-L_StartG:
+ if (getcharid(CHAR_ID_GUILD) != @GID || getgdskilllv(@GID,10001) < 1) {
+ mes "[Kafra Service]";
+ mes "I am contracted to provide service only for the ^ff0000" + getguildname(@GID) + "^000000 Guild. Please use another Kafra Corporation staff member around here. I am Sorry for your inconvenience.";
+ cutin "",255;
+ close;
+ }
@wrpP[0] = 200;
@wrpD$[0] = getarg(1);
setarray @wrpC$[0], @wrpD$[0]+" ^880000"+@wrpP[0]+"^000000 z", "Cancel", "", "", "","";
diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt
index 1d9b56966..a24a0cb15 100644
--- a/npc/events/nguild/nguild_managers.txt
+++ b/npc/events/nguild/nguild_managers.txt
@@ -63,7 +63,34 @@ function script F_GldManager {
switch (select("Kafra Staff Employment / Dismissal","Enter Treasure Room","Cancel")) {
case 1: // Employment / Dismissal
mes "[ "+getarg(0)+" ]";
- if (getcastledata(getarg(1),9) == 1) goto L_Dismiss;
+ if (getcastledata(getarg(1),9) == 1) {
+ mes "Would you like to dismiss the current Kafra?";
+ next;
+ if (select("Dismissal","Cancel") != 1) {
+ mes "[ "+getarg(0)+" ]";
+ mes "Master, I think you should keep the current Kafra Staff because she is already trying her best to serve us";
+ return;
+ }
+ cutin "kafra_01",2;
+ mes "[ Kafra Staff ]";
+ mes "Have I done anything wrong? If I did, will you please forgive me?";
+ next;
+ if (select("Dismiss","Cancel") != 1) {
+ mes "[ Kafra Staff ]";
+ mes "Thank you master, I'll do my best! ^^.";
+ cutin "kafra_01",255;
+ return;
+ }
+ mes "[ Kafra Staff ]";
+ mes "It's unfortunate that I won't be able to serve your guild anymore....";
+ next;
+ disablenpc "Kafra Staff#"+getarg(4);
+ setcastledata getarg(1),9,0;
+ cutin "kafra_01",255;
+ mes "[ "+getarg(0)+" ]";
+ mes "The Kafra has been dismissed. But... we should really get a Kafra as soon as possible!";
+ return;
+ }
if (getgdskilllv(@GID,10001) == 0){
mes "Master, you don't have a contract with the Kafra Staff Company.";
mes "In order to hire a Kafra, you must first learn the Guild skill ^5533FFContract With Kafra^000000.";
@@ -97,33 +124,6 @@ function script F_GldManager {
//mes "Your employment contract lasts ^5533FF1 month^000000. After this term is over you will have to create a new contract.";
mes "I think the Kafra Staff will benefit our guild members.";
return;
- L_Dismiss:
- mes "Would you like to dismiss the current Kafra?";
- next;
- if (select("Dismissal","Cancel") != 1) {
- mes "[ "+getarg(0)+" ]";
- mes "Master, I think you should keep the current Kafra Staff because she is already trying her best to serve us";
- return;
- }
- cutin "kafra_01",2;
- mes "[ Kafra Staff ]";
- mes "Have I done anything wrong? If I did, will you please forgive me?";
- next;
- if (select("Dismiss","Cancel") != 1) {
- mes "[ Kafra Staff ]";
- mes "Thank you master, I'll do my best! ^^.";
- cutin "kafra_01",255;
- return;
- }
- mes "[ Kafra Staff ]";
- mes "It's unfortunate that I won't be able to serve your guild anymore....";
- next;
- disablenpc "Kafra Staff#"+getarg(4);
- setcastledata getarg(1),9,0;
- cutin "kafra_01",255;
- mes "[ "+getarg(0)+" ]";
- mes "The Kafra has been dismissed. But... we should really get a Kafra as soon as possible!";
- return;
case 2: // Enter Treasure Room
mes "[ "+getarg(0)+" ]";
mes "Would you to go to our Treasure Room? Only you, the Guild Master, are allowed to enter this room.";
diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt
index a6308b867..7419bc4bc 100644
--- a/npc/events/xmas.txt
+++ b/npc/events/xmas.txt
@@ -44,15 +44,14 @@
xmas_in,100,96,4 script Santa Claus::Santa2 4_M_SANTA,{
mes "[Santa Claus]";
if(xmas_npc==0) xmas_npc = 1; // For Lutie & Bard quest
- if(#event_xmas > 0 && #event_xmas < 30 ) goto L_Start;
- mes "Merry Christmas!";
- if(Class==0 || #event_xmas>=30 ) close; //anti exploit protection
- mes "I have a gift for you! Ho Ho Ho!";
- getitem rand(664,667),1; //gives one of 4 gift boxes
- ++#event_xmas;
- close;
-
-L_Start:
+ if(#event_xmas <= 0 || #event_xmas >= 30 ) {
+ mes "Merry Christmas!";
+ if(Class==0 || #event_xmas>=30 ) close; //anti exploit protection
+ mes "I have a gift for you! Ho Ho Ho!";
+ getitem rand(664,667),1; //gives one of 4 gift boxes
+ ++#event_xmas;
+ close;
+ }
mes "I'm having a bit of a problem...";
mes "Do you care to listen?";
next;
@@ -98,7 +97,12 @@ L_Start:
close;
case 2: // Give proof
mes "[Santa Claus]";
- if(countitem(Red_Socks_With_Holes) < 3) goto L_NotEnuf;
+ if(countitem(Red_Socks_With_Holes) < 3) {
+ mes "You don't have enough socks as proof.";
+ mes "Go take down those evil Santas";
+ mes "and get more for me and I'll reward you.";
+ close;
+ }
delitem 7034,3;
mes "Seems you've been doing a";
mes "good job of taking down those";
@@ -111,12 +115,6 @@ L_Start:
mes "If you get 3 more, I'll give you another.";
mes "Hope you get a good item.";
close;
-
- L_NotEnuf:
- mes "You don't have enough socks as proof.";
- mes "Go take down those evil Santas";
- mes "and get more for me and I'll reward you.";
- close;
default: // Cancel
mes "[Santa Claus]";
mes "I see. Well, at the very least";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-19 23:53:26 +0000