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

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

1 files changed, 144 insertions, 146 deletions

diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt
index 3a37c5c9c..beea787a1 100644
--- a/npc/custom/quests/may_hats.txt
+++ b/npc/custom/quests/may_hats.txt
@@ -19,149 +19,151 @@ gonryun,187,140,4	script	Yakima	4_F_EINWOMAN,{
 	mes "They are quite rare novadays...";
 	specialeffect 417;
 	next;
-	menu "Bird Nest",-,"Lion Mask",M_2,"Skeleton Manteau",M_3,"Fashion Hip Sack",M_4,"Sales Banner",M_5,"Leave",M_Exit;
-
-	mes "[Yakima]";
-	mes "Oh.. it's an excellent item for any beast hunter.";
-	emotion e_rock;
-	next;
-	mes "[Yakima]";
-	mes "For the hat I'll need:";
-	mes "1 Sombrero,";
-	mes "920 Feathers of Birds and";
-	mes "310 Bills of Birds.";
-	next;
-	mes "[Yakima]";
-	mes "Do you have all the items?";
-	next;
-	menu "Yeah.",-,"Nay.",M_Exit;
-
-	if(countitem(Sombrero) < 1 || countitem(Feather_Of_Birds) < 920 || countitem(Bill_Of_Birds) < 310) goto l_noitem;//Items: Sombrero, Feather_of_Birds, Bill_of_Birds,
-	delitem Sombrero,1;//Items: Sombrero,
-	delitem Feather_Of_Birds,920;//Items: Feather_of_Birds,
-	delitem Bill_Of_Birds,310;//Items: Bill_of_Birds,
-	getitem Bird_Nest,1;//Items: Bird_Nest,
-	mes "[Yakima]";
-	mes "Thank you very very much!";
-	mes callfunc("F_Bye");
-	close;
-
-M_2:
-	mes "[Yakima]";
-	mes "Bingo! Many people are afraid of lions... to the muteness...";
-	emotion e_slur;
-	next;
+	switch (select("Bird Nest", "Lion Mask", "Skeleton Manteau", "Fashion Hip Sack", "Sales Banner", "Leave")) {
+	case 1:
+		mes "[Yakima]";
+		mes "Oh.. it's an excellent item for any beast hunter.";
+		emotion e_rock;
+		next;
+		mes "[Yakima]";
+		mes "For the hat I'll need:";
+		mes "1 Sombrero,";
+		mes "920 Feathers of Birds and";
+		mes "310 Bills of Birds.";
+		next;
+		mes "[Yakima]";
+		mes "Do you have all the items?";
+		next;
+		if (select("Yeah.", "Nay." != 1))
+			break;
+		if(countitem(Sombrero) < 1 || countitem(Feather_Of_Birds) < 920 || countitem(Bill_Of_Birds) < 310) goto l_noitem;//Items: Sombrero, Feather_of_Birds, Bill_of_Birds,
+		delitem Sombrero,1;//Items: Sombrero,
+		delitem Feather_Of_Birds,920;//Items: Feather_of_Birds,
+		delitem Bill_Of_Birds,310;//Items: Bill_of_Birds,
+		getitem Bird_Nest,1;//Items: Bird_Nest,
+		mes "[Yakima]";
+		mes "Thank you very very much!";
+		mes callfunc("F_Bye");
+		close;
+	case 2:
+		mes "[Yakima]";
+		mes "Bingo! Many people are afraid of lions... to the muteness...";
+		emotion e_slur;
+		next;
+		mes "[Yakima]";
+		mes "For the hat I'll need:";
+		mes "1 Tiger Mask,";
+		mes "10 Tiger's Footskins,";
+		mes "30 Tiger Skins and";
+		mes "300 Tiger Panties.";
+		next;
+		mes "[Yakima]";
+		mes "Do you have all the items?";
+		next;
+		if (select("Yeah.", "Nay." != 1))
+			break;
+		if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tiger's_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty,
+		delitem Tiger_Mask,1;//Items: Tiger_Mask,
+		delitem Tiger_Footskin,10;//Items: Tiger's_Footskin,
+		delitem Tiger's_Skin,30;//Items: Tiger_Skin,
+		delitem Tiger_Skin_Panties,300;//Items: Tiger_Panty,
+		getitem Lion_Mask,1;//Items: Lion_Mask,
+		mes "[Yakima]";
+		mes "Thank you very very much!";
+		mes callfunc("F_Bye");
+		close;
+	case 3:
+		mes "[Yakima]";
+		mes "I wish I sold this filthy manteau faster...";
+		mes "Guess it isn't so plain as it looks... Hmm.";
+		emotion e_wah;
+		next;
+		mes "[Yakima]";
+		mes "I'm giving it almost for free:";
+		mes "10 Old Manteaus,";
+		mes "3 Skull Rings,";
+		mes "2 Manteau[1] and";
+		mes "1 Ragamuffin Manteau.";
+		next;
+		mes "[Yakima]";
+		mes "Do you have all the items?";
+		next;
+		if (select("Yeah.", "Nay." != 1))
+			break;
+		if(countitem(Ragamuffin_Cape) < 1 || countitem(Manteau_) < 2 || countitem(Skul_Ring) < 3 || countitem(Old_Manteau) < 10) goto l_noitem;//Items: Ragamuffin_Manteau, Manteau_, Skull_Ring, Old_Manteau,
+		delitem Ragamuffin_Cape,1;//Items: Ragamuffin_Manteau,
+		delitem Manteau_,2;//Items: Manteau_,
+		delitem Skul_Ring,3;//Items: Skull_Ring,
+		delitem Old_Manteau,10;//Items: Old_Manteau,
+		getitem Skeleton's_Cape,1;//Items: Skeleton_Manteau,
+		mes "[Yakima]";
+		mes "Thank you very very much!";
+		mes callfunc("F_Bye");
+		close;
+	case 4:
+		mes "[Yakima]";
+		mes "It's a fresh style! Ancessory and a bag all in one! You'd get +2 STR... It's different from that sabby nest!";
+		mes "It fits to Merchant classonly.";
+		emotion e_heh;
+		next;
+		mes "[Yakima]";
+		mes "Now my stock is full of those bags... So I'll make it from 3 flower things and a rough piece of clothes:";
+		mes "3 Romantic Flowers,";
+		mes "3 Fancy Flowers,";
+		mes "2 Flower Rings and";
+		mes "3 Pirate Bandanas.";
+		next;
+		mes "[Yakima]";
+		mes "Do you have all the items?";
+		next;
+		if (select("Yeah.", "Nay." != 1))
+			break;
+		if(countitem(Centimental_Flower) < 3 || countitem(Fancy_Flower) < 3 || countitem(Flower_Ring) < 2 || countitem(Pirate_Bandana)<3 ) goto l_noitem;//Items: Romantic_Flower, Fancy_Flower, Flower_Ring,
+		delitem Centimental_Flower,3;//Items: Romantic_Flower,
+		delitem Fancy_Flower,3;//Items: Fancy_Flower,
+		delitem Flower_Ring,2;//Items: Flower_Ring,
+		delitem Pirate_Bandana,3;//Items: Pirate_Bandana
+		getitem Fashionable_Sack,1;//Items: Fashion_Hip_Sack,
+		mes "[Yakima]";
+		mes "Thank you very very much!";
+		mes callfunc("F_Bye");
+		close;
+	case 5:
+		mes "[Yakima]";
+		mes "Well, well, well... this sign fits any class from a certain level!";
+		mes "Your foes'd be dazzled!";
+		emotion e_no1;
+		next;
+		mes "[Yakima]";
+		mes "Well... we construct it from some common items:";
+		mes "1 Scarlet Dyestuffs,";
+		mes "1 Orange Dyestuffs,";
+		mes "2 Stop Posts,";
+		mes "3 Clown Noses,";
+		mes "180 Fig Leaves and";
+		mes "20 Solid Peaches.";
+		next;
+		mes "[Yakima]";
+		mes "Do you have all the items?";
+		next;
+		if (select("Yeah.", "Nay." != 1))
+			break;
+		if(countitem(Scarlet_Dyestuffs) < 1 || countitem(Orange_Dyestuffs) < 1 || countitem(Stop_Post) < 2 || countitem(Pierrot_Nose) < 3 || countitem(Leaf_Clothes) < 180 || countitem(Hard_Peach) < 20) goto l_noitem;//Items: Scarlet_Dyestuff, Orange_Dyestuff, Stop_Post, Clown_Nose, Fig_Leaf, Solid_Peach,
+		delitem Scarlet_Dyestuffs,1;//Items: Scarlet_Dyestuff,
+		delitem Orange_Dyestuffs,1;//Items: Orange_Dyestuff,
+		delitem Stop_Post,2;//Items: Stop_Post,
+		delitem Pierrot_Nose,3;//Items: Clown_Nose,
+		delitem Leaf_Clothes,180;//Items: Fig_Leaf,
+		delitem Hard_Peach,20;//Items: Solid_Peach,
+		getitem Sales_Signboard,1;//Items: Sales_Banner,
+		mes "[Yakima]";
+		mes "Thank you very very much!";
+		mes callfunc("F_Bye");
+		close;
+	case 6:
+		break;
+	}
 	mes "[Yakima]";
-	mes "For the hat I'll need:";
-	mes "1 Tiger Mask,";
-	mes "10 Tiger's Footskins,";
-	mes "30 Tiger Skins and";
-	mes "300 Tiger Panties.";
-	next;
-	mes "[Yakima]";
-	mes "Do you have all the items?";
-	next;
-	menu "Yeah.",-,"Nay.",M_Exit;
-
-	if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tiger's_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty,
-	delitem Tiger_Mask,1;//Items: Tiger_Mask,
-	delitem Tiger_Footskin,10;//Items: Tiger's_Footskin,
-	delitem Tiger's_Skin,30;//Items: Tiger_Skin,
-	delitem Tiger_Skin_Panties,300;//Items: Tiger_Panty,
-	getitem Lion_Mask,1;//Items: Lion_Mask,
-	mes "[Yakima]";
-	mes "Thank you very very much!";
-	mes callfunc("F_Bye");
-	close;
-
-M_3:
-	mes "[Yakima]";
-	mes "I wish I sold this filthy manteau faster...";
-	mes "Guess it isn't so plain as it looks... Hmm.";
-	emotion e_wah;
-	next;
-	mes "[Yakima]";
-	mes "I'm giving it almost for free:";
-	mes "10 Old Manteaus,";
-	mes "3 Skull Rings,";
-	mes "2 Manteau[1] and";
-	mes "1 Ragamuffin Manteau.";
-	next;
-	mes "[Yakima]";
-	mes "Do you have all the items?";
-	next;
-	menu "Yeah.",-,"Nay.",M_Exit;
-
-	if(countitem(Ragamuffin_Cape) < 1 || countitem(Manteau_) < 2 || countitem(Skul_Ring) < 3 || countitem(Old_Manteau) < 10) goto l_noitem;//Items: Ragamuffin_Manteau, Manteau_, Skull_Ring, Old_Manteau,
-	delitem Ragamuffin_Cape,1;//Items: Ragamuffin_Manteau,
-	delitem Manteau_,2;//Items: Manteau_,
-	delitem Skul_Ring,3;//Items: Skull_Ring,
-	delitem Old_Manteau,10;//Items: Old_Manteau,
-	getitem Skeleton's_Cape,1;//Items: Skeleton_Manteau,
-	mes "[Yakima]";
-	mes "Thank you very very much!";
-	mes callfunc("F_Bye");
-	close;
-
-M_4:
-	mes "[Yakima]";
-	mes "It's a fresh style! Ancessory and a bag all in one! You'd get +2 STR... It's different from that sabby nest!";
-	mes "It fits to Merchant classonly.";
-	emotion e_heh;
-	next;
-	mes "[Yakima]";
-	mes "Now my stock is full of those bags... So I'll make it from 3 flower things and a rough piece of clothes:";
-	mes "3 Romantic Flowers,";
-	mes "3 Fancy Flowers,";
-	mes "2 Flower Rings and";
-	mes "3 Pirate Bandanas.";
-	next;
-	mes "[Yakima]";
-	mes "Do you have all the items?";
-	next;
-	menu "Yeah.",-,"Nay.",M_Exit;
-
-	if(countitem(Centimental_Flower) < 3 || countitem(Fancy_Flower) < 3 || countitem(Flower_Ring) < 2 || countitem(Pirate_Bandana)<3 ) goto l_noitem;//Items: Romantic_Flower, Fancy_Flower, Flower_Ring,
-	delitem Centimental_Flower,3;//Items: Romantic_Flower,
-	delitem Fancy_Flower,3;//Items: Fancy_Flower,
-	delitem Flower_Ring,2;//Items: Flower_Ring,
-	delitem Pirate_Bandana,3;//Items: Pirate_Bandana
-	getitem Fashionable_Sack,1;//Items: Fashion_Hip_Sack,
-	mes "[Yakima]";
-	mes "Thank you very very much!";
-	mes callfunc("F_Bye");
-	close;
-
-M_5:
-	mes "[Yakima]";
-	mes "Well, well, well... this sign fits any class from a certain level!";
-	mes "Your foes'd be dazzled!";
-	emotion e_no1;
-	next;
-	mes "[Yakima]";
-	mes "Well... we construct it from some common items:";
-	mes "1 Scarlet Dyestuffs,";
-	mes "1 Orange Dyestuffs,";
-	mes "2 Stop Posts,";
-	mes "3 Clown Noses,";
-	mes "180 Fig Leaves and";
-	mes "20 Solid Peaches.";
-	next;
-	mes "[Yakima]";
-	mes "Do you have all the items?";
-	next;
-	menu "Yeah.",-,"Nay.",M_Exit;
-
-	if(countitem(Scarlet_Dyestuffs) < 1 || countitem(Orange_Dyestuffs) < 1 || countitem(Stop_Post) < 2 || countitem(Pierrot_Nose) < 3 || countitem(Leaf_Clothes) < 180 || countitem(Hard_Peach) < 20) goto l_noitem;//Items: Scarlet_Dyestuff, Orange_Dyestuff, Stop_Post, Clown_Nose, Fig_Leaf, Solid_Peach,
-	delitem Scarlet_Dyestuffs,1;//Items: Scarlet_Dyestuff,
-	delitem Orange_Dyestuffs,1;//Items: Orange_Dyestuff,
-	delitem Stop_Post,2;//Items: Stop_Post,
-	delitem Pierrot_Nose,3;//Items: Clown_Nose,
-	delitem Leaf_Clothes,180;//Items: Fig_Leaf,
-	delitem Hard_Peach,20;//Items: Solid_Peach,
-	getitem Sales_Signboard,1;//Items: Sales_Banner,
-	mes "[Yakima]";
-	mes "Thank you very very much!";
 	mes callfunc("F_Bye");
 	close;
 
@@ -171,8 +173,4 @@ l_noitem:
 	emotion e_sry;
 	close;
 
-M_Exit:
-	mes "[Yakima]";
-	mes callfunc("F_Bye");
-	close;
 }