diff options
| author | Haru <haru@dotalux.com> | 2017-11-18 20:05:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-18 20:05:20 +0100 |
| commit | 7b2f685d9fa8a2998b424c003d7a1386f76d45db (patch) | |
| tree | a5f118370396e8168c5aa84b4fb105951157d35c /npc/custom/itembind.txt | |
| parent | a63c82c8bd29fd829a5d8cfba7d02d11cf4634c5 (diff) | |
| parent | 42248822bf5348c7cbf33efbdf12873bea11ff38 (diff) | |
| download | hercules-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/custom/itembind.txt')
| -rw-r--r-- | npc/custom/itembind.txt | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/npc/custom/itembind.txt b/npc/custom/itembind.txt index 8c51ad24d..7d95afdfc 100644 --- a/npc/custom/itembind.txt +++ b/npc/custom/itembind.txt @@ -35,14 +35,10 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{ //Allows equipment (default) or non-rental item if (@inventorylist_bound[.@i] || @inventorylist_expire[.@i]) continue; - if (((.allowbind & 1) && (getiteminfo(@inventorylist_id[.@i], 2) == IT_WEAPON || getiteminfo(@inventorylist_id[.@i], 2) == IT_ARMOR)) || - ((.allowbind & 2) && - (getiteminfo(@inventorylist_id[.@i], 2) == IT_HEALING || getiteminfo(@inventorylist_id[.@i], 2) == IT_USABLE || - getiteminfo(@inventorylist_id[.@i], 2) == IT_DELAYCONSUME || getiteminfo(@inventorylist_id[.@i], 2) == IT_CASH)) || - ((.allowbind & 4) && - (getiteminfo(@inventorylist_id[.@i], 2) == IT_ETC || getiteminfo(@inventorylist_id[.@i], 2) == IT_CARD || - getiteminfo(@inventorylist_id[.@i], 2) == IT_PETEGG || getiteminfo(@inventorylist_id[.@i], 2) == IT_PETARMOR || - getiteminfo(@inventorylist_id[.@i], 2) == IT_AMMO)) + .@itemtype = getiteminfo(@inventorylist_id[.@i], ITEMINFO_TYPE); + if (((.allowbind & 1) != 0 && (.@itemtype == IT_WEAPON || .@itemtype == IT_ARMOR)) + || ((.allowbind & 2) != 0 && (.@itemtype == IT_HEALING || .@itemtype == IT_USABLE || .@itemtype == IT_DELAYCONSUME || .@itemtype == IT_CASH)) + || ((.allowbind & 4) != 0 && (.@itemtype == IT_ETC || .@itemtype == IT_CARD || .@itemtype == IT_PETEGG || .@itemtype == IT_PETARMOR || .@itemtype == IT_AMMO)) ) { set .@bindlist$, .@bindlist$ + ":" + getitemname(@inventorylist_id[.@i]) + " - " + @inventorylist_id[.@i]; set .@bindlist[.@j],.@i; |