From 82d5ed8ee5349e0338f1819ecf472efe95523ae9 Mon Sep 17 00:00:00 2001 From: Asheraf Date: Tue, 5 Jun 2018 08:11:31 +0000 Subject: Update instance scripts to follow official behaviour --- npc/instances/OrcsMemory.txt | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'npc/instances/OrcsMemory.txt') 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: -- cgit v1.2.3-60-g2f50