summaryrefslogtreecommitdiff
path: root/npc/merchants/socket_enchant2.txt
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2017-11-18 20:05:20 +0100
committerGitHub <noreply@github.com>2017-11-18 20:05:20 +0100
commit7b2f685d9fa8a2998b424c003d7a1386f76d45db (patch)
treea5f118370396e8168c5aa84b4fb105951157d35c /npc/merchants/socket_enchant2.txt
parenta63c82c8bd29fd829a5d8cfba7d02d11cf4634c5 (diff)
parent42248822bf5348c7cbf33efbdf12873bea11ff38 (diff)
downloadhercules-7b2f685d9fa8a2998b424c003d7a1386f76d45db.tar.gz
hercules-7b2f685d9fa8a2998b424c003d7a1386f76d45db.tar.bz2
hercules-7b2f685d9fa8a2998b424c003d7a1386f76d45db.tar.xz
hercules-7b2f685d9fa8a2998b424c003d7a1386f76d45db.zip
Merge pull request #1902 from MishimaHaruna/getiteminfo-fix
getiteminfo() / setiteminfo() fixes
Diffstat (limited to 'npc/merchants/socket_enchant2.txt')
-rw-r--r--npc/merchants/socket_enchant2.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index 98d33b01c..29573970d 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -425,8 +425,8 @@ function script Func_Socket2 {
mes "[Leablem]";
mes "Did you already bring all of them?";
mes "For your information, if you fail to create a slot,";
- mes "you will lose all the item requirement as well as the target " + (getiteminfo(getarg(0),5)&2 ? "weapon" : "armor") + "."; // EQP_HAND_R = 2, it's a weapon, otherwise armor
- mes "Also remember, if the " + (getiteminfo(getarg(0),5)&2 ? "weapon" : "armor") + " has been upgraded, and has been inserted with a card,";
+ mes "you will lose all the item requirement as well as the target " + ((getiteminfo(getarg(0), ITEMINFO_LOC) & EQP_HAND_R) ? "weapon" : "armor") + "."; // EQP_HAND_R = 2, it's a weapon, otherwise armor
+ mes "Also remember, if the " + ((getiteminfo(getarg(0), ITEMINFO_LOC) & EQP_HAND_R) ? "weapon" : "armor") + " has been upgraded, and has been inserted with a card,";
mes "you will lose them even if you succeed in creating a slot.";
next;
switch(select("Ask for slot creation.", "Try next time."))