Added Lora Tay script for making desert hat, moved her back onto the map

2 files changed, 80 insertions, 6 deletions

diff --git a/npc/009-2_Hurnscald/selim.txt b/npc/009-2_Hurnscald/selim.txt
index 952bac9e..cc7a8863 100644
--- a/npc/009-2_Hurnscald/selim.txt
+++ b/npc/009-2_Hurnscald/selim.txt
@@ -5,7 +5,7 @@
 //#                                                                               #
 //#################################################################################
 
-new_20-1.gat,32,104,0	script	Selim	142,{
+009-2.gat,32,104,0	script	Selim	142,{
 	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";
 
@@ -26,6 +26,8 @@ L_clothes_choice:
 		"Tank top ", L_tanktop,
 		"Short tank top", L_tanktop_short,
 		"Silk robe", L_robe,
+		"Cotton headband", L_headband,
+		"Desert hat", L_desert_hat,
 		"I'm fine for now, thanks.", -;
 	close;
 
@@ -79,6 +81,18 @@ L_robe:
         set @name$, "silk robe";
 	goto L_picked_item;
 
+L_headband:
+	set @del, 724;
+	set @new, 2140;
+        set @name$, "cotton headband";
+	goto L_picked_item;
+
+L_desert_hat:
+	set @del, 723;
+	set @new, 2130;
+        set @name$, "desert hat";
+	goto L_picked_item;
+
 L_picked_item:
 	if (countitem(@del) == 0) goto L_havenone;
 L_colour:
diff --git a/npc/010-2_Dimond's_Cove/loratay.txt b/npc/010-2_Dimond's_Cove/loratay.txt
index 744557e7..559ba578 100644
--- a/npc/010-2_Dimond's_Cove/loratay.txt
+++ b/npc/010-2_Dimond's_Cove/loratay.txt
@@ -1,4 +1,4 @@
-new_23-1.gat,85,85,0	script	Lora Tay	151,{
+010-2.gat,85,85,0	script	Lora Tay	151,{
 
         set @COTTON, 660;
         set @SILK_COCOON, 718;
@@ -233,6 +233,7 @@ L_main_menu:
              "Can you make fur boots for me?", -,
              "Can you make winter gloves me?", -,
              "Can you sew a robe for me?", L_robe,
+             "Can you make a desert hat for me?", L_desert_hat,
              "Goodbye for now!", L_end;
 
         mes "[Lora Tay the Seamstress]";
@@ -240,6 +241,65 @@ L_main_menu:
         next;
         goto L_main_menu;
 
+L_desert_hat:
+        mes "[Lora Tay the Seamstress]";
+        mes "The seamstress sighs.";
+        mes "\"One of these days it would be nice to have an actual challenge... yes, of course I can make a desert hat.  A cotton headband, three pieces of cotton cloth.  Hmm.  And let's add 300 GP to that.\"";
+        next;
+
+        set @default_choice$, "Never mind.";
+        setarray @items, 724, 2140, 2141, 2142, 2143, 2144, 2145, 2146, 2147, 2148, 2149;
+        setarray @item_names$, "Here is a white headband", "Here is a red headband", "Here is a green headband", "Here is a dark blue headband", "Here is a yellow headband", "Here is a light blue headband", "Here is a pink headband", "Here is a black headband", "Here is a orange headband", "Here is a puple headband", "Here is a dark green headband";
+        set @items_nr, 11;
+
+        callsub SUB_pick_one_of_many_items;
+        if (@item == 0) goto L_main_menu;
+
+        if (@item == 724)
+           set @genitem, 723;
+        if (@item != 724)
+           set @genitem, @item - 10;
+
+        if (countitem(@item) < 1)
+        	goto L_desert_hat_noheadband;
+        if (countitem(@COTTON) < 3)
+        	goto L_desert_hat_nocotton;
+        if (zeny < 300)
+        	goto L_desert_hat_nogp;
+
+        delitem @item, 1;
+        delitem @COTTON, 3;
+        set zeny, zeny - 300;
+        getitem @genitem, 1;
+        mes "[Lora Tay the Seamstress]";
+        mes "\"Now then, this should only take a minute.\"";
+        mes "The seamstress folds your cotton cloth in a complicated fashion, wraps the resulting bundle into and out of the headband, and finally sews together several loose ends.";
+        next;
+        mes "[Lora Tay the Seamstress]";
+        mes "The result resembles a huge knot.";
+        mes "Lora picks two ends and pulls, hard-- to your amazement, the knot unfolds, yielding a desert hat.";
+        mes "\"Here you are.\"";
+        next;
+	goto L_main_menu;
+
+L_desert_hat_nocotton:
+        mes "[Lora Tay the Seamstress]";
+        mes "\"You're asking me to make a desert hat without enough cloth?  Here, have your headband back-- see, that's how much I can do without cloth!  And since I'm generous today, you can even keep your GP...\"";
+        next;
+	goto L_main_menu;
+
+L_desert_hat_nogp:
+        mes "[Lora Tay the Seamstress]";
+        mes "\"No, no, no.  300 GP.  That's not that much, I've been told.  I can't just work for free, now can I?\"";
+        next;
+	goto L_main_menu;
+
+L_desert_hat_noheadband:
+        mes "[Lora Tay the Seamstress]";
+        mes "\"Now that is odd.  Where did your headband vanish to?  Well, I'm not going to make you something as silly as a headband, so get one from elsewhere.\"";
+        next;
+	goto L_main_menu;
+
 L_trim:
         mes "[Lora Tay the Seamstress]";
         mes "\"Trimming... you mean that you can't do that yourself?  Well, alright... I suppose I should charge 100 GP and do it.\"";
@@ -249,8 +309,8 @@ L_trim:
         set @default_choice$, "Never mind.";
         setarray @items, 1202, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, 2059,
                           688, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099;
-        setarray @item_names$, "cotton shirt", "red cotton shirt", "green cotton shirt", "dark blue cotton shirt", "yellow cotton shirt", "light blue cotton shirt", "pink cotton shirt", "black cotton shirt", "orange cotton shirt", "puple cotton shirt", "cotton shirt 9",
-                               "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "tank top 9";
+        setarray @item_names$, "cotton shirt", "red cotton shirt", "green cotton shirt", "dark blue cotton shirt", "yellow cotton shirt", "light blue cotton shirt", "pink cotton shirt", "black cotton shirt", "orange cotton shirt", "puple cotton shirt", "dark green cotton shirt",
+                               "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "dark green tank top";
         set @items_nr, 22;
         callsub SUB_pick_one_of_many_items;
         if (@item == 0) goto L_main_menu;
@@ -297,8 +357,8 @@ L_lengthen:
         set @default_choice$, "Never mind.";
         setarray @items, 688, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099,
                          689, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129;
-        setarray @item_names$, "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "tank top 9",
-                               "short tank top", "red short tank top", "green short tank top", "dark blue short tank top", "yellow short tank top", "light blue short tank top", "pink short tank top", "black short tank top", "orange short tank top", "purple short tank top", "short tank top 9";
+        setarray @item_names$, "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "dark green tank top",
+                               "short tank top", "red short tank top", "green short tank top", "dark blue short tank top", "yellow short tank top", "light blue short tank top", "pink short tank top", "black short tank top", "orange short tank top", "purple short tank top", "dark green short tank top";
         set @items_nr, 22;
         callsub SUB_pick_one_of_many_items;
         if (@item == 0) goto L_main_menu;