Clean the dyer/bleacher scripts:

 * Add punctuation in menus
 * Format label name to the apparent script convention
 * Move the sorcerer robes variants into a submenu
 * Remove the color array and use a hard-coded menu for the colors

2 files changed, 119 insertions, 102 deletions

diff --git a/world/map/npc/001-1/bleacher.txt b/world/map/npc/001-1/bleacher.txt
index f0e3611b..6ff75cca 100644
--- a/world/map/npc/001-1/bleacher.txt
+++ b/world/map/npc/001-1/bleacher.txt
@@ -11,8 +11,8 @@
     if (Zeny < 5000) goto L_no_money;
 
     menu
-        "I'd like to bleach something", -,
-        "No thanks", L_Close;
+        "I'd like to bleach something.", -,
+        "No thanks.", L_Close;
 
 L_bleach_menu:
     mes "[Candide]";
@@ -20,38 +20,28 @@ L_bleach_menu:
     next;
 
     menu
-        "Cotton shirt", L_cottonshirt,
-        "V-Neck sweater", L_vneck,
-        "Turtleneck sweater", L_tneck,
-        "Cotton shorts", L_shorts,
-        "Cotton trousers", L_trousers,
-        "Cotton skirt", L_skirt,
-        "Miniskirt", L_miniskirt,
-        "Tank top ", L_tanktop,
-        "Short tank top", L_tanktop_short,
-        "Silk robe", L_robe,
-        "Cotton headband", L_cotton_headband,
-        "Desert hat", L_desert_hat,
-        "Cotton boots", L_cotton_boots,
-        "Cotton gloves", L_cotton_gloves,
-        "Rabbit ears", L_rabbit_ears,
-        "Wizard hat", L_wizard_hat,
-        "Bowler hat", L_bowler_hat,
-        "Red lined sorcerer robe", L_red_lined_sorcerer_robe,
-        "Green lined sorcerer robe", L_greenlinedsorcererrobe,
-        "Dark blue lined sorcerer robe", L_darkbluelinedsorcererrobe,
-        "Yellow lined sorcerer robe", L_yellowlinedsorcererrobe,
-        "Light blue lined sorcerer robe", L_lightbluelinedsorcererrobe,
-        "Pink lined sorcerer robe", L_pinklinedsorcererrobe,
-        "Black lined sorcerer robe", L_blacklinedsorcererrobe,
-        "Orange lined sorcerer robe", L_orangelinedsorcererrobe,
-        "Purple lined sorcerer robe", L_purplelinedsorcererrobe,
-        "Dark green lined sorcerer robe", L_darkgreenlinedsorcererrobe,
-        "White lined sorcerer robe", L_whitelinedsorcererrobe,
-        "Bowler hat (brown)", L_bowler_hat_brown,
-        "Fine dress", L_fine_dress,
-        "Cotton cloth", L_cottoncloth,
-        "Nevermind", -;
+        "Cotton shirt.", L_cottonshirt,
+        "V-Neck sweater.", L_vneck,
+        "Turtleneck sweater.", L_tneck,
+        "Cotton shorts.", L_shorts,
+        "Cotton trousers.", L_trousers,
+        "Cotton skirt.", L_skirt,
+        "Miniskirt.", L_miniskirt,
+        "Tank top .", L_tanktop,
+        "Short tank top.", L_tanktop_short,
+        "Silk robe.", L_robe,
+        "Cotton headband.", L_cotton_headband,
+        "Desert hat.", L_desert_hat,
+        "Cotton boots.", L_cotton_boots,
+        "Cotton gloves.", L_cotton_gloves,
+        "Rabbit ears.", L_rabbit_ears,
+        "Wizard hat.", L_wizard_hat,
+        "Bowler hat.", L_bowler_hat,
+        "Sorcerer robe.", L_sorcerer_robe,
+        "Bowler hat (brown).", L_bowler_hat_brown,
+        "Fine dress.", L_fine_dress,
+        "Cotton cloth.", L_cotton_cloth,
+        "Nevermind.", -;
     goto L_Close;
 
 L_cottonshirt:
@@ -139,57 +129,76 @@ L_bowler_hat:
     set @dyeBase, 2210;
     goto L_choose_color;
 
+L_sorcerer_robe:
+    mes "[Candide]";
+    mes "\"Which one?\"";
+    next;
+    menu
+        "A red lined one.", L_red_lined_sorcerer_robe,
+        "A green lined one.", L_green_lined_sorcerer_robe,
+        "A dark blue lined one.", L_dark_blue_lined_sorcerer_robe,
+        "A yellow lined one.", L_yellow_lined_sorcerer_robe,
+        "A light blue lined one.", L_light_blue_lined_sorcerer_robe,
+        "A pink lined one.", L_pink_lined_sorcerer_robe,
+        "A black lined one.", L_black_lined_sorcerer_robe,
+        "An orange lined one.", L_orange_lined_sorcerer_robe,
+        "A purple lined one.", L_purple_lined_sorcerer_robe,
+        "A dark green lined one.", L_dark_green_lined_sorcerer_robe,
+        "A white lined one.", L_white_lined_sorcerer_robe,
+        "Nevermind.", -;
+    goto L_Close;
+
 L_red_lined_sorcerer_robe:
     set @normal, 798;
     set @dyeBase, 2220;
     goto L_choose_color;
 
-L_greenlinedsorcererrobe:
+L_green_lined_sorcerer_robe:
     set @normal, 5010;
     set @dyeBase, 5000;
     goto L_choose_color;
 
-L_darkbluelinedsorcererrobe:
+L_dark_blue_lined_sorcerer_robe:
     set @normal, 5021;
     set @dyeBase, 5011;
     goto L_choose_color;
 
-L_yellowlinedsorcererrobe:
+L_yellow_lined_sorcerer_robe:
     set @normal, 5032;
     set @dyeBase, 5022;
     goto L_choose_color;
 
-L_lightbluelinedsorcererrobe:
+L_light_blue_lined_sorcerer_robe:
     set @normal, 5043;
     set @dyeBase, 5033;
     goto L_choose_color;
 
-L_pinklinedsorcererrobe:
+L_pink_lined_sorcerer_robe:
     set @normal, 5054;
     set @dyeBase, 5044;
     goto L_choose_color;
 
-L_blacklinedsorcererrobe:
+L_black_lined_sorcerer_robe:
     set @normal, 5065;
     set @dyeBase, 5055;
     goto L_choose_color;
 
-L_orangelinedsorcererrobe:
+L_orange_lined_sorcerer_robe:
     set @normal, 5076;
     set @dyeBase, 5066;
     goto L_choose_color;
 
-L_purplelinedsorcererrobe:
+L_purple_lined_sorcerer_robe:
     set @normal, 5087;
     set @dyeBase, 5077;
     goto L_choose_color;
 
-L_darkgreenlinedsorcererrobe:
+L_dark_green_lined_sorcerer_robe:
     set @normal, 5098;
     set @dyeBase, 5088;
     goto L_choose_color;
 
-L_whitelinedsorcererrobe:
+L_white_lined_sorcerer_robe:
     set @normal, 5109;
     set @dyeBase, 5099;
     goto L_choose_color;
@@ -204,7 +213,7 @@ L_fine_dress:
     set @dyeBase, 2240;
     goto L_choose_color;
 
-L_cottoncloth:
+L_cotton_cloth:
     set @normal, 660;
     set @dyeBase, 2250;
     goto L_choose_color;
@@ -215,16 +224,16 @@ L_choose_color:
     next;
 
     menu
-        "Red", -,
-        "Green", -,
-        "Dark Blue", -,
-        "Yellow", -,
-        "Light Blue", -,
-        "Pink", -,
-        "Black", -,
-        "Orange", -,
-        "Purple", -,
-        "Dark Green", -;
+        "Red.", -,
+        "Green.", -,
+        "Dark Blue.", -,
+        "Yellow.", -,
+        "Light Blue.", -,
+        "Pink.", -,
+        "Black.", -,
+        "Orange.", -,
+        "Purple.", -,
+        "Dark Green.", -;
 
     set @del, @dyeBase + @menu - 1;
 
@@ -245,8 +254,8 @@ L_again:
     next;
 
     menu
-        "Yes", L_bleach_menu,
-        "No", L_Close;
+        "Yes.", L_bleach_menu,
+        "No.", L_Close;
 
 L_no_item:
     mes "[Candide]";
diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index 0f01da40..a919240c 100644
--- a/world/map/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
@@ -7,7 +7,6 @@
 
 009-2.gat,32,104,0|script|Selim|326,{
     setarray @all_colours$, "red", "green", "dark blue", "yellow", "light blue", "pink", "black", "orange", "purple", "dark green";
-    setarray @all_colours_cap$, "Red", "Green", "Dark Blue", "Yellow", "Light Blue", "Pink", "Black", "Orange", "Purple", "Dark Green";
 
     mes "[Selim]";
     mes "\"What can I dye for you today?\"";
@@ -18,36 +17,26 @@ L_clothes_choice:
     set @pronoun$, "it";
     set @is_verb$, "is";
     menu
-        "Cotton shirt", L_cottonshirt,
-        "V-Neck sweater", L_vneck,
-        "Turtleneck sweater", L_tneck,
-        "Cotton shorts", L_shorts,
-        "Cotton trousers", L_trousers,
-        "Cotton skirt", L_skirt,
-        "Miniskirt", L_miniskirt,
-        "Tank top ", L_tanktop,
-        "Short tank top", L_tanktop_short,
-        "Silk robe", L_robe,
-        "Cotton headband", L_headband,
-        "Desert hat", L_desert_hat,
-        "Cotton boots", L_cottonboots,
-        "Cotton gloves", L_cottongloves,
-        "Rabbit ears", L_rabbitears,
-        "Wizard hat", L_wizardhat,
-        "Bowler hat", L_bowlerhat,
-        "Red lined sorcerer robe", L_redlinedsorcererrobe,
-        "Green lined sorcerer robe", L_greenlinedsorcererrobe,
-        "Dark blue lined sorcerer robe", L_darkbluelinedsorcererrobe,
-        "Yellow lined sorcerer robe", L_yellowlinedsorcererrobe,
-        "Light blue lined sorcerer robe", L_lightbluelinedsorcererrobe,
-        "Pink lined sorcerer robe", L_pinklinedsorcererrobe,
-        "Black lined sorcerer robe", L_blacklinedsorcererrobe,
-        "Orange lined sorcerer robe", L_orangelinedsorcererrobe,
-        "Purple lined sorcerer robe", L_purplelinedsorcererrobe,
-        "Dark green lined sorcerer robe", L_darkgreenlinedsorcererrobe,
-        "White lined sorcerer robe", L_whitelinedsorcererrobe,
-        "Bowler hat (brown)", L_bowlerhatbrown,
-        "Fine dress", L_finedress,
+        "Cotton shirt.", L_cottonshirt,
+        "V-Neck sweater.", L_vneck,
+        "Turtleneck sweater.", L_tneck,
+        "Cotton shorts.", L_shorts,
+        "Cotton trousers.", L_trousers,
+        "Cotton skirt.", L_skirt,
+        "Miniskirt.", L_miniskirt,
+        "Tank top.", L_tanktop,
+        "Short tank top.", L_tanktop_short,
+        "Silk robe.", L_robe,
+        "Cotton headband.", L_headband,
+        "Desert hat.", L_desert_hat,
+        "Cotton boots.", L_cottonboots,
+        "Cotton gloves.", L_cottongloves,
+        "Rabbit ears.", L_rabbitears,
+        "Wizard hat.", L_wizardhat,
+        "Bowler hat.", L_bowlerhat,
+        "Sorcerer robe.", L_sorcererrobe,
+        "Bowler hat (brown).", L_bowlerhatbrown,
+        "Fine dress.", L_finedress,
         "About these sorcerer robes...", L_asksorcererrobe,
         "I'm fine for now, thanks.", -;
     close;
@@ -160,6 +149,25 @@ L_bowlerhat:
     set @name$, "bowler hat";
     goto L_picked_item;
 
+L_sorcererrobe:
+    mes "[Selim]";
+    mes "\"Which one?\"";
+    next;
+    menu
+        "A red lined one.", L_redlinedsorcererrobe,
+        "A green lined one.", L_greenlinedsorcererrobe,
+        "A dark blue lined one.", L_darkbluelinedsorcererrobe,
+        "A yellow lined one.", L_yellowlinedsorcererrobe,
+        "A light blue lined one.", L_lightbluelinedsorcererrobe,
+        "A pink lined one.", L_pinklinedsorcererrobe,
+        "A black lined one.", L_blacklinedsorcererrobe,
+        "An orange lined one.", L_orangelinedsorcererrobe,
+        "A purple lined one.", L_purplelinedsorcererrobe,
+        "A dark green lined one.", L_darkgreenlinedsorcererrobe,
+        "A white lined one.", L_whitelinedsorcererrobe,
+        "I'm fine for now, thanks.", -;
+    close;
+
 L_redlinedsorcererrobe:
     set @del, 798;
     set @new, 2220;
@@ -272,20 +280,20 @@ L_colour:
     mes "\"Excellent.  Now, what color do you want?\"";
     next;
     menu
-        @all_colours_cap$[0], -,
-        @all_colours_cap$[1], -,
-        @all_colours_cap$[2], -,
-        @all_colours_cap$[3], -,
-        @all_colours_cap$[4], -,
-        @all_colours_cap$[5], -,
-        @all_colours_cap$[6], -,
-        @all_colours_cap$[7], -,
-        @all_colours_cap$[8], -,
-        @all_colours_cap$[9], -;
-        set @colour, @menu - 1;
-        set @vial, 690 + @colour;
-        if (countitem(@vial) == 0) goto L_no_dye;
-        goto L_finish;
+        "Red.", -,
+        "Green.", -,
+        "Dark Blue.", -,
+        "Yellow.", -,
+        "Light Blue.", -,
+        "Pink.", -,
+        "Black.", -,
+        "Orange.", -,
+        "Purple.", -,
+        "Dark Green.", -;
+    set @colour, @menu - 1;
+    set @vial, 690 + @colour;
+    if (countitem(@vial) == 0) goto L_no_dye;
+    goto L_finish;
 
 L_no_dye:
     mes "[Selim]";