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

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

1 files changed, 49 insertions, 44 deletions

diff --git a/npc/custom/quests/thq/THQS_GuildNPC.txt b/npc/custom/quests/thq/THQS_GuildNPC.txt
index 326735a7a..05379e345 100644
--- a/npc/custom/quests/thq/THQS_GuildNPC.txt
+++ b/npc/custom/quests/thq/THQS_GuildNPC.txt
@@ -15,46 +15,63 @@ yuno_in01,124,164,6	script	Guild Leader	1_M_PRON_KING,{
 	mes "[Keegan]";
 	mes "What brings you here? Have something to say?";
 	next;
-	menu "I want to be a Treasure Hunter",-,"Take a New Quest.",N_NQuest,"Take me to the Official Shop.",N_OShop,"Nevermind.",N_NVM;
-	if(Event_THQS==1) goto N_AlreadyReg;
-	mes "[Keegan]";
-	mes "Well "+strcharinfo(0)+" if you want to be a Treasure Hunter first you must.";
-	mes " ";
-	mes "^FF00001.^000000 You well be changed ^FF000025,000z^000000 for basic training and your proof of being a member.";
-	mes " ";
-	mes "Umm... Well that is all you need to do. Hahaha.";
-	next;
-	menu "Pay ^FF000025,000z^000000.",-,"Thats way to high!!",N_HighPrice;
-	if (Zeny < 25000) goto N_NoZeny;
-	Zeny -= 25000;
-	//getitem 7950, 1;
-	//getitem 7951, 1;
-	set Event_THQS,1;
-	mes "[Keegan]";
-	mes "Congratulations!";
-	emotion 46;
-	next;
-	mes "[Keegan]";
-	mes "Welcome to the Guild of Treasure Hunters.";
-	mes "You may now take a Treasure Hunting Quest as you see fit.";
-	close;
+	switch (select("I want to be a Treasure Hunter", "Take a New Quest.", "Take me to the Official Shop.", "Nevermind.",N_NVM)) {
+	case 1:
+		if (Event_THQS==1)
+			goto N_AlreadyReg;
+		mes "[Keegan]";
+		mes "Well "+strcharinfo(0)+" if you want to be a Treasure Hunter first you must.";
+		mes " ";
+		mes "^FF00001.^000000 You well be changed ^FF000025,000z^000000 for basic training and your proof of being a member.";
+		mes " ";
+		mes "Umm... Well that is all you need to do. Hahaha.";
+		next;
+		if (select("Pay ^FF000025,000z^000000.", "Thats way to high!!") != 1) {
+			mes "[Keegan]";
+			mes "Well if you can't afford a small ^FF000025,000z^000000 you shouldent be a Treasure Hunter yet.";
+			close;
+		}
+		if (Zeny < 25000)
+			goto N_NoZeny;
+		Zeny -= 25000;
+		//getitem 7950, 1;
+		//getitem 7951, 1;
+		Event_THQS = 1;
+		mes "[Keegan]";
+		mes "Congratulations!";
+		emotion(e_grat);
+		next;
+		mes "[Keegan]";
+		mes "Welcome to the Guild of Treasure Hunters.";
+		mes "You may now take a Treasure Hunting Quest as you see fit.";
+		close;
+	case 2:
+		if (Event_THQS!=1)
+			goto A_NeedReg;
+		mes "[Keegan]";
+		mes "Well "+strcharinfo(0)+" if you wish to take a quest go talk to the fellow Treasure Hunter in the other room there.";
+		close;
+	case 3:
+		if (Event_THQS!=1)
+			goto N_NeedMem;
+		mes "[Keegan]";
+		mes "Yes "+strcharinfo(0)+" I will take you to our shop right away!";
+		next;
+		warp "prt_in",166,171;
+		close;
+	case 4:
+		mes "[Keegan]";
+		mes "Alright come back when you have the free time to spare.";
+		close;
+	}
 N_NoZeny:
 	mes "[Keegan]";
 	mes "Hmmm you don't seem to have ^FF000025,000z^000000 "+strcharinfo(0)+". Please come back when you do.";
 	close;
-N_HighPrice:
-	mes "[Keegan]";
-	mes "Well if you can't afford a small ^FF000025,000z^000000 you shouldent be a Treasure Hunter yet.";
-	close;
 N_AlreadyReg:
 	mes "[Keegan]";
 	mes "Ha ha ha...you are already a member.";
 	close;
-N_NQuest:
-	if (Event_THQS!=1) goto A_NeedReg;
-	mes "[Keegan]";
-	mes "Well "+strcharinfo(0)+" if you wish to take a quest go talk to the fellow Treasure Hunter in the other room there.";
-	close;
 A_NeedReg:
 	mes "[Keegan]";
 	mes "Sorry you must be a member of the Treasure Hunter Guild if you wish to take a quest.";
@@ -65,20 +82,8 @@ A_NeedReg:
 	mes " ";
 	mes "You will even have access to our exclusive personal Dungeon.";
 	close;
-N_OShop:
-	if (Event_THQS!=1) goto N_NeedMem;
-	mes "[Keegan]";
-	mes "Yes "+strcharinfo(0)+" I will take you to our shop right away!";
-	next;
-	warp "prt_in",166,171;
-	close;
-	end;
 N_NeedMem:
 	mes "[Keegan]";
 	mes "Im sorry only members may visit our private shop.";
 	close;
-N_NVM:
-	mes "[Keegan]";
-	mes "Alright come back when you have the free time to spare.";
-	close;
 }