From 68e4b2ff0db5a5f2e2e2ba36c33acfccb39e48a2 Mon Sep 17 00:00:00 2001 From: Vincent Petithory Date: Sun, 16 Dec 2012 19:15:43 +0100 Subject: 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 --- world/map/npc/001-1/bleacher.txt | 123 +++++++++++++++++++++------------------ 1 file changed, 66 insertions(+), 57 deletions(-) (limited to 'world/map/npc/001-1/bleacher.txt') 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]"; -- cgit v1.2.3-60-g2f50