summaryrefslogtreecommitdiff
path: root/npc/instances
diff options
context:
space:
mode:
Diffstat (limited to 'npc/instances')
-rw-r--r--npc/instances/EndlessTower.txt30
-rw-r--r--npc/instances/OrcsMemory.txt47
-rw-r--r--npc/instances/SealedShrine.txt20
3 files changed, 51 insertions, 46 deletions
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index ae3f55afb..474abf315 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -267,21 +267,6 @@ e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{
case 3:
end;
}
- } 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")) {
- case 1:
- callsub L_Enter,0,0,.@md_name$,.@p_name$;
- case 2:
- mes "I will move you to Alberta.";
- close2;
- warp "alberta",223,36;
- end;
- case 3:
- break;
- }
- close;
} else if (.@etower_timer == 1 && .@etower_timer2 == 2) {
.@dun_lim_time = etower_timer+604800; // 1 week
@@ -298,6 +283,21 @@ e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{
close2;
warp "alberta",223,36;
end;
+ } 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")) {
+ case 1:
+ callsub L_Enter,0,0,.@md_name$,.@p_name$;
+ case 2:
+ mes "I will move you to Alberta.";
+ close2;
+ warp "alberta",223,36;
+ end;
+ case 3:
+ break;
+ }
+ close;
} else {
etower_timer = 0;
erasequest 60200;
diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index e43e3df10..68cf8b2e9 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -52,7 +52,19 @@ gef_fild10,242,202,0 script Dimensional Gorge Piece 2_MONEMUS,{
}
.@orctime = questprogress(12059,PLAYTIME);
- if (!.@orctime) {
+ if (.@orctime == 2) {
+ mes "^0000ffAll records and after-effects related to the Orc's Memory Dungeon are deleted. You can now regenerate or re-enter the dungeon.^000000";
+ erasequest 12059;
+ close;
+ }
+
+ if (.@orctime == 1) {
+ mes "You can enter the Dungeon if it has been generated.";
+ next;
+ if(select("Enter the Dungeon "+.@md_name$+":Cancel") == 2)
+ close;
+ // Fall through to access the dungeon
+ } else { // !.@orctime
if (getcharid(0) == getpartyleader(.@party_id,2)) {
mes "Party status confirmed. Would you like to book entrance to the "+.@md_name$+"?";
next;
@@ -79,28 +91,17 @@ gef_fild10,242,202,0 script Dimensional Gorge Piece 2_MONEMUS,{
mes "After making a reservation, you have to select 'Enter the Dungeon' from the menu if you wish to enter the "+.@md_name$+".";
close;
case 2:
- callsub L_Enter,0;
+ break; // Fall through to access the dungeon (after the else)
case 3:
close;
}
- }
- if(select(.@md_name$ + " Enter the Memorial Dungeon:Cancel") == 2)
+ } else if (select(.@md_name$ + " Enter the Memorial Dungeon:Cancel") == 2)
end;
- callsub L_Enter,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)
- close;
- callsub L_Enter,0;
- } else if (.@orctime == 2) {
- mes "^0000ffAll records and after-effects related to the Orc's Memory Dungeon are deleted. You can now regenerate or re-enter the dungeon.^000000";
- erasequest 12059;
- close;
+ // Else access the dungeon
}
- mes "In order to generate a dungeon you must be the Party Leader and have at least 2 members in the party.";
- close;
-L_Enter:
+
+ // Dungeon access
+
if (has_instance("1@orcs") == "") {
mes "Memorial Dungeon "+.@md_name$+" does not exist.";
mes "The party leader has not reserved entrance to the dungeon yet.";
@@ -108,12 +109,12 @@ L_Enter:
mes "Once the reservation is complete, the dungeon will be generated.";
mes "If your dungeon has been destroyed you must wait 7 days before re-entering.";
close;
- } else {
- mapannounce "gef_fild10", .@p_leader$ + " of the party, " + .@p_name$ + " is entering the "+.@md_name$+".",bc_map,"0x00ff99";
- if (!questprogress(12059)) setquest 12059;
- warp "1@orcs",179,15;
- end;
}
+
+ mapannounce "gef_fild10", strcharinfo(0) + " of the party, " + .@p_name$ + " is entering the "+.@md_name$+".",bc_map,"0x00ff99";
+ if (!questprogress(12059)) setquest 12059;
+ warp "1@orcs",179,15;
+ end;
}
gef_fild10,238,202,6 script Mad Scientist#orc 4_LGTSCIENCE,{
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index 82267be7a..5bbe81d27 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -121,7 +121,7 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{
}
else {
for (.@i = 1; .@i <= 2; ++.@i) {
- if( instance_attachmap("" + .@i + "@cata", .@instance) == "" )
+ if( instance_attachmap(.@i + "@cata", .@instance) == "" )
break;
}
if( .@i < 2 ) {
@@ -272,7 +272,7 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{
mes "[Rust Blackhand]";
mes "Did you bring all of the ingredients?";
next;
- if ((countitem(6004) > 0) && (countitem(2256) > 0) && (countitem(7799) > 29) && (countitem(7798) > 49) && (Zeny > 990000)) {
+ if (countitem(6004) && countitem(2256) && (countitem(7799) > 29) && (countitem(7798) > 49) && (Zeny >= 990000)) {
mes "[Rust Blackhand]";
mes "kkk... You prepared the ingredients well. Why don't you leave it there and wait?";
next;
@@ -348,7 +348,9 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{
next;
mes "[Rust Blackhand]";
mes "You'll never know how great this hat is until you get one. If you understood, go and get the ingredients.";
- changequest 3042,3043;
+ if (questprogress(3042))
+ erasequest 3042;
+ setquest 3043;
close;
case 2:
mes "[Rust Blackhand]";
@@ -364,12 +366,12 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{
close;
}
}
- else if (!.@new_maje && countitem(6004) == 0) {
+ else if (!.@new_maje && !countitem(6004)) {
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)) {
switch(select("About the Cursed Baphomet Doll:Stop talking.")) {
case 1:
mes "[Rust Blackhand]";
@@ -403,8 +405,10 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{
next;
mes "[Rust Blackhand]";
mes "You'll never know how great this hat is until you get one. If you understood, go and get the ingredients.";
- //recall_completequest 3043
- changequest 3042,3043;
+ if (questprogress(3042))
+ erasequest 3042;
+ erasequest 3043;
+ setquest 3043;
close;
case 2:
mes "[Rust Blackhand]";
@@ -420,7 +424,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)) {
mes "[Rust Blackhand]";
mes "Why are you hanging around here? If you don't want a ^4d4dffGigantic Magestic Goat^000000, go away.";
close;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-25 15:08:29 +0000