Update instance scripts to follow official behaviour

4 files changed, 53 insertions, 65 deletions

diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index dc60ce766..2964f7e2a 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -220,23 +220,21 @@ e_tower,81,105,0	script	Tower Protection Stone	2_MONEMUS,{
 			switch (select(.@str$, "Enter the Dungeon", "Return to Alberta", "Cancel")) {
 			case 1:
 				.@instance = instance_create(.@md_name$, .@party_id);
-				if (.@instance < 0) {
-					mesf("Party Name: %s", .@p_name$);
-					mesf("Party Leader: %s", strcharinfo(PC_NAME));
-					mesf("^0000ff%s ^000000- Reservation Failed!", .@md_name$);
-					close();
+				if (.@instance >= 0) {
+					for (.@i = 1; .@i <= 6; ++.@i) {
+						if (instance_attachmap(.@i + "@tower", .@instance) == "") {
+							mesf("Party Name: %s", .@p_name$);
+							mesf("Party Leader: %s", strcharinfo(PC_NAME));
+							mesf("^0000ff%s ^000000- Reservation Failed!", .@md_name$);
+							instance_destroy(.@instance);
+							close();
+						}
+					}
+					instance_set_timeout(14400, 300, .@instance);
+					instance_init(.@instance);
 				}
 				mesf("^0000ff%s^000000 - Try to reserve", .@md_name$);
 				mes("After making a reservation, you have to talk to NPC behind and select the menu 'Enter the Dungeon' to enter the dungeon.");
-				for (.@i = 1; .@i <= 6; ++.@i) {
-					if (instance_attachmap(.@i + "@tower", .@instance) == "") {
-						mesf("^0000ff%s ^000000- Reservation Failed!", .@md_name$);
-						instance_destroy(.@instance);
-						close();
-					}
-				}
-				instance_set_timeout(14400, 300, .@instance);
-				instance_init(.@instance);
 				close();
 			case 2:
 				callsub(L_Enter, 0, 1, .@md_name$, .@p_name$);
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index 46ffdaef3..d39d90cd3 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -128,21 +128,18 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	HIDDEN_NPC,8,8,{
 				switch (select("Please allow me to enter.", "I want to go in.", "I want to leave.")) {
 				case 1:
 					.@instance = instance_create(.@md_name$, .@party_id);
-					if (.@instance < 0) {
-						mes("[Yggdrasil Gatekeeper]");
-						mes("The Guardian seems to wish to be alone. I will go in and check, please wait out here.");
-						close();
+					if (.@instance >= 0) {
+						for (.@i = 1; .@i <= 2; ++.@i) {
+							if (instance_attachmap(.@i + "@nyd", .@instance) == "") {
+								mes("[Yggdrasil Gatekeeper]");
+								mes("The Guardian seems to wish to be alone. I will go in and check, please wait out here.");
+								instance_destroy(.@instance);
+								close();
+							}
+						}
+						instance_set_timeout(144000, 300, .@instance);
+						instance_init(.@instance);
 					}
-					for (.@i = 1; .@i <= 2; ++.@i) {
-						if (instance_attachmap(.@i + "@nyd", .@instance) == "")
-							break;
-					}
-					if (.@i < 2) {
-						instance_destroy(.@instance);
-						close();
-					}
-					instance_set_timeout(144000, 300, .@instance);
-					instance_init(.@instance);
 					mes("[Yggdrasil Gatekeeper]");
 					mes("I've recorded your request, are you ready to go inside?");
 					next();
diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index 1aaf2fd42..383786696 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -67,23 +67,20 @@ gef_fild10,242,202,0	script	Dimensional Gorge Piece	2_MONEMUS,{
 			switch (select(.@str$, "Enter the Dungeon", "Cancel")) {
 			case 1:
 				.@instance = instance_create(.@md_name$, .@party_id);
-				if (.@instance < 0) {
-					mesf("Party Name: %s", .@p_name$);
-					mesf("Party Leader: %s", strcharinfo(PC_NAME));
-					mesf("^0000ff%s ^000000 - Reservation Failed.", .@md_name$);
-					close();
+				if (.@instance >= 0) {
+					for (.@i = 1; .@i <= 2; ++.@i) {
+						if (instance_attachmap(.@i + "@orcs", .@instance) == "") {
+							mesf("Party Name: %s", .@p_name$);
+							mesf("Party Leader: %s", strcharinfo(PC_NAME));
+							mesf("^0000ff%s ^000000 - Reservation Failed.", .@md_name$);
+							instance_destroy(.@instance);
+							close();
+						}
+					}
+					instance_set_timeout(7200, 300, .@instance);
+					instance_init(.@instance);
 				}
 				mesf("^0000ff%s^000000- Attempting to book an entrance", .@md_name$);
-				for (.@i = 1; .@i <= 2; ++.@i) {
-					if (instance_attachmap(.@i + "@orcs", .@instance) == "")
-						break;
-				}
-				if (.@i < 2) {
-					instance_destroy(.@instance);
-					close();
-				}
-				instance_set_timeout(7200, 300, .@instance);
-				instance_init(.@instance);
 				mesf("After making a reservation, you have to select 'Enter the Dungeon' from the menu if you wish to enter the %s.", .@md_name$);
 				close();
 			case 2:
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index 3bc3d951a..91771c31c 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -118,37 +118,33 @@ monk_test,309,146,3	script	Friar Patrick#edq	4_M_OLDFRIAR,{
 					mesf("Party name is %s...", getpartyname(.@party_id));
 					mesf("Name of the leader is %s...", strcharinfo(PC_NAME));
 					.@instance = instance_create(_("Sealed Catacomb"), .@party_id);
-					if (.@instance < 0) {
-						mes("Umm... But it seems that there is a problem here... I'll check quickly. Please wait.");
-					} else {
+					if (.@instance >= 0) {
 						for (.@i = 1; .@i <= 2; .@i++) {
 							if (instance_attachmap(.@i + "@cata", .@instance) == "") {
-								mesf("Failed to attach %d@cata as a map!", .@i);
+								mes("Umm... But it seems that there is a problem here... I'll check quickly. Please wait.");
 								instance_destroy(.@instance);
 								close();
 							}
 						}
-
 						instance_set_timeout(7200, 300, .@instance);
 						instance_init(.@instance);
-
-						mes("Okay... I'll adjust the shrine's seal so that you and your group can enter.");
-						next();
-						mes("[Friar Patrick]");
-						mes("You will see a sign when the seal has broken. Please wait until the sign appears...");
-						next();
-						mes("[Friar Patrick]");
-						mes("When you see the sign, put your hands on the gravestone... Then you can move inside.");
-						next();
-						mes("[Friar Patrick]");
-						mes("One thing that you should remember is... Anyone who enters this shrine will be cursed by Baphomet and cannot enter or leave while they are cursed.");
-						next();
-						mes("[Friar Patrick]");
-						mes("And one more thing... In this cursed area, some skills, which are protected by outer physical power are prohibited by the effect of the seal.");
-						next();
-						mes("[Friar Patrick]");
-						mes("For example, the skills like ^0000FFSafety Wall and Assumptio^000000... So you'd better prepare before entering the shrine.");
 					}
+					mes("Okay... I'll adjust the shrine's seal so that you and your group can enter.");
+					next();
+					mes("[Friar Patrick]");
+					mes("You will see a sign when the seal has broken. Please wait until the sign appears...");
+					next();
+					mes("[Friar Patrick]");
+					mes("When you see the sign, put your hands on the gravestone... Then you can move inside.");
+					next();
+					mes("[Friar Patrick]");
+					mes("One thing that you should remember is... Anyone who enters this shrine will be cursed by Baphomet and cannot enter or leave while they are cursed.");
+					next();
+					mes("[Friar Patrick]");
+					mes("And one more thing... In this cursed area, some skills, which are protected by outer physical power are prohibited by the effect of the seal.");
+					next();
+					mes("[Friar Patrick]");
+					mes("For example, the skills like ^0000FFSafety Wall and Assumptio^000000... So you'd better prepare before entering the shrine.");
 				} else {
 					mes("[Friar Patrick]");
 					mes("Umm... I recognize your courage, but... I can't permit anyone to enter this place. I can only permit the leader of a party to enter first.");