fiddlerwoaroof/crawl - Change GKA3ZGZ2P6F22FDNSYNQDMCS3N7HNZD5QCOSQ6VJRAU2K5U4YYTQC

[1883949] easy_butcher will no longer switch away from a wielded distortion weapon.

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

Created by dshaligram on February 3, 2008

GKA3ZGZ2P6F22FDNSYNQDMCS3N7HNZD5QCOSQ6VJRAU2K5U4YYTQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/food.cc at line 165 [5.3043806]

[3.14348]

[4.849147]

    // If wielding a distortion weapon, never attempt to switch away
    // automatically.
    if (const item_def *wpn = you.weapon())
    {
        if (wpn->base_type == OBJ_WEAPONS
            && item_type_known(*wpn)
            && get_weapon_brand(*wpn) == SPWPN_DISTORTION)
        {
            mprf(MSGCH_WARN,
                 "You're wielding a weapon of distortion, will not autoswap "
                 "for butchering.");
            return false;
        }
    }

Replacement in crawl-ref/source/food.cc at line 189 [5.3043806]

B:BD[3.14682] → [6.2155:2237]

            && !has_warning_inscription(you.inv[i], OPER_WIELD) // don't even ask

[3.14682]

            // don't even ask
            && !has_warning_inscription(you.inv[i], OPER_WIELD)

Replacement in crawl-ref/source/food.cc at line 293 [5.3043806]

B:BD[7.921] → [2.5446:5528]

    else if ( !prechosen && (num_corpses > 1 || Options.always_confirm_butcher) )

[7.921]

[7.953]

    else if ( !prechosen
              && (num_corpses > 1 || Options.always_confirm_butcher) )