Removed some of the leftover calls to menu() in custom scripts

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 45 insertions, 44 deletions

diff --git a/npc/custom/events/uneasy_cemetery.txt b/npc/custom/events/uneasy_cemetery.txt
index 7027dacbf..72ae51fc2 100644
--- a/npc/custom/events/uneasy_cemetery.txt
+++ b/npc/custom/events/uneasy_cemetery.txt
@@ -82,51 +82,52 @@ L_Undead_Walk:
 	mes "To calm down the restless cemetery, we should pour all these graves with the Holy Water. But our sisters and broters have run out of it.";
 	mes "Could you supply us with Holy Water?";
 	next;
-	menu "Yes, have all my Holy Water!",-, "Nope, I need it.",M_NO, "I don't have any.",M_DONT_HAVE;
+	switch (select("Yes, have all my Holy Water!", "Nope, I need it.", "I don't have any.")) {
+	case 1:
+		if (countitem(Holy_Water) < 1)
+			break; // Not enough
+		set $UNEASY_BL,$UNEASY_BL-countitem(Holy_Water);
+		delitem 523,countitem(Holy_Water);
 
-	if ( countitem(Holy_Water)<1 ) goto M_DONT_HAVE;
-	set $UNEASY_BL,$UNEASY_BL-countitem(Holy_Water);
-	delitem 523,countitem(Holy_Water);
-
-	if ( $UNEASY_BL > 0 ) goto L_NEED_MORE;
-//set quiet days!!! no more undead for this period!
-	set $UNEASY_DL,5+((0-$UNEASY_BL)/30);
-	set $UNEASY_H$,strcharinfo(0);
-	mes "[Mother Mathana]";
-	mes "Thank you, "+$UNEASY_H$+"! Now we've got enough Holy Water!";
-	next;
-	mes "[Mother Mathana]";
-	mes "Upon pouring the cemetery with that water we'll get " + $UNEASY_DL + " safe nights!";
-	next;
-	killmonster "prontera", "Uneasy_Check::OnZombieDead"; //kills any left monsters
-	mes "[Mother Mathana]";
-	mes "See, "+ $UNEASY_H$ +"? They all are gone now!";
-	next;
-	mes "[Mother Mathana]";
-	mes "Our Church is going to thank you personally...";
-	next;
-	if (Sex == SEX_MALE)
-		mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare handsom "+$UNEASY_H$+" as a Prontera savior!",0;
-	else
-		mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare beautiful "+$UNEASY_H$+" as a Prontera savior!",0;
-	mes "[Mother Mathana]";
-	mes "In the name of Odin we bless you and decently present a modest gift just from Mareusis' wine-cellar.";
-	getitem Blue_Potion,1;
-	set JobExp,JobExp+100;
-	set BaseExp,BaseExp+50;
-	close;
-
-L_NEED_MORE:
-	mes "[Mother Mathana]";
-	mes "Thank you, good "+strcharinfo(0)+", but we still need " + $UNEASY_BL + " more Holy Water bottles.";
-	close;
-
-M_NO:
-	mes "[Mother Mathana]";
-	mes "I'm afraid the old cemetery is going out of control soon... Please, get us all the Holy Water you can get.";
-	close;
-
-M_DONT_HAVE:
+		if ($UNEASY_BL > 0) {
+			mes "[Mother Mathana]";
+			mes "Thank you, good "+strcharinfo(0)+", but we still need " + $UNEASY_BL + " more Holy Water bottles.";
+			close;
+		}
+		//set quiet days!!! no more undead for this period!
+		set $UNEASY_DL,5+((0-$UNEASY_BL)/30);
+		set $UNEASY_H$,strcharinfo(0);
+		mes "[Mother Mathana]";
+		mes "Thank you, "+$UNEASY_H$+"! Now we've got enough Holy Water!";
+		next;
+		mes "[Mother Mathana]";
+		mes "Upon pouring the cemetery with that water we'll get " + $UNEASY_DL + " safe nights!";
+		next;
+		killmonster "prontera", "Uneasy_Check::OnZombieDead"; //kills any left monsters
+		mes "[Mother Mathana]";
+		mes "See, "+ $UNEASY_H$ +"? They all are gone now!";
+		next;
+		mes "[Mother Mathana]";
+		mes "Our Church is going to thank you personally...";
+		next;
+		if (Sex == SEX_MALE)
+			mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare handsom "+$UNEASY_H$+" as a Prontera savior!",0;
+		else
+			mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare beautiful "+$UNEASY_H$+" as a Prontera savior!",0;
+		mes "[Mother Mathana]";
+		mes "In the name of Odin we bless you and decently present a modest gift just from Mareusis' wine-cellar.";
+		getitem Blue_Potion,1;
+		set JobExp,JobExp+100;
+		set BaseExp,BaseExp+50;
+		close;
+	case 2:
+		mes "[Mother Mathana]";
+		mes "I'm afraid the old cemetery is going out of control soon... Please, get us all the Holy Water you can get.";
+		close;
+	case 3:
+		break; // Not enough
+	}
+	// Not enough
 	mes "[Mother Mathana]";
 	mes "Alas! We still need " + $UNEASY_BL + " more bottles of Holy Water...  Why don't you go and ask other people for some extra Holy Water?";
 	mes "The old cemetery is going out of control soon...";