summaryrefslogtreecommitdiff
path: root/npc/001-1_Tulimshar
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-01-12 08:02:59 -0700
committerFate <fate-tmw@googlemail.com>2009-01-12 08:02:59 -0700
commit03e7550003650cb5cf79eb0c8d470ce8bd24ae27 (patch)
tree437785d13b545d6562ba3b00513b8eb5a89c8f15 /npc/001-1_Tulimshar
parent647f4a35bf8831df4fe23754e824f4bdfb5dcf72 (diff)
parent5db6cb7d6c09dbb091edbdf21a3e0e3feae3175a (diff)
downloadserverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.gz
serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.bz2
serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.xz
serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.zip
Merge branch 'master' into magic
Conflicts: db/item_db.txt
Diffstat (limited to 'npc/001-1_Tulimshar')
-rw-r--r--npc/001-1_Tulimshar/bleacher.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/npc/001-1_Tulimshar/bleacher.txt b/npc/001-1_Tulimshar/bleacher.txt
index 48b5c6c6..67ea1497 100644
--- a/npc/001-1_Tulimshar/bleacher.txt
+++ b/npc/001-1_Tulimshar/bleacher.txt
@@ -29,6 +29,7 @@ L_bleach_menu:
"Silk robe", L_robe,
"Cotton headband", L_cotton_headband,
"Desert hat", L_desert_hat,
+ "Cotton boots", L_cotton_boots,
"Nevermind", -;
goto L_close;
@@ -74,6 +75,11 @@ L_desert_hat:
set @normal, 723;
set @dyeBase, 2130;
goto L_choose_color;
+
+L_cotton_boots:
+ set @normal, 735;
+ set @dyeBase, 2150;
+ goto L_choose_color;
L_choose_color:
mes "[Candide]";