summaryrefslogtreecommitdiff
path: root/npc/instances
diff options
context:
space:
mode:
Diffstat (limited to 'npc/instances')
-rw-r--r--npc/instances/EndlessTower.txt10
-rw-r--r--npc/instances/NydhoggsNest.txt14
-rw-r--r--npc/instances/OrcsMemory.txt8
-rw-r--r--npc/instances/SealedShrine.txt42
4 files changed, 37 insertions, 37 deletions
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index 2da7c8719..8da1d93c7 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -213,14 +213,14 @@ e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{
set .@p_name$,getpartyname(.@party_id);
set .@md_name$,"Endless Tower";
- set .@etower_timer,checkquest(60200,PLAYTIME); // 1 week
- set .@etower_timer2,checkquest(60201,PLAYTIME); // 4 hours
+ .@etower_timer = questprogress(60200,PLAYTIME); // 1 week
+ .@etower_timer2 = questprogress(60201,PLAYTIME); // 4 hours
if (!instance_check_party(.@party_id,2)) {
mes "Make or join a party with more than 1 member and try again.";
close;
}
- if (.@etower_timer == -1) {
+ if (!.@etower_timer) {
if (getcharid(0) == getpartyleader(.@party_id,2)) {
mes "Confirmed the party has been made. Would you like to reserve entrance to the Endless Tower?";
next;
@@ -267,7 +267,7 @@ e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{
case 3:
end;
}
- } else if ((.@etower_timer >= 0) && (.@etower_timer2 < 2)) {
+ } else if (.@etower_timer == 1) {
mes "If you have the dungeon generated already, you can enter it. ";
next;
switch(select("Enter the "+.@md_name$+":Return to Alberta:Cancel")) {
@@ -282,7 +282,7 @@ e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{
break;
}
close;
- } else if ((.@etower_timer >= 0) && (.@etower_timer < 2) && (.@etower_timer2 == 2)) {
+ } else if (.@etower_timer == 1 && .@etower_timer2 == 2) {
set .@dun_lim_time,etower_timer+604800; // 1 week
set .@dun_lim_time2,etower_timer+14400; // 4 hours
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index 9ccdade10..ada2bde55 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -92,12 +92,12 @@ nyd_dun02,100,201,3 script Yggdrasil Gatekeeper HIDDEN_NPC,8,8,{
set .@party_id,getcharid(1);
set .@md_name$,"Nidhoggur's Nest";
- set .@ins_nyd_check,checkquest(3135,PLAYTIME); // 3 Day cooldown
- set .@ins_nyd_check2,checkquest(3136,PLAYTIME); // 4 Hour play limit
+ .@ins_nyd_check = questprogress(3135,PLAYTIME); // 3 Day cooldown
+ .@ins_nyd_check2 = questprogress(3136,PLAYTIME); // 4 Hour play limit
mes "As I put my hands on the stone gate, a voice sounded from the depth of my heart.";
next;
- if (.@ins_nyd_check == -1 && .@ins_nyd_check2 == -1) {
+ if (!.@ins_nyd_check && !.@ins_nyd_check2) {
if (!instance_check_party(.@party_id,2,70)) {
mes "[Yggdrasil Gatekeeper]";
mes "Where are the other servants, so you can work together? Each servant cannot be admitted here individually...";
@@ -150,7 +150,7 @@ nyd_dun02,100,201,3 script Yggdrasil Gatekeeper HIDDEN_NPC,8,8,{
close;
goto L_Enter;
} else {
- if (.@ins_nyd_check == 0 || .@ins_nyd_check == 1) {
+ if (.@ins_nyd_check == 1) {
if ('ins_nyd2 == 3 || 'ins_nyd2 == 4) {
mes "[Yggdrasil Gatekeeper]";
mes "With the defeat of Nidhoggur's Shadow, the roots of the World Tree Yggdrasil are also affected.";
@@ -166,7 +166,7 @@ nyd_dun02,100,201,3 script Yggdrasil Gatekeeper HIDDEN_NPC,8,8,{
close;
goto L_Enter;
} else if (.@ins_nyd_check == 2) {
- if (.@ins_nyd_check2 == 0 || .@ins_nyd_check2 == 1) {
+ if (.@ins_nyd_check2 == 1) {
mes "[Yggdrasil Gatekeeper]";
mes "The time limit to enter the dungeon has expired. You must wait for the World Tree to stabilize its power before trying to re-enter.";
close;
@@ -210,8 +210,8 @@ L_Enter:
close;
} else {
mapannounce "nyd_dun02", getpartyname(getcharid(1))+"'s party member "+strcharinfo(0)+" has entered Nidhoggur's Nest.",bc_map,"0x00ff99";
- if (checkquest(3135) == -1) setquest 3135;
- if (checkquest(3136) == -1) setquest 3136;
+ if (!questprogress(3135)) setquest 3135;
+ if (!questprogress(3136)) setquest 3136;
warp "1@nyd",32,37;
close;
}
diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index 55f88f99d..4ed546b1e 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -51,8 +51,8 @@ gef_fild10,242,202,0 script Dimensional Gorge Piece 2_MONEMUS,{
close;
}
- set .@orctime,checkquest(12059,PLAYTIME);
- if (.@orctime == -1) {
+ .@orctime = questprogress(12059,PLAYTIME);
+ if (!.@orctime) {
if (getcharid(0) == getpartyleader(.@party_id,2)) {
mes "Party status confirmed. Would you like to book entrance to the "+.@md_name$+"?";
next;
@@ -87,7 +87,7 @@ gef_fild10,242,202,0 script Dimensional Gorge Piece 2_MONEMUS,{
if(select(.@md_name$ + " Enter the Memorial Dungeon:Cancel") == 2)
end;
callsub L_Enter,1;
- } else if (.@orctime == 0 || .@orctime == 1) {
+ } else if (.@orctime == 1) {
mes "You can enter the Dungeon if it has been generated.";
next;
if(select("Enter the Dungeon "+.@md_name$+":Cancel") == 2)
@@ -110,7 +110,7 @@ L_Enter:
close;
} else {
mapannounce "gef_fild10", .@p_leader$ + " of the party, " + .@p_name$ + " is entering the "+.@md_name$+".",bc_map,"0x00ff99";
- if (checkquest(12059)== -1) setquest 12059;
+ if (!questprogress(12059)) setquest 12059;
warp "1@orcs",179,15;
end;
}
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index 215ceffeb..d85e8a4e4 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -106,11 +106,11 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{
next;
// 12 hour cooldown
- set .@ins_bapho_check,checkquest(3040,PLAYTIME);
+ .@ins_bapho_check = questprogress(3040,PLAYTIME);
// Two hour play limit
- //set .@ins_bapho_check2,checkquest(3045,PLAYTIME);
+ //.@ins_bapho_check2 = questprogress(3045,PLAYTIME);
- if (.@ins_bapho_check == -1) {
+ if (!.@ins_bapho_check) {
if (getpartyleader(.@party_id,2) == getcharid(0) && instance_check_party(.@party_id,2,75)) {
mes "[Friar Patrick]";
mes "Party name is "+getpartyname(.@party_id)+"...";
@@ -158,7 +158,7 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{
mes "Once the party leader is permitted, the rest of the party can enter. This is a rule of this monastery, so please understand.";
}
}
- else if (.@ins_bapho_check == 0 || .@ins_bapho_check == 1) {
+ else if (.@ins_bapho_check == 1) {
mes "[Friar Patrick]";
mes "It seems you have entered this shrine recently... You cannot reenter because Baphomet's Curse still remains. Baphomet's Curse disappears only after a certain amount of time has passed.";
}
@@ -170,8 +170,8 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{
mes "Haaaaaaap... Hocus Pocus Wingardium Abracadabra!!!!!";
next;
erasequest 3040;
- if (checkquest(3041)>=0) erasequest 3041;
- if (checkquest(3045)>=0) erasequest 3045;
+ if (questprogress(3041)) erasequest 3041;
+ if (questprogress(3045)) erasequest 3045;
mes "[Friar Patrick]";
mes "Huu... It's over. Now that I've released Baphomet's Curse, you can enter again.";
}
@@ -224,11 +224,11 @@ monk_test,306,151,3 script Grave of Baphomet#edq HIDDEN_NPC,{
close;
// 12 hour cooldown
- set .@ins_bapho_check,checkquest(3040,PLAYTIME);
+ .@ins_bapho_check = questprogress(3040,PLAYTIME);
// Two hour play limit
- //set .@ins_bapho_check2,checkquest(3045,PLAYTIME);
+ //.@ins_bapho_check2 = questprogress(3045,PLAYTIME);
- if (.@ins_bapho_check == -1) {
+ if (!.@ins_bapho_check) {
if (has_instance("1@cata") == "") {
mes "It's cold to the touch. It doesn't respond.";
close;
@@ -238,7 +238,7 @@ monk_test,306,151,3 script Grave of Baphomet#edq HIDDEN_NPC,{
warp "1@cata",100,224;
end;
}
- } else if (.@ins_bapho_check == 0 || .@ins_bapho_check == 1) {
+ } else if (.@ins_bapho_check == 1) {
mes "[Friar Patrick]";
mes "It seems you have entered this shrine recently... You cannot reenter because the curse of Baphomet still remains.";
mes "The curse of Baphomet disappears after a certain amount of time after you entered.";
@@ -251,8 +251,8 @@ monk_test,306,151,3 script Grave of Baphomet#edq HIDDEN_NPC,{
mes "Haaaaaaap... Wingardium Leviosa Expecto Patronum !!!!!";
specialeffect2 EF_HOLYHIT;
erasequest 3040;
- if (checkquest(3041)>=0) erasequest 3041;
- if (checkquest(3045)>=0) erasequest 3045;
+ if (questprogress(3041)) erasequest 3041;
+ if (questprogress(3045)) erasequest 3045;
next;
mes "[Friar Patrick]";
mes "Huu... It's over. Now I released all of the curses on you. You can enter again.";
@@ -261,14 +261,14 @@ monk_test,306,151,3 script Grave of Baphomet#edq HIDDEN_NPC,{
}
prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{
- set .@new_maje,checkquest(3043);
+ .@new_maje = questprogress(3043);
mes "[Rust Blackhand]";
mes "Who are you? What do you want me for?";
next;
mes "[Rust Blackhand]";
mes "You're not a monk, then what do you want?";
next;
- if (.@new_maje == 0 || .@new_maje == 1) {
+ if (.@new_maje == 1) {
mes "[Rust Blackhand]";
mes "Did you bring all of the ingredients?";
next;
@@ -311,7 +311,7 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{
close;
}
}
- else if ((.@new_maje == -1) && (countitem(6004) > 0)) {
+ else if (!.@new_maje && countitem(6004) > 0) {
switch(select("About the Cursed Baphomet Doll:Stop talking.")) {
case 1:
mes "[Rust Blackhand]";
@@ -364,12 +364,12 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{
close;
}
}
- else if ((.@new_maje == -1) && (countitem(6004) == 0)) {
+ else if (!.@new_maje && countitem(6004) == 0) {
mes "[Rust Blackhand]";
mes "If you don't have business with me, go away! As you see, I make equipment for the Brothers at the monastery, not for adventurers like you. Do you understand?";
close;
}
- else if ((.@new_maje == 2) && (countitem(6004) > 0)) {
+ else if (.@new_maje == 2 && countitem(6004) > 0) {
switch(select("About the Cursed Baphomet Doll:Stop talking.")) {
case 1:
mes "[Rust Blackhand]";
@@ -420,7 +420,7 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{
close;
}
}
- else if ((.@new_maje == 2) && (countitem(6004) == 0)) {
+ else if (.@new_maje == 2 && countitem(6004) == 0) {
mes "[Rust Blackhand]";
mes "Why are you hanging around here? If you don't want a ^4d4dffGigantic Magestic Goat^000000, go away.";
close;
@@ -1084,8 +1084,8 @@ OnTouch:
// Magical Seals
//============================================================
- script Magical Seal#SS -1,{
- set .@seal_check,checkquest(3041,PLAYTIME);
- if (.@seal_check == 0 || .@seal_check == 1) {
+ .@seal_check = questprogress(3041,PLAYTIME);
+ if (.@seal_check == 1) {
specialeffect2 EF_SILENCEATTACK;
percentheal -50,0;
sc_start Eff_Stone,30000,0;
@@ -1149,7 +1149,7 @@ OnInstanceInit:
2@cata,80,63,4 script Ancient Hero's Soul#2F 4_M_CHAMPSOUL,{
cutin "ins_cata_champ_s",2;
- if (checkquest(3041)>=0) erasequest 3041;
+ if (questprogress(3041)) erasequest 3041;
mes "[Ancient Hero's Soul]";
mes "Good job, my descendants... You've finished the long-cherished task that me and my bretheren could not complete.";
next;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-16 17:22:05 +0000