Browse Source

Fixes a party check for Weekend Dungeon (#7797)

* Fixes #7776.
* Adjusts the party checks to account for leader versus member.
Thanks to @grimexile and @Atemo!
Aleos 1 year ago
parent
commit
4c9280728a
1 changed files with 6 additions and 2 deletions
  1. 6 2
      npc/re/instances/WeekendDungeon.txt

+ 6 - 2
npc/re/instances/WeekendDungeon.txt

@@ -42,7 +42,7 @@ pay_arche,44,124,5	script	Marry Jae	4_F_JOB_BLACKSMITH,{
 	}
 	}
 	.@md_name$ = "Weekend Dungeon";
 	.@md_name$ = "Weekend Dungeon";
 
 
-	if (is_party_leader() == false) {
+	if (getcharid(1) < 1) {
 		mes "[Marry Jae]";
 		mes "[Marry Jae]";
 		mes "You need to form a party of one member or more.";
 		mes "You need to form a party of one member or more.";
 		close;
 		close;
@@ -72,11 +72,15 @@ pay_arche,44,124,5	script	Marry Jae	4_F_JOB_BLACKSMITH,{
 		mes "You may re-enter the Memorial Dungeon.";
 		mes "You may re-enter the Memorial Dungeon.";
 		close;
 		close;
 	}
 	}
+
+	if (is_party_leader() == true)
+		.@menu$ = "Prepare Memorial Dungeon";
+
 	mes "[Marry Jae]";
 	mes "[Marry Jae]";
 	mes "I think you're just about ready.";
 	mes "I think you're just about ready.";
 	mes "Now, would you like to enter it now?";
 	mes "Now, would you like to enter it now?";
 	next;
 	next;
-	switch( select( "Prepare Memorial Dungeon", "Enter Weekend Dungeon", "Cancel" ) ) {
+	switch( select( .@menu$, "Enter Weekend Dungeon", "Cancel" ) ) {
 	case 1:
 	case 1:
 		instance_create(.@md_name$);
 		instance_create(.@md_name$);
 		mes "[Marry Jae]";
 		mes "[Marry Jae]";