Merge pull request #366 from wushin/airlia-fix

Replace getitemlink with getitemname in menu

3 files changed, 13 insertions, 11 deletions

diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt
index ca317181..f2c454fd 100644
--- a/world/map/npc/006-1/miriam.txt
+++ b/world/map/npc/006-1/miriam.txt
@@ -209,7 +209,7 @@ L_offer:
     if (!(getskilllv(SKILL_POOL)))
         goto L_noskill;
     menu
-        "Yes, I look really good in this " +@torso$+ ".",L_TorsoNext;
+        "Yes, I look really good in this.",L_TorsoNext;
 
 L_TorsoNext:
     mes "[Miriam]";
diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt
index 6f4be2bd..71726331 100644
--- a/world/map/npc/009-2/airlia.txt
+++ b/world/map/npc/009-2/airlia.txt
@@ -171,6 +171,7 @@ L_Fetch:
     mes "[Airlia]";
     mes "\"Thank you for helping my father.\"";
     next;
+    mes "\"Have you collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "?\"";
 
     // Make sure to check if the player has a letter to deliver.
     // If the check is not made then there is a bug, where the player
@@ -179,13 +180,13 @@ L_Fetch:
 
     if (QUEST_Graveyard_Caretaker < @Q_STATUS_HAS_NEW_LETTER)
         menu
-            "You are welcome.", L_Close,
-            "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
+            "Yes.", L_Fetch_initial_reward,
+            "No.", L_Close;
     if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NEW_LETTER)
         menu
-            "You are welcome.", L_Close,
             "I have another letter from your father.", L_later_rewards,
-            "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
+            "Yes.", L_Fetch_initial_reward,
+            "No.", L_Close;
     goto L_Close;
 
 L_Fetch_initial_reward:
@@ -230,15 +231,16 @@ L_Rewarded:
     mes "[Airlia]";
     mes "\"Thank you for your help.\"";
     next;
+    mes "\"Have you collected the " + @FETCH_AMOUNT + " " + getitemlink(@FETCH_LABEL$) + "s?\"";
     if (QUEST_Graveyard_Caretaker < @Q_STATUS_HAS_NEW_LETTER)
         menu
-            "You are welcome.", L_Close,
-            "I have collected the " + @FETCH_AMOUNT + " " + getitemlink(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
+            "Yes.", L_Fetch_later_rewards,
+            "No.", L_Close;
     if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NEW_LETTER)
         menu
-            "You are welcome.", L_Close,
             "I have another letter from your father.", L_later_rewards,
-            "I have collected the " + @FETCH_AMOUNT + " " + getitemlink(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
+            "Yes.", L_Fetch_later_rewards,
+            "No.", L_Close;
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/012-1/injured-mouboo.txt b/world/map/npc/012-1/injured-mouboo.txt
index 63eb2996..de4b8edf 100644
--- a/world/map/npc/012-1/injured-mouboo.txt
+++ b/world/map/npc/012-1/injured-mouboo.txt
@@ -97,6 +97,7 @@ L_pickup_alive:
 L_give:
     set @items_nr, 12;
     setarray @items$, "CactusDrink", "CactusPotion", "ChocolateBar", "Milk", "OrangeCupcake", "RedApple", "Beer", "BottleOfWater", "TinyHealingPotion", "SmallHealingPotion", "MediumHealingPotion", "LargeHealingPotion";
+    setarray @itemnames$, "Cactus Drink", "Cactus Potion", "Chocolate Bar", "Milk", "Orange Cupcake", "Red Apple", "Beer", "Bottle of Water", "Tiny Healing Potion", "Small Healing Potion", "Medium Healing Potion", "Large Healing Potion";
     setarray @itemeat, 0,   0,   1,   0,   1,   1,   0,   1,   0,   0,   0,   0;
 
     setarray @menuItems$, "", "", "", "", "", "", "", "", "", "", "", "", "";
@@ -113,8 +114,7 @@ L_nloop:
     if (countitem(@k$) == 0)
         goto L_nloop_skip;
 
-    set @name$, getitemlink(@k$);
-    set @menuItems$[@ct], @name$;
+    set @menuItems$[@ct], @itemnames$[@n];
     set @menuNames$[@ct], @k$;
     set @choice_eat[@ct], @itemeat[@n];
     set @ct, @ct + 1;