Merge pull request #274 from mekolat/hetchel-tears

make hetchel use the dynamic menu

1 files changed, 10 insertions, 8 deletions

diff --git a/world/map/npc/002-2/hetchel.txt b/world/map/npc/002-2/hetchel.txt
index d87c1f64..8aecea94 100644
--- a/world/map/npc/002-2/hetchel.txt
+++ b/world/map/npc/002-2/hetchel.txt
@@ -116,11 +116,15 @@ L_Spants_Cry_Cont_1:
         "\"Oh really? Just sell me some Silk Sheets if you have them\"", L_main_menu;
 
 L_Spants_Wipe_Tears:
-    mes "Hand Hetchel a (please type the Item you want to give her)";
+    mes "Choose the item you want to give her.";
     next;
-    mes "This is case sensitive. Also do not enter whitespaces.";
-    input @spants_wipe_thingy$;
-    if (@spants_wipe_thingy$ == "") goto L_Spants_Wrong;
+    cleararray @items$, "", getarraysize(@items$);
+    cleararray @item_names$, "", getarraysize(@item_names$);
+    setarray @items$, "RedCottonCloth", "GreenCottonCloth", "DarkBlueCottonCloth", "YellowCottonCloth", "LightBlueCottonCloth", "PinkCottonCloth", "BlackCottonCloth", "OrangeCottonCloth", "PurpleCottonCloth", "DarkGreenCottonCloth", "HitchhikersTowel", "WhiteHitchhikersTowel", "RedHitchhikersTowel", "GreenHitchhikersTowel", "BlueHitchhikersTowel", "YellowHitchhikersTowel", "PurpleHitchhikersTowel", "OrangeHitchhikersTowel", "PinkHitchhikersTowel", "TealHitchhikersTowel", "LimeHitchhikersTowel", "SnakeSkin", "LeatherPatch", "SnakeTongue", "MountainSnakeTongue", "GrassSnakeTongue", "CaveSnakeTongue", "BatWing", "RottenRags", "BrokenDoll", "RedDottedWrap", "BlueDottedWrap", "PurpleStripedWrap", "RedGoldenStripedWrap", "GreenRedStripedWrap", "YellowWrap", "WhiteWrap", "BlueWrap", "PurpleWrap", "GreenWrap", "Doll", "BookPage";
+    setarray @item_names$, "Red Cotton Cloth", "Green Cotton Cloth", "Dark Blue Cotton Cloth", "Yellow Cotton Cloth", "Light Blue Cotton Cloth", "Pink Cotton Cloth", "Black Cotton Cloth", "Orange Cotton Cloth", "Purple Cotton Cloth", "Dark Green Cotton Cloth", "Hitchhiker's Towel", "White Hitchhiker's Towel", "Red Hitchhiker's Towel", "Green Hitchhiker's Towel", "Blue Hitchhiker's Towel", "Yellow Hitchhiker's Towel", "Purple Hitchhiker's Towel", "Orange Hitchhiker's Towel", "Pink Hitchhiker's Towel", "Teal Hitchhiker's Towel", "Lime Hitchhiker's Towel", "Snake Skin", "Leather Patch", "Snake Tongue", "Mountain Snake Tongue", "Grass Snake Tongue", "Cave Snake Tongue", "Bat Wing", "Rotten Rags", "Broken Doll", "Red Dotted Wrap", "Blue Dotted Wrap", "Purple Striped Wrap", "Red Golden Striped Wrap", "Green Red Striped Wrap", "Yellow Wrap", "White Wrap", "Blue Wrap", "Purple Wrap", "Green Wrap", "Doll", "Book Page";
+    callfunc "DynamicItemMenu$";
+    set @spants_wipe_thingy$, @item$;
+    if (@spants_wipe_thingy$ == "") goto L_Close;
     if (countitem(@spants_wipe_thingy$) < 1) goto L_Spants_No_Item;
     if (@spants_wipe_thingy$ == "RedCottonCloth") goto L_Spants_Wipe_Tears_Cont;
     if (@spants_wipe_thingy$ == "RedHitchhikersTowel") goto L_Spants_Wipe_Tears_Towel;
@@ -135,10 +139,6 @@ L_Spants_Wipe_Tears_Towel:
     mes "\"No, I recognize this towel, it is one of those warping towels, are you trying to mess with me?\"";
     goto L_Close;
 
-L_Spants_Wrong:
-    mes "It appears you forgot to type the item you want to give.";
-    goto L_Close;
-
 L_Spants_No_Item:
     mes "Oh you do not have it.";
     goto L_Close;
@@ -405,6 +405,8 @@ L_Close:
     set @SHEET_ZENY, 0;
     set @SheetCount, 0;
     set @wg_state, 0;
+    cleararray @items$, "", getarraysize(@items$);
+    cleararray @item_names$, "", getarraysize(@item_names$);
     close;
 }