Merge pull request #500 from Ecuador-ManaWorld/LoraTay-Menus

Lora Tay: Bugs corrections and Code improvement

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]";