fiddlerwoaroof/crawl - Change Q5YUZONIIPGRWOIQNL6DHRGLKF4V3K5XSZCBH2SL7DP4WPLDNOSQC

Move pickup_butcher_tool.txt into (the recently freed) pickup.lua,

re-enable it (whoops) and clean up its code.

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

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

Q5YUZONIIPGRWOIQNL6DHRGLKF4V3K5XSZCBH2SL7DP4WPLDNOSQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/items.cc at line 2250 [7.2584728]

[6.6806]

[4.2718]

#ifdef CLUA_BINDINGS
                    && clua.callbooleanfn(true, "ch_autopickup", "u", &item)
#endif

Deletion in crawl-ref/source/itemname.cc at line 2344 [7.2667494]
B:BD[8.3146] → [6.11761:11817]
∅:D[9.3495] → [8.3172:3173]
∅:D[6.11817] → [8.3172:3173]
B:BD[8.3172] → [8.3172:3173]
```
    if (!item_type_known(item))
        return (false);
```

Insertion in crawl-ref/source/itemname.cc at line 2348 [7.2667494]

[6.11922]


    case OBJ_BOOKS:
        return (item.sub_type != BOOK_DESTRUCTION
                && item.sub_type != BOOK_MANUAL && you.religion == GOD_TROG);

Insertion in crawl-ref/source/itemname.cc at line 2354 [7.2667494]

[6.11945]

[4.3316]

        if (!item_type_known(item))
            return (false);

Insertion in crawl-ref/source/itemname.cc at line 2375 [7.2667494]

[6.12290]

[4.3358]

        if (!item_type_known(item))
            return (false);

Insertion in crawl-ref/source/itemname.cc at line 2420 [7.2667494]

[6.13344]

        if (!item_type_known(item))
            return (false);

Replacement in crawl-ref/source/item_use.cc at line 865 [7.2781507]
B:BD[10.735227] → [10.735227:735269]
```
    if (sub_type == ARM_CENTAUR_BARDING)
```
[10.735227]
[10.735269]
```
    else if (sub_type == ARM_CENTAUR_BARDING)
```
Replacement in crawl-ref/source/item_use.cc at line 923 [7.2781507]
B:BD[7.2800413] → [7.2800413:2800432]
```
        // it fits
```
[7.2800413]
[11.1754]
```
        // It fits.
```
Replacement in crawl-ref/source/item_use.cc at line 930 [7.2781507]
B:BD[7.2800639] → [7.2800639:2800658]
```
        // it fits
```
[7.2800639]
[11.1844]
```
        // It fits.
```

Replacement in crawl-ref/source/item_use.cc at line 978 [7.2781507]

B:BD[7.2801361] → [7.2801361:2801425]

    if ((you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE)

[7.2801361]

[7.2801425]

    if (you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE

Replacement in crawl-ref/source/item_use.cc at line 981 [7.2781507]

B:BD[7.2801473] → [10.735929:736103]

        if ((sub_type >= ARM_LEATHER_ARMOUR
                && sub_type <= ARM_PLATE_MAIL)
            || (sub_type >= ARM_GLOVES
                && sub_type <= ARM_BUCKLER)

[7.2801473]

[10.736103]

        if (sub_type >= ARM_LEATHER_ARMOUR
               && sub_type <= ARM_PLATE_MAIL
            || sub_type >= ARM_GLOVES
               && sub_type <= ARM_BUCKLER

Replacement in crawl-ref/source/invent.cc at line 822 [7.2920632]

B:BD[12.379866] → [3.2700:2771]

∅:D[3.2771] → [12.379936:379990]

B:BD[12.379936] → [12.379936:379990]

    const char *luafn = selector == OSEL_WIELD ? "ch_item_wieldable" :
                                                NULL;

[12.379866]

[12.379990]

    const char *luafn = selector == OSEL_WIELD ? "ch_item_wieldable"
                                               : NULL;

Replacement in crawl-ref/source/invent.cc at line 832 [7.2920632]

B:BD[12.380149] → [13.3052:3145]

    return _item_class_selected(i, selector)
        || _userdef_item_selected(i, selector);

[12.380149]

[12.380240]

    return (_item_class_selected(i, selector)
            || _userdef_item_selected(i, selector));

Replacement in crawl-ref/source/invent.cc at line 840 [7.2920632]

B:BD[12.380366] → [13.3229:3311]

        if (is_valid_item(you.inv[i]) && _is_item_selected(you.inv[i], selector))

[12.380366]

[12.380447]

        if (is_valid_item(you.inv[i])
            && _is_item_selected(you.inv[i], selector))
        {

Insertion in crawl-ref/source/invent.cc at line 844 [7.2920632]
[12.380487]
[12.380487]
```
        }
```

Insertion in crawl-ref/source/food.cc at line 188 [7.3043806]

[14.2788]

        // No switching necessary.
        if (can_cut_meat( *wpn ))
            return (false);

Deletion in crawl-ref/source/food.cc at line 202 [7.3043806]
B:BD[14.3116] → [15.11726:11761]
∅:D[15.11761] → [16.3630:3692]
B:BD[16.3630] → [16.3630:3692]
```
        // No switching necessary.
        if (can_cut_meat( *wpn ))
            return (false);
```

Insertion in crawl-ref/source/enum.h at line 2772 [7.3287960]

[17.4376]

[7.3376769]

};
enum montravel_target_type
{
    MTRAV_NONE = 0,
    MTRAV_PLAYER,       // Travelling to reach the player.
    MTRAV_PATROL,       // Travelling to reach the patrol point.
    MTRAV_UNREACHABLE   // Not travelling because player is unreachable.

File addition: pickup.lua (----------)

[18.2861]

---------------------------------------------------------------------------
-- eat.lua:
-- Pick up a butchering weapon if we don't already have one.
-- This requires ) to be in the autopickup option line.
--
-- To use this, add this line to your init.txt:
--   lua_file = lua/pickup.lua
---------------------------------------------------------------------------
function can_butcher(it)
    if item.name(it):find("distort", 0, true) then
        return false
    end
    local skill = item.weap_skill(it)
    -- Have to handle polearms separately, since only some of them can butcher.
    if skill == "Polearms" or skill == "Staves" then
        local butcherable_polearms = {
            "scythe", "lajatang", "halberd", "bardiche", "glaive"
        }
        for _, weap in ipairs(butcherable_polearms) do
            if string.find( item.name(it, "a"), weap ) then
               return true 
            end
        end
        return false
    else
        return string.find( skill, "Blades" ) or skill == "Axes"
    end
end
function ch_autopickup(it)
    if item.class(it, true) == "weapon" then
        -- Trolls and Ghouls don't need weapons to butcher things, and Mummies
        -- and Spriggans can't eat chunks. Ideally, we could detect a player
        -- with the claws mutation here too, but that's not currently possible.
        if you.race() == "Troll"
           or you.race() == "Ghoul"
           or you.race() == "Mummy"
           or you.race() == "Spriggan" then
            return false
        end
        -- The item is not a good butchering tool, either.
        if item.cursed(it) or not can_butcher(it) then
            return false
        end
        -- Check the inventory for butchering tools.
        local inv = item.inventory()
        for _, inv_it in ipairs(inv) do
            if item.class(inv_it, true) == "weapon"
               and can_butcher(inv_it) 
               and not item.cursed(inv_it) then
                return false
            end
        end
    end
    -- If we got here, we found no butchering tool in the inventory
    -- AND this weapon is a good candidate tool for a butchering tool.
    -- Ergo: pick it up.
    return true
end

Replacement in crawl-ref/source/clua.cc at line 933 [12.483969]

B:BD[12.503734] → [12.503734:503886]

    if (slot1 < 0 || slot1 >= ENDOFPACK ||
            slot2 < 0 || slot2 >= ENDOFPACK ||
            slot1 == slot2 || !is_valid_item(you.inv[slot1]))

[12.503734]

[12.503886]

    if (slot1 < 0 || slot1 >= ENDOFPACK
        || slot2 < 0 || slot2 >= ENDOFPACK
        || slot1 == slot2 || !is_valid_item(you.inv[slot1]))
    {

Insertion in crawl-ref/source/clua.cc at line 938 [12.483969]
[12.503906]
[19.16182]
```
    }
```

Replacement in crawl-ref/source/clua.cc at line 1404 [12.483969]

B:BD[12.512649] → [12.512649:512755]

        int slot = in_inventory(*item)? item->link :
                        letter_to_index(item->slot);

[12.512649]

[12.512755]

        int slot = in_inventory(*item) ? item->link
                                       : letter_to_index(item->slot);

Replacement in crawl-ref/source/clua.cc at line 1691 [12.483969]

B:BD[12.520016] → [12.520016:520100]

    { "do_eat",         food_do_eat },
    { "prompt_floor",   food_prompt_floor },

[12.520016]

[12.520100]

    { "do_eat",           food_do_eat },
    { "prompt_floor",     food_prompt_floor },

Replacement in crawl-ref/source/clua.cc at line 1694 [12.483969]

B:BD[12.520151] → [12.520151:520307]

    { "can_eat",        food_can_eat },
    { "eat",            food_eat },
    { "rotting",        food_rotting },
    { "ischunk",        food_ischunk },

[12.520151]

[12.520307]

    { "can_eat",          food_can_eat },
    { "eat",              food_eat },
    { "rotting",          food_rotting },
    { "ischunk",          food_ischunk },

Replacement in crawl-ref/source/clua.cc at line 2205 [12.483969]

B:BD[12.528997] → [12.528997:529055]

B:BD[12.529195] → [12.529195:529313]

    { "easy_open", &Options.easy_open, option_hboolean },
    { "colour_map", &Options.colour_map, option_hboolean },
    { "clean_map", &Options.clean_map, option_hboolean },

[12.528997]

[12.529313]

    { "easy_open",     &Options.easy_open, option_hboolean },
    { "colour_map",    &Options.colour_map, option_hboolean },
    { "clean_map",     &Options.clean_map, option_hboolean },

Replacement in crawl-ref/source/clua.cc at line 2209 [12.483969]

B:BD[12.529443] → [12.529443:529501]

B:BD[12.529501] → [10.1206356:1206483]

∅:D[10.1206483] → [12.529563:529627]

B:BD[12.529563] → [12.529563:529627]

    { "easy_open", &Options.easy_open, option_hboolean },
    { "easy_armour", &Options.easy_unequip, option_hboolean },
    { "easy_unequip", &Options.easy_unequip, option_hboolean },
    { "easy_butcher", &Options.easy_butcher, option_hboolean },

[12.529379]

[20.999]

    { "easy_open",     &Options.easy_open, option_hboolean },
    { "easy_armour",   &Options.easy_unequip, option_hboolean },
    { "easy_unequip",  &Options.easy_unequip, option_hboolean },
    { "easy_butcher",  &Options.easy_butcher, option_hboolean },

Replacement in crawl-ref/source/clua.cc at line 2214 [12.483969]

B:BD[10.1206652] → [21.2251:2319]

    { "default_target", &Options.default_target, option_hboolean },

[20.1083]

[22.1574]

    { "default_target",       &Options.default_target, option_hboolean },

Replacement in crawl-ref/source/clua.cc at line 2216 [12.483969]

∅:D[22.1654] → [10.1206722:1206790]

B:BD[10.1206722] → [10.1206722:1206790]

∅:D[10.1206848] → [12.529687:529889]

B:BD[12.529687] → [12.529687:529889]

B:BD[12.529992] → [12.529992:530126]

∅:D[10.1206909] → [12.530126:530256]

B:BD[12.530126] → [12.530126:530256]

    { "note_skill_max", &Options.note_skill_max, option_hboolean },
    { "delay_message_clear", &Options.delay_message_clear, option_hboolean },
    { "no_dark_brand", &Options.no_dark_brand, option_hboolean },
    { "auto_list", &Options.auto_list, option_hboolean },
    { "pickup_thrown", &Options.pickup_thrown, option_hboolean },
    { "pickup_dropped", &Options.pickup_dropped, option_hboolean },
    { "show_waypoints", &Options.show_waypoints, option_hboolean },
    { "item_colour", &Options.item_colour, option_hboolean },

[22.1654]

[12.530256]

    { "note_skill_max",       &Options.note_skill_max, option_hboolean },
    { "delay_message_clear",  &Options.delay_message_clear, option_hboolean },
    { "no_dark_brand",   &Options.no_dark_brand, option_hboolean },
    { "auto_list",       &Options.auto_list, option_hboolean },
    { "pickup_thrown",   &Options.pickup_thrown, option_hboolean },
    { "pickup_dropped",  &Options.pickup_dropped, option_hboolean },
    { "show_waypoints",  &Options.show_waypoints, option_hboolean },
    { "item_colour",     &Options.item_colour, option_hboolean },

Replacement in crawl-ref/source/clua.cc at line 2225 [12.483969]

∅:D[10.1206976] → [12.530326:530456]

B:BD[12.530326] → [12.530326:530456]

    { "target_wrap", &Options.target_wrap, option_hboolean },
    { "easy_exit_menu", &Options.easy_exit_menu, option_hboolean },

[12.530326]

[19.16573]

    { "target_wrap",     &Options.target_wrap, option_hboolean },
    { "easy_exit_menu",  &Options.easy_exit_menu, option_hboolean },

Replacement in crawl-ref/source/clua.cc at line 2228 [12.483969]

B:BD[19.16650] → [23.2753:2792]

                    option_hboolean },

[19.16650]

[23.2792]

                                      option_hboolean },

Replacement in crawl-ref/source/clua.cc at line 2230 [12.483969]
∅:D[23.2963] → [12.530534:530573]
∅:D[19.16650] → [12.530534:530573]
B:BD[12.530534] → [12.530534:530573]
```
                    option_hboolean },
```
[23.2861]
[12.530573]
```
                                  option_hboolean },
```

File deletion: pickup_butcher_tool.txt

BF:BFD[24.3846] → [25.4766:4813]

BF:BFD[25.4813] → [25.3023:3023]

B:BD[25.3023] → [25.3024:3084]

B:BD[25.3139] → [25.3139:3144]

∅:D[5.3772] → [25.3296:3325]

B:BD[25.3296] → [25.3296:3325]

∅:D[5.3872] → [25.3747:3768]

B:BD[25.3747] → [25.3747:3768]

B:BD[25.3841] → [25.3841:3849]

B:BD[25.3849] → [5.3873:3889]

∅:D[5.3889] → [25.3849:3853]

B:BD[25.3849] → [25.3849:3853]

∅:D[26.3950] → [25.4748:4756]

B:BD[25.4748] → [25.4748:4756]

∅:D[5.4292] → [25.4756:4760]

B:BD[25.4756] → [25.4756:4760]

B:BD[25.4760] → [26.3951:3993]

B:BD[25.4756] → [5.4128:4292]

∅:D[5.4127] → [26.3929:3950]

B:BD[25.4711] → [26.3929:3950]

B:BD[25.3853] → [5.3890:4127]

B:BD[25.3325] → [5.3773:3872]

B:BD[25.3144] → [5.3697:3772]

# Pick up a butchering weapon if we don't already have one 
< do
        return false
    end
        return false
    end
    return true
end
    end
end
add_autopickup_func(pickup_butcher)
end >
    for _, inv_it in pairs(item.inventory()) do
        if can_butcher(inv_it, item.name(inv_it)) then
            return false
        end
    end
    return true
        return false
function pickup_butcher(it, name)
    if you.has_claws() > 0 then
        return false
    end
    if not you.can_consume_corpses() and not you.god_likes_butchery() then
        return false
    end
    if not can_butcher(it, name) then
    if item.cursed(it) then
        return false
    end
    if name:find("distort", 0, true) then
local function can_butcher(it, name)
    if not item.can_cut_meat(it) then

Insertion in crawl-ref/settings/init.txt at line 83 [7.4830895]
[27.2337]
[2.2773]
```
lua_file = lua/pickup.lua
```

Replacement in crawl-ref/settings/init.txt at line 94 [7.4830895]

B:BD[25.10856] → [25.10856:10989]

B:BD[25.10989] → [28.2788:2822]

# lua routines for automatically picking up one butchering tool
# This require ) in autopickup and no further weapons are picked up.
include = pickup_butcher_tool.txt

[25.10856]

[25.11021]

# Note that ")" have to be in the above list for pickup.lua
# (autopickup a butchering tool if you don't already have one)
# to work.

Replacement in crawl-ref/docs/options_guide.txt at line 322 [27.63392]
B:BD[29.9005] → [29.9005:9032]
```
                   Others)
```
[29.9005]
[29.9032]
```
                   Others).
```
Replacement in crawl-ref/docs/options_guide.txt at line 324 [27.63392]
B:BD[29.9099] → [29.9099:9126]
```
                   running
```
[29.9099]
[29.9126]
```
                   running.
```
Replacement in crawl-ref/docs/options_guide.txt at line 328 [27.63392]
B:BD[29.9321] → [29.9321:9346]
```
                   macro
```
[29.9321]
[30.7877]
```
                   macro.
```

Replacement in crawl-ref/docs/options_guide.txt at line 331 [27.63392]

B:BD[30.7997] → [31.1482:1521]

  pickup.lua    -- smarter autopickup.

[30.7997]

[29.9347]

  pickup.lua    -- allows autopickup of a butchering tool if you don't
                   already have one.