summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-08-16 14:07:52 -0500
committerWushin <pasekei@gmail.com>2015-08-16 14:07:52 -0500
commit8d40414af4fe31754e8619b41187dccb6ab0fa28 (patch)
treee711e0440ad28b2407cff3624e7af64366e82793 /world/map
parentdce0381169165327df4cef9063635721a29964ec (diff)
parent2ceb5e19365cf1e64fe539afabe5da47c0b74bdf (diff)
downloadserverdata-8d40414af4fe31754e8619b41187dccb6ab0fa28.tar.gz
serverdata-8d40414af4fe31754e8619b41187dccb6ab0fa28.tar.bz2
serverdata-8d40414af4fe31754e8619b41187dccb6ab0fa28.tar.xz
serverdata-8d40414af4fe31754e8619b41187dccb6ab0fa28.zip
Merge pull request #416 from mekolat/mekolat-patch-2
fix colour bug in selim
Diffstat (limited to 'world/map')
-rw-r--r--world/map/npc/009-2/selim.txt33
1 files changed, 19 insertions, 14 deletions
diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index 474dec3c..ce5cc424 100644
--- a/world/map/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
@@ -1,21 +1,7 @@
009-2,32,104,0|script|Selim|326
{
- cleararray @items$, "", getarraysize(@items$);
- cleararray @item_names$, "", getarraysize(@item_names$);
- set @r, 0;
- set @j, getarraysize($@DYE_items$);
- goto L_CloneArray; // clone the array from DyeConfig
-
-L_CloneArray:
- set @items$[@r], $@DYE_items$[@r];
- set @item_names$[@r], $@DYE_item_names$[@r];
- set @r, @r + 1;
- if(@r < @j) goto L_CloneArray;
- set @r, 0;
- set @j, 0;
goto L_Main;
-
L_Main:
mes "[Selim]";
mes "\"Greetings, fair traveler. With what may I help you?\"";
@@ -54,6 +40,22 @@ L_ask_dye:
"Good bye.", L_Close;
L_clothes_choice:
+ cleararray @items$, "", getarraysize(@items$);
+ cleararray @item_names$, "", getarraysize(@item_names$);
+ set @r, 0;
+ set @j, getarraysize($@DYE_items$);
+ goto L_CloneArray; // clone the array from DyeConfig
+
+L_CloneArray:
+ set @items$[@r], $@DYE_items$[@r];
+ set @item_names$[@r], $@DYE_item_names$[@r];
+ set @r, @r + 1;
+ if(@r < @j) goto L_CloneArray;
+ set @r, 0;
+ set @j, 0;
+ goto L_clothes_choice2;
+
+L_clothes_choice2:
mes "[Selim]";
mes "\"What can I dye for you today?\"";
next;
@@ -87,6 +89,7 @@ L_Next:
mes "\"Of course I can help you by dyeing the materials your tailor will want.";
mes "All I need is a piece of Cotton Cloth.\"";
set @item_del$, "CottonCloth";
+ set @name$, "Cotton Cloth";
menu
"Sure. Here is one.", L_picked_item,
"I have to go pick that.", L_Close;
@@ -101,6 +104,8 @@ L_colour:
next;
set @r, 0;
set @j, getarraysize($@DYE_colors$);
+ cleararray @items$, "", getarraysize(@items$);
+ cleararray @item_names$, "", getarraysize(@item_names$);
callsub S_CloneColors;
set @default_choice$, "I have no dye.";
callfunc "DynamicItemMenu$";