Merge pull request #353 from mekolat/getitemname

deprecate getitemname and getequipname

9 files changed, 16 insertions, 16 deletions

diff --git a/world/map/npc/002-2/bleacher.txt b/world/map/npc/002-2/bleacher.txt
index 2853bb73..21f0efd1 100644
--- a/world/map/npc/002-2/bleacher.txt
+++ b/world/map/npc/002-2/bleacher.txt
@@ -94,7 +94,7 @@ L_MenuItems:
     if (Zeny < 5000) goto L_no_money;
     set @m, @menu - 2;
     set @it$, $@DYE_colors$[@CANDIDE_color[@m]] + $@DYE_items$[@CANDIDE_items[@m]];
-    if(getitemname(@it$) == "Unknown Item") mapexit;
+    if(getitemlink(@it$) == "Unknown Item") mapexit;
     delitem @it$, 1;
     delitem "PileOfAsh", 3;
     set Zeny, Zeny - 5000;
diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt
index 6580664f..f513955b 100644
--- a/world/map/npc/006-1/miriam.txt
+++ b/world/map/npc/006-1/miriam.txt
@@ -162,7 +162,7 @@ L_teach:
 
 L_Prepared:
     set @agi, readparam(bAgi);
-    set @torso$, getitemname(getequipid(equip_torso));
+    set @torso$, getitemlink(getequipid(equip_torso));
     set @weight, MaxWeight/Weight;
     if (@weight < 3)
         goto L_heavyweight;
diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt
index 62c76e38..6f4be2bd 100644
--- a/world/map/npc/009-2/airlia.txt
+++ b/world/map/npc/009-2/airlia.txt
@@ -163,7 +163,7 @@ L_Next2:
 
 L_intro_proof:
     mes "[Airlia]";
-    mes "\"Let's say " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s. You don't know how much this means to me, thank you.\"";
+    mes "\"Let's say " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "s. You don't know how much this means to me, thank you.\"";
     set QUEST_Airlia, @Q_STATUS_HELP_AIRLIA;
     close;
 
@@ -180,12 +180,12 @@ L_Fetch:
     if (QUEST_Graveyard_Caretaker < @Q_STATUS_HAS_NEW_LETTER)
         menu
             "You are welcome.", L_Close,
-            "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
+            "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
     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 + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
+            "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
     goto L_Close;
 
 L_Fetch_initial_reward:
@@ -233,12 +233,12 @@ L_Rewarded:
     if (QUEST_Graveyard_Caretaker < @Q_STATUS_HAS_NEW_LETTER)
         menu
             "You are welcome.", L_Close,
-            "I have collected the " + @FETCH_AMOUNT + " " + getitemname(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
+            "I have collected the " + @FETCH_AMOUNT + " " + getitemlink(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
     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 + " " + getitemname(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
+            "I have collected the " + @FETCH_AMOUNT + " " + getitemlink(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index 80abfdcc..c3f2c638 100644
--- a/world/map/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
@@ -140,7 +140,7 @@ L_explain_dye:
     goto L_Close;
 
 L_finish:
-    if(getitemname($@DYE_colors$[@colour] + @item_del$) == "Unknown Item") mapexit;
+    if(getitemlink($@DYE_colors$[@colour] + @item_del$) == "Unknown Item") mapexit;
     if(countitem(@item_del$) < 1) goto L_havenone;
     delitem @item$, 1;
     delitem @item_del$, 1;
diff --git a/world/map/npc/012-1/injured-mouboo.txt b/world/map/npc/012-1/injured-mouboo.txt
index 09e27c80..63eb2996 100644
--- a/world/map/npc/012-1/injured-mouboo.txt
+++ b/world/map/npc/012-1/injured-mouboo.txt
@@ -113,7 +113,7 @@ L_nloop:
     if (countitem(@k$) == 0)
         goto L_nloop_skip;
 
-    set @name$, getitemname(@k$);
+    set @name$, getitemlink(@k$);
     set @menuItems$[@ct], @name$;
     set @menuNames$[@ct], @k$;
     set @choice_eat[@ct], @itemeat[@n];
@@ -156,7 +156,7 @@ L_MenuItems:
 
 L_consume:
     mes "[Injured Mouboo]";
-    mes "The mouboo " + @verb$ + " your " + getitemname(@choice$) + ".";
+    mes "The mouboo " + @verb$ + " your " + getitemlink(@choice$) + ".";
     delitem @choice$, 1;
     next;
     if (@choice$ == "LargeHealingPotion")
diff --git a/world/map/npc/029-1/rewards_master.txt b/world/map/npc/029-1/rewards_master.txt
index acfafc58..1ed99ac2 100644
--- a/world/map/npc/029-1/rewards_master.txt
+++ b/world/map/npc/029-1/rewards_master.txt
@@ -136,7 +136,7 @@ S_give_item:
 
     getitem @item$, 1;
 
-    mes "You received one " + getitemname(@item$) + "!";
+    mes "You received one " + getitemlink(@item$) + "!";
     return;
 
 S_give_noinv:
diff --git a/world/map/npc/annuals/halloween/trick_or_treat.txt b/world/map/npc/annuals/halloween/trick_or_treat.txt
index 24a359d2..10265382 100644
--- a/world/map/npc/annuals/halloween/trick_or_treat.txt
+++ b/world/map/npc/annuals/halloween/trick_or_treat.txt
@@ -71,7 +71,7 @@ L_MaskMemoryCheck:
 
 L_MaskMemoryYes:
     // not necessarily true
-    mes "\"I remember you, " + getequipname(equip_head) + " person. No more treats for you!\"";
+    mes "\"I remember you, " + getitemlink(getequipid(equip_head)) + " person. No more treats for you!\"";
     goto L_Close;
 
 L_MaskMemoryNo:
@@ -285,7 +285,7 @@ L_Explain:
     next;
     set @npc_check_loop, 0;
     goto L_NpcCheckLoop;
-    
+
 L_NpcCheckLoop:
     mes $@halloween_npc_names$[@npc_check_loop];
     next;
diff --git a/world/map/npc/functions/DyeConfig.txt b/world/map/npc/functions/DyeConfig.txt
index 1da1e734..0072dd26 100644
--- a/world/map/npc/functions/DyeConfig.txt
+++ b/world/map/npc/functions/DyeConfig.txt
@@ -23,7 +23,7 @@ OnInit:
     end;
 
 S_Array:
-    if(getitemname($@DYE_items$[$@w]) == "Unknown Item") goto L_Fail;
+    if(getitemlink($@DYE_items$[$@w]) == "Unknown Item") goto L_Fail;
     set $@c, 0;
     callsub S_Color;
     set $@w, $@w + 1;
@@ -35,7 +35,7 @@ L_Fail:
     mapexit;
 
 S_Color:
-    if(getitemname($@DYE_colors$[$@c] + $@DYE_items$[$@w]) == "Unknown Item") goto L_Fail;
+    if(getitemlink($@DYE_colors$[$@c] + $@DYE_items$[$@w]) == "Unknown Item") goto L_Fail;
     set $@c, $@c + 1;
     if($@c < getarraysize($@DYE_colors$)) goto S_Color;
     return;
diff --git a/world/map/npc/functions/default_npc_checks.txt b/world/map/npc/functions/default_npc_checks.txt
index 446cf961..deb3ba64 100644
--- a/world/map/npc/functions/default_npc_checks.txt
+++ b/world/map/npc/functions/default_npc_checks.txt
@@ -109,7 +109,7 @@ L_ReturnMissing:
     goto L_MissingMsg;
 
 L_MissingMsg:
-    mes "[@@"+@delitem_ids[@msg_loop]+"|"+getitemname(@delitem_ids[@msg_loop])+"@@] "+countitem(getitemname(@delitem_ids[@msg_loop]))+"/"+@delitem_counts[@msg_loop];
+    mes "[@@"+@delitem_ids[@msg_loop]+"|"+getitemlink(@delitem_ids[@msg_loop])+"@@] "+countitem(getitemlink(@delitem_ids[@msg_loop]))+"/"+@delitem_counts[@msg_loop];
     goto L_NextMsgCheck;
 
 L_NextMsgCheck: