fiddlerwoaroof/crawl - Change ISZGDKDH3FFB42L3VK6IMFP4NE326LBC3NVR5ZUH5YMPBJL6VUZAC

Fixed greedy mode explore_stop so that "items" stops when non-autopickup

items come into view and "greedy_items" stops when autopickup items come into view.

Also added the new explore_stop conditions "glowing_items", "artefacts" and "runes", which stops greedy explore when non-autopickup items which are glowing/rune/etc, artefacts and runes (respectively) come into view.

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

Created by zelgadis on May 30, 2008

ISZGDKDH3FFB42L3VK6IMFP4NE326LBC3NVR5ZUH5YMPBJL6VUZAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.h at line 168 [3.29464]

B:BD[3.33743] → [4.256:392]

B:BD[4.392] → [5.130:299]

    ES_NONE               = 0x00,
    ES_ITEM               = 0x01,
    ES_PICKUP             = 0x02,
    ES_GREEDY_PICKUP      = 0x04,
    ES_GREEDY_ITEM        = 0x08,
    ES_STAIR              = 0x10,
    ES_SHOP               = 0x20,
    ES_ALTAR              = 0x40,
    ES_PORTAL             = 0x80

[3.33743]

[3.33848]

    ES_NONE               = 0x000,
    ES_ITEM               = 0x001,
    ES_PICKUP             = 0x002,
    ES_GREEDY_PICKUP      = 0x004,
    ES_GREEDY_ITEM        = 0x008,
    ES_STAIR              = 0x010,
    ES_SHOP               = 0x020,
    ES_ALTAR              = 0x040,
    ES_PORTAL             = 0x080,
    ES_GLOWING_ITEM       = 0x100,
    ES_ARTEFACT           = 0x200,
    ES_RUNE               = 0x400

Insertion in crawl-ref/source/travel.cc at line 677 [3.39949]

[2.1685]

#define ES_greedy (Options.explore_stop & ES_GREEDY_ITEM)
#define ES_glow   (Options.explore_stop & ES_GLOWING_ITEM)
#define ES_art    (Options.explore_stop & ES_ARTEFACT)
#define ES_rune   (Options.explore_stop & ES_RUNE)

Replacement in crawl-ref/source/travel.cc at line 694 [3.39949]
∅:D[6.551] → [7.278:295]
B:BD[8.1967] → [7.278:295]
```
    if (ES_item)
```
[6.551]
[7.295]
```
    if (ES_item || ES_greedy || ES_glow || ES_art || ES_rune)
```

Replacement in crawl-ref/source/travel.cc at line 1100 [3.39949]

B:BD[9.742] → [9.742:799]

B:BD[9.799] → [10.4244:4301]

                    if ((Options.explore_stop & ES_ITEM)
                        && prompt_stop_explore(ES_ITEM))

[9.742]

[11.1522]

                    const int estop =
                        (you.running == RMODE_EXPLORE_GREEDY) ?
                            ES_GREEDY_PICKUP : ES_PICKUP;
                    if ((Options.explore_stop & estop)
                        && prompt_stop_explore(estop))

Replacement in crawl-ref/source/travel.cc at line 3959 [3.39949]

B:BD[8.4186] → [5.301:383]

B:BD[5.383] → [10.13166:13228]

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

[8.4186]

[5.444]

        if (current_level)

Replacement in crawl-ref/source/travel.cc at line 3961 [3.39949]

∅:D[5.454] → [8.4257:4277]

∅:D[7.1464] → [8.4257:4277]

B:BD[8.4257] → [8.4257:4277]

            return;

[5.454]

[5.455]

            const bool greed_inducing =
                _is_greed_inducing_square(current_level, pos);
            if (greed_inducing && (Options.explore_stop & ES_GREEDY_ITEM))
                ; // Stop for this conditions
            else if (!greed_inducing
                     && ((Options.explore_stop & ES_ITEM)
                         || ((Options.explore_stop & ES_GLOWING_ITEM)
                             && (i.flags & ISFLAG_COSMETIC_MASK))
                         || ((Options.explore_stop & ES_ARTEFACT)
                             && (i.flags & ISFLAG_ARTEFACT_MASK))
                         || ((Options.explore_stop & ES_RUNE)
                             && is_rune(i)) ))
            {
                ; // More conditions to stop for
            }
            else
                return; // No conditions met, don't stop for this item

Replacement in crawl-ref/source/travel.cc at line 3980 [3.39949]
∅:D[5.465] → [8.4277:4283]
B:BD[8.4277] → [8.4277:4283]
```
    }
```
[5.465]
[8.4283]
```
    } // if (you.running == RMODE_EXPLORE_GREEDY)
```

Replacement in crawl-ref/source/travel.cc at line 3983 [3.39949]

∅:D[12.612] → [8.4361:4386]

B:BD[8.4361] → [8.4361:4386]

    es_flags |= ES_ITEM;

[12.612]

[13.327]

    es_flags |= (you.running == RMODE_EXPLORE_GREEDY) ? ES_GREEDY_PICKUP :
                                                        ES_PICKUP;

Insertion in crawl-ref/source/initfile.cc at line 1512 [14.2957258]

[5.1404]

[4.9811]

        else if (c == "glowing" || c == "glowing_item"
                 || c == "glowing_items")
            conditions |= ES_GLOWING_ITEM;
        else if (c == "artefact" || c == "artefacts"
                 || c == "artifact" || c == "artifacts")
            conditions |= ES_ARTEFACT;
        else if (c == "rune" || c == "runes")
            conditions |= ES_RUNE;

Replacement in crawl-ref/docs/options_guide.txt at line 700 [17.63392]

B:BD[15.20046] → [16.475:535]

explore_stop = items,greedy_items,stairs,shops,altars,gates

[15.20046]

[16.535]

explore_stop = items,greedy_pickup,stairs,shops,altars,gates

Replacement in crawl-ref/docs/options_guide.txt at line 707 [17.63392]

B:BD[18.18290] → [16.880:1211]

        If you include greedy_items in your explore_stop, greedy
        explore will stop and announce items that are eligible for
        autopickup (greedy explore otherwise announces only items that
        are not eligible for autopickup, since autopickup will produce
        its own message and stop greedy explore anyway).

[18.18290]

[16.1211]

        When using non-greedy explore, items causes explore to stop
        when any new item comes into view.  When using greedy explore,
        the conditions act as follows:
        items: stop when items that aren't eligible for autopickup come
            into view.

Insertion in crawl-ref/docs/options_guide.txt at line 714 [17.63392]

[16.1212]

[19.3646]

        greedy_items: stop when items that are eligible for autopickup
            come into view.
   
        greedy_pickup: stop when you arrive at a square which contains
            an item eligble for autopickup.
        glowing_items: like items, but only for items which are
            glowing/runed/embroidered/etc.
        artefacts: like items, but only for artefacts.
        runes: like items, but only for runes.