Removed use of 'menu' from official (non-custom) scripts

- Some scripts were partly refactored/rewritten to use a more modern
  coding style (and to fix some issues)
- Note: the 'menu' command will be deprecated soon in favor of 'select'
  and 'prompt'.

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

1 files changed, 46 insertions, 47 deletions

diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt
index 718fe2e0e..15d781bff 100644
--- a/npc/events/event_skill_reset.txt
+++ b/npc/events/event_skill_reset.txt
@@ -54,54 +54,53 @@ yuno,138,187,4	script	Hypnotist Teacher	4_F_TELEPORTER,{
 	mes "Your name is ^0080FF"+strcharinfo(0)+"^000000.";
 	mes "How can I help you?";
 	next;
-	menu "^009500Information about Reset skills.^000000",L_Info,"^00B6FFReset skills.^000000",L_Reset,"^000088Nevermind^000000",-;
-
-	mes @npcname$;
-	mes "You know where to find me,";
-	mes "if you ever want a reset!!";
-	close;
-
-L_Info:
-	mes @npcname$;
-	mes "This skill reset is not FREE OF CHARGE!!";
-	mes "Expense for the reset of skill is ^D5A50020000 Zeny x BaseLv^000000.";
-	mes "Yeah ...each One BaseLv costs 20000 Zeny to reset skill.";
-	next;
-	mes @npcname$;
-	mes "Oh yeah, one more thing!";
-	mes "Any carts, falcons or pecos you have equiped";
-	mes "will be removed if you reset your skills.";
-	next;
-	mes @npcname$;
-	mes "Just one time does again to shake the skill point";
-	mes "Careful with your skills from here on.";
-	close;
-	
-L_Reset:
-	mes @npcname$;
-	mes "Before skill reset in starting.";
-	mes "You shall have to first tell me your Base Level.";
-	next;
-	mes "^D5A500[" + strcharinfo(0) + "]^000000";
-	mes "My Base level is ^AA00AALevel " + BaseLevel + "BaseLv.^000000";
-	next;
-	set @zeny,BaseLevel*20000;
-	mes @npcname$;
-	mes "Total zeny to the reset of skill amount ^529DFF" + @zeny + "Zeny^000000  for the skill reset service.";
-	next;
-	if(Zeny < @zeny) {
+	switch (select("^009500Information about Reset skills.^000000","^00B6FFReset skills.^000000","^000088Nevermind^000000")) {
+	case 1: // Information
 		mes @npcname$;
-		mes "It seems that you don't have enough money.";
-		mes "In addition we wait for the opportunity.";
-		emotion e_hmm;
+		mes "This skill reset is not FREE OF CHARGE!!";
+		mes "Expense for the reset of skill is ^D5A50020000 Zeny x BaseLv^000000.";
+		mes "Yeah ...each One BaseLv costs 20000 Zeny to reset skill.";
+		next;
+		mes @npcname$;
+		mes "Oh yeah, one more thing!";
+		mes "Any carts, falcons or pecos you have equiped";
+		mes "will be removed if you reset your skills.";
+		next;
+		mes @npcname$;
+		mes "Just one time does again to shake the skill point";
+		mes "Careful with your skills from here on.";
+		close;
+	case 2: // Reset
+		mes @npcname$;
+		mes "Before skill reset in starting.";
+		mes "You shall have to first tell me your Base Level.";
+		next;
+		mes "^D5A500[" + strcharinfo(0) + "]^000000";
+		mes "My Base level is ^AA00AALevel " + BaseLevel + "BaseLv.^000000";
+		next;
+		@zeny = BaseLevel*20000;
+		mes @npcname$;
+		mes "Total zeny to the reset of skill amount ^529DFF" + @zeny + "Zeny^000000  for the skill reset service.";
+		next;
+		if (Zeny < @zeny) {
+			mes @npcname$;
+			mes "It seems that you don't have enough money.";
+			mes "In addition we wait for the opportunity.";
+			emotion e_hmm;
+			close;
+		}
+		Zeny -= @zeny;
+		MISC_QUEST |= 1024;
+		resetskill;
+		mes @npcname$;
+		mes "Thank you.";
+		emotion e_thx;
+		logmes "SKILL RESET EVENT";
+		close;
+	case 3: // Nevermind
+		mes @npcname$;
+		mes "You know where to find me,";
+		mes "if you ever want a reset!!";
 		close;
 	}
-	Zeny -= @zeny;
-	set MISC_QUEST,MISC_QUEST | 1024;
-	resetskill;
-	mes @npcname$;
-	mes "Thank you.";
-	emotion e_thx;
-	logmes "SKILL RESET EVENT";
-	close;
 }