diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-03-06 12:58:55 -0700 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-06 12:58:55 -0700 |
commit | 2a73e3544d6ac4d4f000c621753d70e8695e203c (patch) | |
tree | b3784983e268ecf01a506229255116ac64fb0f57 /npc/001-1_Tulimshar/bleacher.txt | |
parent | 7464175373616085130e0d2e3b9ddc8e0322f291 (diff) | |
parent | 3226368a1cd36e4d6e47302493fe5e0e91dddef3 (diff) | |
download | serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.gz serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.bz2 serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.xz serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.zip |
Merge commit 'mainline/master'
Conflicts:
conf/magic.conf
Diffstat (limited to 'npc/001-1_Tulimshar/bleacher.txt')
-rw-r--r-- | npc/001-1_Tulimshar/bleacher.txt | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/npc/001-1_Tulimshar/bleacher.txt b/npc/001-1_Tulimshar/bleacher.txt index 67ea1497..d51c134b 100644 --- a/npc/001-1_Tulimshar/bleacher.txt +++ b/npc/001-1_Tulimshar/bleacher.txt @@ -19,45 +19,46 @@ L_bleach_menu: next; menu - "Cotton shirt", L_cottonshirt,
+ "Cotton shirt", L_cottonshirt, "V-Neck sweater", L_vneck, "Turtleneck sweater", L_tneck, "Cotton shorts", L_shorts, "Cotton skirt", L_skirt, - "Tank top ", L_tanktop,
+ "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, "Nevermind", -; goto L_close; -L_cottonshirt:
set @normal, 1202;
+L_cottonshirt:
set @normal, 1202; set @dyeBase, 2050; goto L_choose_color; -L_vneck:
set @normal, 624;
+L_vneck:
set @normal, 624; set @dyeBase, 2060; goto L_choose_color; -L_tneck:
set @normal, 564;
+L_tneck:
set @normal, 564; set @dyeBase, 2070; goto L_choose_color; -L_shorts:
set @normal, 586;
+L_shorts:
set @normal, 586; set @dyeBase, 2110; goto L_choose_color; -L_skirt:
set @normal, 632;
+L_skirt:
set @normal, 632; set @dyeBase, 2100; goto L_choose_color; -L_tanktop:
set @normal, 688;
+L_tanktop:
set @normal, 688; set @dyeBase, 2090; goto L_choose_color; -L_tanktop_short:
set @normal, 689;
+L_tanktop_short:
set @normal, 689; set @dyeBase, 2120; goto L_choose_color; @@ -80,6 +81,11 @@ L_cotton_boots: set @normal, 735; set @dyeBase, 2150; goto L_choose_color; + +L_cotton_gloves: + set @normal, 741; + set @dyeBase, 2160; + goto L_choose_color; L_choose_color: mes "[Candide]"; |