summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authormekolat <mekolat@gmail.com>2015-03-02 07:42:31 -0500
committermekolat <mekolat@gmail.com>2015-03-05 08:36:08 -0500
commit331707dc5f6c581fa1ccef479d6bf86b25b3fd99 (patch)
treef3a291ae02033be98b350ca9b9cb379c7247fe3e /world/map
parent539b965ce41968907a41bb80bd3c586ac255b2a3 (diff)
downloadserverdata-331707dc5f6c581fa1ccef479d6bf86b25b3fd99.tar.gz
serverdata-331707dc5f6c581fa1ccef479d6bf86b25b3fd99.tar.bz2
serverdata-331707dc5f6c581fa1ccef479d6bf86b25b3fd99.tar.xz
serverdata-331707dc5f6c581fa1ccef479d6bf86b25b3fd99.zip
make lora tay use DyeConfig colors
Diffstat (limited to 'world/map')
-rw-r--r--world/map/npc/010-2/loratay.txt62
1 files changed, 35 insertions, 27 deletions
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index ef85fc36..b81a9ca5 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -44,7 +44,6 @@ OnInit:
set @FINEDRESS_COCOONS, 180;
set @SORCERER_ROBE_SEW_ZENY, 25000;
set @SORCERER_ROBE_NUM_COTTON_CLOTH, 2;
- setarray @item_colors$, "red", "green", "dark blue", "yellow", "light blue", "pink", "black", "orange", "purple", "dark green", "white";
set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT);
if (@loratay_asking_robe == 1) goto L_ExamineSR;
@@ -487,28 +486,30 @@ L_desert_hat:
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;
- cleararray @items, 0, getarraysize(@items);
+ cleararray @items$, "", getarraysize(@items$);
cleararray @item_names$, "", getarraysize(@item_names$);
- setarray @items, 724, 2140, 2141, 2142, 2143, 2144, 2145, 2146, 2147, 2148, 2149;
- setarray @item_names$, "Here is a Cotton Headband.", "Here is a Red Cotton Headband.", "Here is a Green Cotton Headband.", "Here is a Dark Blue Cotton Headband.", "Here is a Yellow Cotton Headband.", "Here is a Light Blue Cotton Headband.", "Here is a Pink Cotton Headband.", "Here is a Black Cotton Headband.", "Here is an Orange Cotton Headband.", "Here is a Puple Cotton Headband.", "Here is a Dark Green Cotton Headband.";
+ set @o, 1;
+ setarray @items$, "CottonHeadband";
+ setarray @item_names$, "Here is a Cotton Headband.";
+ callsub S_CottonHeadbandColors;
- callfunc "DynamicItemMenu";
- if (@item == 0)
+ callfunc "DynamicItemMenu$";
+ if (@item$ == "")
goto L_main_menu;
- if (@item == 724)
- set @genitem, 723;
- if (@item != 724)
- set @genitem, @item - 10;
- if (countitem(@item) < 1)
+ if (@item$ == "CottonHeadband")
+ set @genitem$, "DesertHat";
+ if (@item$ != "CottonHeadband")
+ set @genitem$, $@DYE_colors$[@index] + "DesertHat";
+ if (countitem(@item$) < 1)
goto L_desert_hat_noheadband;
if (countitem("CottonCloth") < 3)
goto L_desert_hat_nocotton;
if (Zeny < 300)
goto L_desert_hat_nogp;
- delitem @item, 1;
+ delitem @item$, 1;
delitem "CottonCloth", 3;
set Zeny, Zeny - 300;
- getitem @genitem, 1;
+ 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.";
@@ -520,6 +521,13 @@ L_desert_hat:
next;
goto L_main_menu;
+S_CottonHeadbandColors:
+ set @items$[@o], $@DYE_colors$[@o]+"CottonHeadband";
+ set @item_names$[@o], "Here is a "+$@DYE_color_names$[@o]+" Cotton Headband";
+ set @o, @o + 1;
+ if(@o < getarraysize($@DYE_colors$)) goto S_CottonHeadbandColors;
+ return;
+
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...\"";
@@ -930,7 +938,7 @@ L_ExamineSR:
mes "Lora Tay takes a closer look at what you are wearing.";
next;
mes "[Lora Tay the Seamstress]";
- mes "\"Hmm. This " + @item_colors$[@current_linecolor] + " lined " + @item_colors$[@current_maincolor] + " sorcerer robe. I see. Is that ok?\"";
+ mes "\"Hmm. This " + $@DYE_color_names$[@current_linecolor] + " lined " + $@DYE_color_names$[@current_maincolor] + " sorcerer robe. I see. Is that ok?\"";
if (@current_maincolor == -1 || @current_linecolor == -1)
goto L_NotSR;
menu
@@ -947,17 +955,17 @@ L_ChooseSRLineColor:
mes "[Lora Tay the Seamstress]";
mes "\"And which Cotton Cloth color will you give me?\"";
menu
- "A " + @item_colors$[0] + " one.", L_ItemMenus2,
- "A " + @item_colors$[1] + " one.", L_ItemMenus2,
- "A " + @item_colors$[2] + " one.", L_ItemMenus2,
- "A " + @item_colors$[3] + " one.", L_ItemMenus2,
- "A " + @item_colors$[4] + " one.", L_ItemMenus2,
- "A " + @item_colors$[5] + " one.", L_ItemMenus2,
- "A " + @item_colors$[6] + " one.", L_ItemMenus2,
- "A " + @item_colors$[7] + " one.", L_ItemMenus2,
- "A " + @item_colors$[8] + " one.", L_ItemMenus2,
- "A " + @item_colors$[9] + " one.", L_ItemMenus2,
- "A " + @item_colors$[10] + " one.", L_ItemMenus2,
+ "A " + $@DYE_color_names$[0] + " one.", L_ItemMenus2,
+ "A " + $@DYE_color_names$[1] + " one.", L_ItemMenus2,
+ "A " + $@DYE_color_names$[2] + " one.", L_ItemMenus2,
+ "A " + $@DYE_color_names$[3] + " one.", L_ItemMenus2,
+ "A " + $@DYE_color_names$[4] + " one.", L_ItemMenus2,
+ "A " + $@DYE_color_names$[5] + " one.", L_ItemMenus2,
+ "A " + $@DYE_color_names$[6] + " one.", L_ItemMenus2,
+ "A " + $@DYE_color_names$[7] + " one.", L_ItemMenus2,
+ "A " + $@DYE_color_names$[8] + " one.", L_ItemMenus2,
+ "A " + $@DYE_color_names$[9] + " one.", L_ItemMenus2,
+ "A " + $@DYE_color_names$[10] + " one.", L_ItemMenus2,
"Hum. I changed my mind. Later maybe.", L_end;
L_ItemMenus2:
@@ -985,8 +993,8 @@ L_ItemMenus2:
delitem @chest_equip_id, 1;
set Zeny, Zeny - @SORCERER_ROBE_SEW_ZENY;
getitem @new_sr_id, 1;
- mes "Lora Tay adjusts her glasses and removes carefully the " + @item_colors$[@current_linecolor] + " string of the robe.";
- mes "Then she grabs the " + @item_colors$[@chosen_color] + " cotton cloth, unfolds it and pins her needle in it.";
+ mes "Lora Tay adjusts her glasses and removes carefully the " + $@DYE_color_names$[@current_linecolor] + " string of the robe.";
+ mes "Then she grabs the " + $@DYE_color_names$[@chosen_color] + " cotton cloth, unfolds it and pins her needle in it.";
next;
mes "She begins to sew the new string onto the sorcerer robe.";
next;