summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2016-05-30 19:21:44 -0500
committerWushin <pasekei@gmail.com>2016-05-30 19:21:44 -0500
commitb5c8c20ab8f99c21125deaedd2387186de14a72c (patch)
treec77ad7e1e193351c4e5e0a7a03f3dd96bcacfb2c /world/map/npc
parent4ea513a57ecc0ebb6b82e6dbdd7070acb2928f11 (diff)
parent4e77a410994f1932a62adf3a8cb64a3c9842e889 (diff)
downloadserverdata-b5c8c20ab8f99c21125deaedd2387186de14a72c.tar.gz
serverdata-b5c8c20ab8f99c21125deaedd2387186de14a72c.tar.bz2
serverdata-b5c8c20ab8f99c21125deaedd2387186de14a72c.tar.xz
serverdata-b5c8c20ab8f99c21125deaedd2387186de14a72c.zip
Merge pull request #500 from Ecuador-ManaWorld/LoraTay-Menus
Lora Tay: Bugs corrections and Code improvement
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/010-2/loratay.txt23
1 files changed, 4 insertions, 19 deletions
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index 6843bfcc..4e4232d7 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -242,7 +242,7 @@ L_regular_intro:
mes "\"Ah, you again. Is there anything in particular you need?\"";
next;
if (@wg_state == 12)
- goto L_main_menu2;
+ goto L_main_menu_proposal;
goto L_main_menu;
L_give_water:
@@ -269,7 +269,7 @@ L_give_water:
next;
if (@wg_state == 12)
- goto L_main_menu2;
+ goto L_main_menu_proposal;
goto L_main_menu;
L_main_menu:
@@ -292,26 +292,11 @@ L_Fur:
next;
goto L_main_menu;
-L_main_menu2:
+L_main_menu_proposal:
menu
- "Can you trim something for me?", L_trim,
- "Can you lengthen something for me?", L_lengthen,
- "Can you make me a shirt?", L_shirt,
- "Can you make me a tank top?", L_tanktop,
- "Can you make me a cape?", L_cape,
- "Can you make fur boots for me?", L_Fur1,
- "Can you make winter gloves me?", L_Fur1,
- "Can you sew a robe for me?", L_robe,
- "Can you make a desert hat for me?", L_desert_hat,
"Actually...I have a proposal for you...", L_agostine_proposal,
"Goodbye for now.", L_end;
-L_Fur1:
- mes "[Lora Tay the Seamstress]";
- mes "\"From what? Fluffy fur? I won't work with such lowly materials.\"";
- next;
- goto L_main_menu2;
-
L_agostine_proposal:
mes "[Lora Tay the Seamstress]";
mes "\"What kind of proposal are you asking of me?\"";
@@ -319,7 +304,7 @@ L_agostine_proposal:
menu
"I have talked to Agostine and he needs your help.", L_Next1,
- "I forgot...", L_main_menu2;
+ "I forgot...", L_end;
L_Next1:
mes "[Lora Tay the Seamstress]";