Merge pull request #273 from mekolat/selim

update selim

2 files changed, 82 insertions, 14 deletions

diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index f9dc3b40..ab74b2f9 100644
--- a/world/map/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
@@ -1,9 +1,29 @@
-//#################################################################################
-//#                                                                               #
-//# This script file contains the script for the cloth dyer. It has been          #
-//# revised to require dye items; collaborating NPCs are Selim and Angus.         #
-//#                                                                               #
-//#################################################################################
+function|script|SelimDebug
+{
+    set @w, 0;
+    mes "[Selim Debug]";
+    menu
+        "Debug item array.", L_DebugArrayExplain,
+        "Exit debug.", L_Return;
+
+L_DebugArrayExplain:
+    mes "[How it works]";
+    mes "Click on the link to verify that it is the red variation of the item.";
+    mes "If, for example, you see [Skirt] then when you click on it you should see Red Skirt.";
+    next;
+    goto L_DebugArray;
+
+L_DebugArray:
+    mes "[@@" + @items_new[@w] + "|" + @item_names$[@w] + "@@]";
+    set @w, @w + 1;
+    if(@w >= getarraysize(@items_new)) goto L_Return;
+    menu
+        "Next.", L_DebugArray,
+        "Exit debug.", L_Return;
+
+L_Return:
+    return;
+}
 
 009-2,32,104,0|script|Selim|326
 {
@@ -12,11 +32,52 @@
     cleararray @items$, "", getarraysize(@items$);
     cleararray @item_names$, "", getarraysize(@item_names$);
     cleararray @items_new, "", getarraysize(@items_new);
-    setarray @items_new,   5131,           2250,           2060,             2070,                 2110,            2180,              2100,           2170,        2090,       2120,             2080,        2140,              2130,         2150,           2160,            2190,                2200,         2210,         2230,                 2240,         5131,                2220,                      5000,                        5011,                            5022,                         5033,                             5044,                       5055,                        5066,                         5077,                         5088,                             5099;
+    setarray @items_new,   2050,           2250,           2060,             2070,                 2110,            2180,              2100,           2170,        2090,       2120,             2080,        2140,              2130,         2150,           2160,            2190,                2200,         2210,         2230,                 2240,         5131,                2220,                      5000,                        5011,                            5022,                         5033,                             5044,                       5055,                        5066,                         5077,                         5088,                             5099;
     setarray @items$,      "CottonShirt",  "CottonCloth",  "VNeckSweater",   "TurtleneckSweater",  "CottonShorts",  "CottonTrousers",  "CottonSkirt",  "Miniskirt", "TankTop",  "ShortTankTop",   "SilkRobe",  "CottonHeadband",  "DesertHat",  "CottonBoots",  "CottonGloves",  "WhiteRabbitEars",   "WizardHat",  "BowlerHat",  "BowlerHatBrown",     "FineDress",  "ContributorShirt",  "SorcererRobeRed",         "SorcererRobeGreen",         "SorcererRobeDarkBlue",          "SorcererRobeYellow",         "SorcererRobeLightBlue",          "SorcererRobePink",         "SorcererRobeBlack",         "SorcererRobeOrange",         "SorcererRobePurple",         "SorcererRobeDarkGreen",          "SorcererRobeWhite";
     setarray @item_names$, "Cotton Shirt", "Cotton Cloth", "V-Neck Sweater", "Turtleneck Sweater", "Cotton Shorts", "Cotton Trousers", "Cotton Skirt", "Miniskirt", "Tank Top", "Short Tank Top", "Silk Robe", "Cotton Headband", "Desert Hat", "Cotton Boots", "Cotton Gloves", "White Rabbit Ears", "Wizard Hat", "Bowler Hat", "Bowler Hat (brown)", "Fine Dress", "Contributor Shirt", "Red lined Sorcerer Robe", "Green lined Sorcerer Robe", "Dark Blue lined Sorcerer Robe", "Yellow lined Sorcerer Robe", "Light Blue lined Sorcerer Robe", "Pink lined Sorcerer Robe", "Black lined Sorcerer Robe", "Orange lined Sorcerer Robe", "Purple lined Sorcerer Robe", "Dark Green lined Sorcerer Robe", "White lined Sorcerer Robe";
-    set @default_choice$, "About these sorcerer robes...";
-    goto L_clothes_choice;
+    if ((getgmlevel() >= 40 || debug) && (getequipid(equip_head) == 647 || getequipid(equip_head) == 725)) goto L_Debug;
+    goto L_Main;
+
+L_Debug:
+    callfunc "SelimDebug";
+    close;
+
+L_Main:
+    mes "[Selim]";
+    mes "\"Greetings, fair traveler. With what may I help you?\"";
+    menu
+        "Greetings, are you the store merchant?", L_ask_selim,
+        "But what are dyes and what purpose do they serve?", L_ask_dye,
+        "Can you dye something for me?", L_clothes_choice,
+        "Can you also remove color from clothing?", L_ask_bleach,
+        "About these sorcerer robes...", L_asksorcererrobe,
+        "Never mind.", L_Close;
+
+L_ask_bleach:
+    mes "[Selim]";
+    mes "\"I'm afraid no.";
+    mes "For that, you would need to visit Candide in the Tulimshar marketplace.\"";
+    goto L_Main;
+
+L_ask_selim:
+    mes "[Selim]";
+    mes "\"That is an honest mistake you have made.";
+    mes "However I am not the merchant, but rather a Master Dyer here to serve the good people of this town.";
+    mes "I dye things, upon request.\"";
+    menu
+        "But what are dyes and where can I get them?", L_ask_dye,
+        "Can you dye something for me?", L_clothes_choice,
+        "Can you also remove color from clothing?", L_ask_bleach,
+        "Good bye.", L_Close;
+
+L_ask_dye:
+    mes "[Selim]";
+    mes "\"Dyes are special liquids used to add color to clothing. If you want me to dye something for you you will have to bring me some dye first.";
+    mes "Those behind me are nearly empty and won't last for your item.\"";
+    menu
+        "What do you mean, `bring you dye'?", L_explain_dye,
+        "Where would I get dye?", L_explain_dye,
+        "Good bye.", L_Close;
 
 L_clothes_choice:
     mes "[Selim]";
@@ -29,7 +90,7 @@ L_clothes_choice:
     set @name$, @item_names$[@index];
     cleararray @items$, "", getarraysize(@items$);
     cleararray @item_names$, "", getarraysize(@item_names$);
-    if(@item$ == "") goto L_asksorcererrobe;
+    if(@item$ == "") goto L_Close;
     goto L_picked_item;
 
 
@@ -95,7 +156,7 @@ L_explain_dye:
     mes "[Selim]";
     mes "\"Well, dye is very expensive, and since I don't charge adventurers anything, I can't give you any for free.";
     mes "But most alchemists can make dye; perhaps you can find one around here.\"";
-    close;
+    goto L_Close;
 
 L_finish:
     delitem @vial, 1;
@@ -103,7 +164,7 @@ L_finish:
     getitem @item_new + @colour, 1;
     mes "[Selim]";
     mes "\"Here's your " + @all_colours$[@colour] + " " + @name$ + "!  Please let dry for a minute.\"";
-    close;
+    goto L_Close;
 
 L_havenone:
     mes "[Selim]";
@@ -113,5 +174,8 @@ L_havenone:
     goto L_clothes_choice;
 
 L_Close:
-    close;
+    mes "\"Farewell and good luck in your journeys!\"";
+    close2;
+    emotion EMOTE_WINK;
+    end;
 }
diff --git a/world/map/npc/functions/barber.txt b/world/map/npc/functions/barber.txt
index e7491cf3..2b2beba0 100644
--- a/world/map/npc/functions/barber.txt
+++ b/world/map/npc/functions/barber.txt
@@ -133,7 +133,7 @@ L_SameColor:
     mes "You are either bald or your hair is already that color.";
     goto L_Main;
 
-L_Done:
+S_Janitor:
     // cleanup
     set @menu, 0;
     set @style, 0;
@@ -143,4 +143,8 @@ L_Done:
     set @hairOpts, 0;
     set @colorOpts, 0;
     return;
+
+L_Close:
+    callsub S_Janitor;
+    return;
 }