fiddlerwoaroof/crawl - Change AQFXAOOWKVZBMJB6WMW3IUZMX6XERZ6ZSFGNGNKIKWLX4OWOQEYAC

Really fix pickup.lua not to search for a butchering tool if you're

wielding a cursed sharp-edged weapon. (My previous "fix" was preventing auto-picking up a butchering tool, at all!)

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6031 c06c8d41-db1a-0410-9941-cceddc491573

Created by j-p-e-g on June 21, 2008

AQFXAOOWKVZBMJB6WMW3IUZMX6XERZ6ZSFGNGNKIKWLX4OWOQEYAC

Dependencies

[2] SDLKLUNFGVKDS55DDJZCBAVIB7NL3RRYPTACAY65SCUQKV6APFSAC

In channels

main

Change contents

Insertion in crawl-ref/source/clua.cc at line 1144 [2.483969]

[2.508220]

    LUA_ITEM(item, 1);
    if (!item || !in_inventory(*item))
        return (0);
    int eq = get_equip_slot(item);
    if (eq < 0 || eq >= NUM_EQUIP)
        return (0);
    return (1);
}
// Returns item equipped in a slot defined in an argument.
static int l_item_equipped_at(lua_State *ls)
{

Replacement in crawl-ref/source/clua.cc at line 1498 [2.483969]

B:BD[2.515801] → [2.515801:515847]

    { "equipped_at",       l_item_equipped },

[2.515801]

[2.515847]

    { "equipped_at",       l_item_equipped_at },
    { "equipped",          l_item_equipped },