fiddlerwoaroof/crawl - Change WJSQFRBUSDKGMQLKIBDVXTWJQHIL45GVBAYXB43AG3NACXYE3BBQC

[1849483] Warn player when fire_items_start option is blocking selection of the only available missile (note that this doesn't entirely address the problem).

[1852034] Added greedy_items option to explore_stop to force greedy explore to stop and announce even items that it plans to pick up.

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

Created by dshaligram on December 28, 2007

WJSQFRBUSDKGMQLKIBDVXTWJQHIL45GVBAYXB43AG3NACXYE3BBQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.h at line 164 [4.29464]

B:BD[3.392] → [3.392:460]

B:BD[3.460] → [5.129:196]

    ES_STAIR              = 0x08,
    ES_SHOP               = 0x10,
    ES_ALTAR              = 0x20,
    ES_PORTAL             = 0x40

[3.392]

[4.33848]

    ES_GREEDY_ITEM        = 0x08,
    ES_STAIR              = 0x10,
    ES_SHOP               = 0x20,
    ES_ALTAR              = 0x40,
    ES_PORTAL             = 0x80

Replacement in crawl-ref/source/travel.cc at line 3991 [4.39949]

B:BD[6.4186] → [7.1389:1464]

        if (current_level && is_greed_inducing_square(current_level, pos))

[6.4186]

[6.4257]

        if (current_level
            && !(Options.explore_stop & ES_GREEDY_ITEM)
            && is_greed_inducing_square(current_level, pos))
        {

Insertion in crawl-ref/source/travel.cc at line 3996 [4.39949]
[6.4277]
[6.4277]
```
        }
```
Insertion in crawl-ref/source/libutil.h at line 169 [9.2493627]
[8.744]
[8.744]
```
    }
    T value() const
    {
        return val;
```

Insertion in crawl-ref/source/libutil.h at line 175 [9.2493627]

[8.750]


    T original_value() const
    {
        return oldval;
    }

Replacement in crawl-ref/source/item_use.cc at line 1476 [9.2781507]

B:BD[9.2811933] → [9.2811933:2811971]

        mpr("No suitable missiles.");

[9.2811933]

[10.4385]

        unwind_var<int> festart(Options.fire_items_start, 0);
        if ((item = get_fire_item_index()) == ENDOFPACK)
            mpr("No suitable missiles.");
        else
            mprf("No suitable missiles (fire_items_start = '%c', "
                 "ignoring item on '%c').",
                 index_to_letter(festart.original_value()),
                 index_to_letter(item));

Replacement in crawl-ref/source/item_use.cc at line 1490 [9.2781507]

∅:D[2.365] → [11.4435:4477]

B:BD[11.4435] → [11.4435:4477]

B:BD[11.4477] → [2.366:487]

    if (choose_fire_target(target, item))
        if (check_warning_inscriptions(you.inv[item], OPER_FIRE))
            throw_it( beam, item, false, 0, &target );

[2.365]

[2.487]

    if (choose_fire_target(target, item)
        && check_warning_inscriptions(you.inv[item], OPER_FIRE))
    {
        throw_it( beam, item, false, 0, &target );
    }

Insertion in crawl-ref/source/initfile.cc at line 1372 [9.2957258]

[3.9811]

        else if (c == "greedy_item" || c == "greedy_items")
            conditions |= ES_GREEDY_ITEM;