fiddlerwoaroof/crawl - Change 547JREUJXTZNYVGHNNAET5F5O5JYYGNTDQB6ABZNT7YX5EY64OHAC

[1597293] Preliminary greedy-explore, parked on Ctrl-I. We can (re)move it if necessary.

Stash-tracking is no longer #ifdef conditionalised. I'm not aware of anybody who compiles without it.

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

Created by dshaligram on December 1, 2006

547JREUJXTZNYVGHNNAET5F5O5JYYGNTDQB6ABZNT7YX5EY64OHAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 1695 [4.16817]
B:BD[3.14720] → [3.14720:14742]
```
#ifdef STASH_TRACKING
```
Deletion in crawl-ref/source/view.cc at line 1697 [4.16817]
B:BD[3.14787] → [3.14787:14794]
```
#endif
```

Insertion in crawl-ref/source/travel.h at line 49 [3.29464]

[3.31842]

 * If grab_items is true, greedy explore is triggered - in greedy mode, explore
 * grabs items that are eligible for autopickup and visits (previously
 * unvisited) shops.

Replacement in crawl-ref/source/travel.h at line 56 [3.29464]
B:BD[3.32018] → [3.32018:32040]
```
void start_explore();
```
[3.32018]
[3.32040]
```
void start_explore(bool grab_items = false);
```
Replacement in crawl-ref/source/travel.h at line 98 [3.29464]
B:BD[3.33723] → [3.33723:33741]
```
enum EXPLORE_STOP
```
[3.33501]
[3.33741]
```
enum explore_stop_type
```

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

B:BD[3.33743] → [3.33743:33827]

B:BD[3.33827] → [5.69:89]

    ES_NONE     = 0,
    ES_ITEM     = 1,
    ES_STAIR    = 2,
    ES_SHOP     = 4,
    ES_ALTAR    = 8

[3.33743]

[3.33848]

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

Insertion in crawl-ref/source/travel.h at line 367 [3.29464]
[3.39860]
[3.39860]
```
bool prompt_stop_explore(int es_why);
```
Insertion in crawl-ref/source/travel.cc at line 18 [3.39949]
[6.85912]
[6.85912]
```
#include "itemname.h"
#include "items.h"
```

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

B:BD[3.46466] → [6.86486:86651]

∅:D[6.86651] → [3.46625:46717]

B:BD[3.46625] → [3.46625:46717]

    return runmode == RMODE_TRAVEL?       "travel" :
           runmode == RMODE_INTERLEVEL?   "intertravel" :
           runmode == RMODE_EXPLORE?      "explore" :
           runmode > 0?                 "run" :
                                        "";

[3.46466]

[3.46717]

    return runmode == RMODE_TRAVEL?         "travel" :
           runmode == RMODE_INTERLEVEL?     "intertravel" :
           runmode == RMODE_EXPLORE?        "explore" :
           runmode == RMODE_EXPLORE_GREEDY? "explore_greedy" :
           runmode > 0?                     "run" :
                                            "";

Deletion in crawl-ref/source/travel.cc at line 273 [3.39949]
B:BD[3.46943] → [3.46943:46965]
```
#ifdef STASH_TRACKING
```
Deletion in crawl-ref/source/travel.cc at line 280 [3.39949]
B:BD[3.47124] → [3.47124:47131]
```
#endif
```

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

[3.61636]

}
// Prompts the user to stop explore if necessary for the given
// explore-stop condition, returns true if explore should be stopped.
bool prompt_stop_explore(int es_why)
{
    return (!(Options.explore_stop_prompt & es_why)
            || yesno("Stop exploring?", true, 'n', true, false));
}
static bool es_say(const char *what)
{
    mprf("Spotted %s.", what);
    return (true);

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

B:BD[3.61689] → [3.61689:61841]

#define ES_shop  (Options.explore_stop & ES_SHOP)
#define ES_stair (Options.explore_stop & ES_STAIR)
#define ES_altar (Options.explore_stop & ES_ALTAR)

[3.61689]

[3.61841]


#define ES_shop  ((Options.explore_stop & ES_SHOP) && \
                  es_say("a shop") && prompt_stop_explore(ES_SHOP))
#define ES_stair ((Options.explore_stop & ES_STAIR) &&  \
                  es_say("a stair") && prompt_stop_explore(ES_STAIR))
#define ES_altar ((Options.explore_stop & ES_ALTAR) &&  \
                  es_say("an altar") && prompt_stop_explore(ES_ALTAR))

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

B:BD[3.62046] → [3.62046:62118]

    if (ES_item && igrd[x + 1][y + 1] != NON_ITEM)
        return true;

[3.62046]

[3.62118]

    if (ES_item && igrd[x + 1][y + 1] != NON_ITEM
        && you.running != RMODE_EXPLORE_GREEDY)
    {
        mprf("Spotted %s.",
             item_name( mitm[ igrd[x + 1][y + 1] ], DESC_NOCAP_A ));
        if (prompt_stop_explore(ES_ITEM))
            return (true);
    }

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

B:BD[3.62163] → [3.62163:62370]

    return (ES_shop && grid == DNGN_ENTER_SHOP)
            || (ES_stair && is_stair(grid))
            || (ES_altar && is_altar(grid) 
                    && you.where_are_you != BRANCH_ECUMENICAL_TEMPLE);

[3.62163]

[3.62370]

    return (grid == DNGN_ENTER_SHOP && you.running != RMODE_EXPLORE_GREEDY
            && ES_shop)
            || (is_stair(grid) && ES_stair)
            || (is_altar(grid)
                    && you.where_are_you != BRANCH_ECUMENICAL_TEMPLE
                    && ES_altar);

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

B:BD[6.87510] → [6.87510:87638]

    if (you.running == RMODE_TRAVEL
            || you.running == RMODE_EXPLORE
            || you.running == RMODE_INTERLEVEL)

[6.87510]

[6.87638]

    if (you.running < 0)

Replacement in crawl-ref/source/travel.cc at line 808 [3.39949]
B:BD[3.63524] → [6.87982:88044]
```
    if (Options.explore_stop && you.running == RMODE_EXPLORE)
```
[3.63524]
[3.63584]
```
    if (you.running.is_explore())
```
Replacement in crawl-ref/source/travel.cc at line 831 [3.39949]
B:BD[3.64341] → [6.88045:88083]
```
    if (you.running == RMODE_EXPLORE)
```
[3.64341]
[3.64377]
```
    if (you.running.is_explore())
```

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

[3.64404]

[6.88084]

        if (grd[you.x_pos][you.y_pos] == DNGN_ENTER_SHOP
            && you.running == RMODE_EXPLORE_GREEDY)
        {
            LevelStashes *lev = stashes.find_current_level();
            if (lev && lev->shop_needs_visit(you.x_pos, you.y_pos))
            {
                stop_running();
                return (CMD_GO_UPSTAIRS);
            }
        }

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

B:BD[3.65850] → [6.88426:88551]

                if (runmode == RMODE_EXPLORE)
                    you.running = RMODE_EXPLORE;       // Turn explore back on

[3.65850]

[3.65971]

                if (runmode == RMODE_EXPLORE || runmode == RMODE_EXPLORE_GREEDY)
                    you.running = runmode;       // Turn explore back on

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

[6.90435]

}
static bool is_greed_inducing_square(const LevelStashes *ls, int x, int y)
{
    return (ls && can_autopickup() && ls->needs_visit(x, y));

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

∅:D[5.143] → [3.68901:69001]

B:BD[3.68901] → [3.68901:69001]

#ifdef STASH_TRACKING
    LevelStashes *lev = features? stashes.find_current_level() : NULL;
#endif

[5.143]

[3.69001]

    LevelStashes *lev = stashes.find_current_level();

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

B:BD[3.73017] → [3.73017:73109]

               
                if (dx <= 0 || dx >= GXM || dy <= 0 || dy >= GYM) continue;

[3.73017]

[3.73109]


                if (!in_bounds(dx, dy))
                    continue;

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

B:BD[3.73173] → [6.90582:90644]

∅:D[6.90644] → [3.73233:73286]

B:BD[3.73233] → [3.73233:73286]

                if (floodout && you.running == RMODE_EXPLORE 
                        && !is_player_mapped(envf))

[3.73173]

[3.73286]

                if (floodout && you.running.is_explore()
                    && (!is_player_mapped(envf)
                        || (you.running == RMODE_EXPLORE_GREEDY
                            && is_greed_inducing_square(lev, dx, dy))))

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

B:BD[6.90801] → [6.90801:90879]

∅:D[6.90879] → [3.73522:73523]

B:BD[3.73522] → [3.73522:73523]

                    you.running.x = x;
                    you.running.y = y;

[6.90801]

[3.73523]

                    if (!is_player_mapped(envf))
                    {
                        you.running.x = x;
                        you.running.y = y;
                    }
                    else
                    {
                        you.running.x = dx;
                        you.running.y = dy;
                    }

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

B:BD[3.76610] → [3.76610:76730]

#ifdef STASH_TRACKING
                                || is_stash(lev, dx, dy)
#endif
                                )

[3.76610]

[3.76730]

                                || is_stash(lev, dx, dy))

Replacement in crawl-ref/source/travel.cc at line 2206 [3.39949]
B:BD[3.109078] → [3.109078:109099]
```
void start_explore()
```
[3.109078]
[3.109099]
```
void start_explore(bool grab_items)
```

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

B:BD[3.109101] → [6.92192:92227]

∅:D[6.92227] → [3.109134:109164]

B:BD[3.109134] → [3.109134:109164]

    you.running   = RMODE_EXPLORE;
    if (Options.explore_stop)

[3.109101]

[3.109164]

    you.running = grab_items? RMODE_EXPLORE_GREEDY : RMODE_EXPLORE;
    if (you.running == RMODE_EXPLORE_GREEDY
        && Options.stash_tracking != STM_ALL)

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

B:BD[3.109170] → [3.109170:109242]

        // Clone shadow array off map
        copy(env.map, mapshadow);

[3.109170]

[3.109242]

        mpr("Explore + pickup is available only if stash_tracking = all");
        you.running = RMODE_EXPLORE;

Insertion in crawl-ref/source/travel.cc at line 2215 [3.39949]
[3.109248]
[3.109248]
```
    
    // Clone shadow array off map
    copy(env.map, mapshadow);
```

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

[6.95808]

}
bool runrest::is_explore() const
{
    return (runmode == RMODE_EXPLORE || runmode == RMODE_EXPLORE_GREEDY);

Replacement in crawl-ref/source/stuff.h at line 63 [4.217090]

B:BD[3.133146] → [3.133146:133185]

            bool clear_after = true );

[3.133146]

[4.221771]

            bool clear_after = true, bool interrupt_delays = true );

Replacement in crawl-ref/source/stuff.cc at line 701 [4.224557]

B:BD[4.239248] → [3.137866:137941]

bool yesno( const char *str, bool safe, int safeanswer, bool clear_after )

[4.239248]

[4.239307]

bool yesno( const char *str, bool safe, int safeanswer, bool clear_after,
            bool interrupt_delays )

Replacement in crawl-ref/source/stuff.cc at line 706 [4.224557]

B:BD[4.239333] → [3.137942:137988]

    interrupt_activity( AI_FORCE_INTERRUPT );

[4.239333]

    if (interrupt_delays)
        interrupt_activity( AI_FORCE_INTERRUPT );

Deletion in crawl-ref/source/stash.h at line 12 [3.138156]
B:BD[3.138363] → [3.138363:138386]
```
#ifdef STASH_TRACKING
```

Insertion in crawl-ref/source/stash.h at line 48 [3.138156]

[3.139280]


    // Returns true if this Stash contains items that are eligible for
    // autopickup.
    bool pickup_eligible() const;
    // Returns true if this Stash is unverified (a visit by the character will
    // verify the stash).
    bool unverified() const;

Insertion in crawl-ref/source/stash.h at line 206 [3.138156]
[3.143429]
[3.143429]
```
    const Stash *find_stash(int x = -1, int y = -1) const;
```

Insertion in crawl-ref/source/stash.h at line 217 [3.138156]

[3.143832]

    // Returns true if the square at (x,y) contains potentially interesting
    // swag that merits a personal visit (for EXPLORE_GREEDY).
    bool  needs_visit(int x, int y) const;
    bool  shop_needs_visit(int x, int y) const;

Deletion in crawl-ref/source/stash.h at line 329 [3.138156]
B:BD[3.146995] → [3.146995:147021]
```
#endif // STASH_TRACKING
```
Deletion in crawl-ref/source/stash.cc at line 33 [3.147324]
B:BD[3.147857] → [3.147857:147880]
```
#ifdef STASH_TRACKING
```

Replacement in crawl-ref/source/stash.cc at line 164 [3.147324]

B:BD[3.151408] → [3.151408:151694]

    return a.base_type == b.base_type &&
           a.sub_type == b.sub_type &&
           a.plus == b.plus &&
           a.plus2 == b.plus2 &&
           a.special == b.special &&
           a.colour == b.colour &&
           a.flags == b.flags &&
           a.quantity == b.quantity;

[3.151408]

[3.151694]

    const bool same = a.base_type == b.base_type
        && a.sub_type == b.sub_type
        && a.plus == b.plus
        && a.plus2 == b.plus2
        && a.special == b.special
        && a.colour == b.colour
        && a.flags == b.flags
        && a.quantity == b.quantity;
    // Account for rotting meat when comparing items.
    return (same
            || (a.base_type == b.base_type
                && (a.base_type == OBJ_CORPSES
                    || (a.base_type == OBJ_FOOD && a.sub_type == FOOD_CHUNK
                        && b.sub_type == FOOD_CHUNK))
                && a.plus == b.plus));

Insertion in crawl-ref/source/stash.cc at line 223 [3.147324]
[3.152722]
[3.152722]
```
}
bool Stash::unverified() const
{
    return (!verified);
```

Insertion in crawl-ref/source/stash.cc at line 230 [3.147324]

[3.152725]

bool Stash::pickup_eligible() const
{
    for (int i = 0, size = items.size(); i < size; ++i)
        if (item_needs_autopickup(items[i]))
            return (true);
    return (false);
}

Replacement in crawl-ref/source/stash.cc at line 269 [3.147324]
B:BD[3.153577] → [3.153577:153614]
```
        item_def &item = mitm[objl];
```
[3.153577]
[3.153614]
```
        const item_def &item = mitm[objl];
```

Replacement in crawl-ref/source/stash.cc at line 271 [3.147324]

B:BD[3.153615] → [3.153615:153665]

        if (item.link == NON_ITEM) items.clear();

[3.153615]

[3.153665]

        if (item.link == NON_ITEM)
            items.clear();

Replacement in crawl-ref/source/stash.cc at line 291 [3.147324]
B:BD[3.154264] → [3.154264:154300]
```
        item_def &first = items[0];
```
[3.154264]
[3.154300]
```
        const item_def &first = items[0];
```

Insertion in crawl-ref/source/stash.cc at line 864 [3.147324]

[3.169586]

    return const_cast<Stash *>(
        const_cast<const LevelStashes *>(this)->find_stash(x, y) );
}
const Stash *LevelStashes::find_stash(int x, int y) const
{

Replacement in crawl-ref/source/stash.cc at line 876 [3.147324]
B:BD[3.169710] → [3.169710:169761]
```
    c_stashes::iterator st = stashes.find(abspos);
```
[3.169710]
[3.169761]
```
    c_stashes::const_iterator st = stashes.find(abspos);
```

Insertion in crawl-ref/source/stash.cc at line 890 [3.147324]

[3.170027]

bool LevelStashes::shop_needs_visit(int x, int y) const
{
    const ShopInfo *shop = find_shop(x, y);
    return (shop && !shop->is_visited());
}
bool LevelStashes::needs_visit(int x, int y) const
{
    const Stash *s = find_stash(x, y);
    if (s && (s->unverified() || s->pickup_eligible()))
        return (true);
    return (shop_needs_visit(x, y));
}

Deletion in crawl-ref/source/stash.cc at line 1543 [3.147324]
B:BD[3.185731] → [3.185731:185739]
```
#endif
```
Deletion in crawl-ref/source/shopping.cc at line 140 [4.759950]
B:BD[4.761753] → [3.193395:193417]
```
#ifdef STASH_TRACKING
```
Deletion in crawl-ref/source/shopping.cc at line 141 [4.759950]
B:BD[3.193494] → [3.193494:193501]
```
#endif
```
Deletion in crawl-ref/source/shopping.cc at line 162 [4.759950]
B:BD[4.762096] → [3.193503:193525]
```
#ifdef STASH_TRACKING
```
Replacement in crawl-ref/source/shopping.cc at line 163 [4.759950]
B:BD[3.193541] → [3.193541:193548]
```
#endif
```
[3.193541]
[4.762096]
Deletion in crawl-ref/source/shopping.cc at line 216 [4.759950]
B:BD[3.193861] → [3.193861:193886]
```
#   ifdef STASH_TRACKING
```
Deletion in crawl-ref/source/shopping.cc at line 217 [4.759950]
B:BD[3.193929] → [3.193929:193939]
```
#   endif
```
Replacement in crawl-ref/source/shopping.cc at line 219 [4.759950]
B:BD[4.762911] → [6.168240:168290]
```
	textcolor( can_afford ? LIGHTGREEN : LIGHTRED );
```
[4.762911]
[4.762957]
```
        textcolor( can_afford ? LIGHTGREEN : LIGHTRED );
```
Insertion in crawl-ref/source/items.h at line 142 [4.2580284]
[3.342699]
[4.2584687]
```
bool item_needs_autopickup(const item_def &);
bool can_autopickup();
```
Replacement in crawl-ref/source/items.cc at line 2885 [4.2584728]
B:BD[6.641211] → [6.641211:641217]
```
}    
```
[6.641211]
[3.359377]
```
}
```
Replacement in crawl-ref/source/items.cc at line 2887 [4.2584728]
∅:D[3.359378] → [4.2657356:2657385]
B:BD[4.2657356] → [4.2657356:2657385]
```
static void autopickup(void)
```
[3.359378]
[4.2657385]
```
bool item_needs_autopickup(const item_def &item)
```

Replacement in crawl-ref/source/items.cc at line 2889 [4.2584728]

B:BD[4.2657387] → [4.2657387:2657471]

B:BD[4.2657471] → [6.641218:641279]

∅:D[6.641279] → [4.2657528:2657544]

B:BD[4.2657528] → [4.2657528:2657544]

    //David Loewenstern 6/99
    int result, o, next;
    bool did_pickup = false;
    if (!Options.autopickup_on || Options.autopickups == 0L)
        return;

[4.2657387]

[4.2657544]

    return (strstr(item.inscription.c_str(), "=g") != 0
            || ((item.flags & ISFLAG_THROWN) && Options.pickup_thrown)
            || (((Options.autopickups & (1L << item.base_type))
#ifdef CLUA_BINDINGS
                 || clua.callbooleanfn(false, "ch_autopickup", "u", &item)
#endif
                    )
                && (Options.pickup_dropped || !(item.flags & ISFLAG_DROPPED))
                && !is_banned(item)));
}
              
bool can_autopickup()
{
    // [ds] Checking for autopickups == 0 is a bad idea because
    // autopickup is still possible with inscriptions and
    // pickup_thrown.
    if (!Options.autopickup_on)
        return (false);

Replacement in crawl-ref/source/items.cc at line 2909 [4.2584728]

B:BD[4.2657601] → [4.2657601:2657678]

        && you.duration[DUR_TRANSFORMATION] > 0)
    {
        return;
    }

[4.2657601]

[4.2657678]

            && you.duration[DUR_TRANSFORMATION] > 0)
        return (false);

Replacement in crawl-ref/source/items.cc at line 2913 [4.2584728]
B:BD[4.2657753] → [4.2657753:2657769]
```
        return;
```
[4.2657753]
[6.641280]
```
        return (false);
```

Replacement in crawl-ref/source/items.cc at line 2916 [4.2584728]

B:BD[6.641334] → [6.641334:641348]

      return;

[6.641334]

[4.2657769]

        return (false);
    return (true);
}
    
static void autopickup(void)
{
    //David Loewenstern 6/99
    int result, o, next;
    bool did_pickup = false;

Insertion in crawl-ref/source/items.cc at line 2927 [4.2584728]
[4.2657770]
[4.2657770]
```
    if (!can_autopickup())
        return;
    
```
Insertion in crawl-ref/source/items.cc at line 2932 [4.2584728]
[4.2657807]
[4.2657807]
```
    int unthrown = 0;
```

Replacement in crawl-ref/source/items.cc at line 2937 [4.2584728]

B:BD[4.2657869] → [6.641349:641490]

∅:D[6.641490] → [3.359454:359717]

B:BD[3.359454] → [3.359454:359717]

B:BD[3.359717] → [6.641491:641531]

        if (
	    (strstr(mitm[o].inscription.c_str(), "=g") != 0) || (
 
	    ((mitm[o].flags & ISFLAG_THROWN) && Options.pickup_thrown) ||
            ( (Options.autopickups & (1L << mitm[o].base_type) 
#ifdef CLUA_BINDINGS
               || clua.callbooleanfn(false, "ch_autopickup", "u", &mitm[o])
#endif
              )
              && (Options.pickup_dropped || !(mitm[o].flags & ISFLAG_DROPPED))
              && !is_banned(mitm[o]))))

[4.2657869]

[4.2657930]

        if (item_needs_autopickup(mitm[o]))

Insertion in crawl-ref/source/items.cc at line 2939 [4.2584728]

[4.2657940]

[3.359757]

            if (!(mitm[o].flags & ISFLAG_THROWN))
                unthrown++;

Replacement in crawl-ref/source/items.cc at line 2969 [4.2584728]
∅:D[6.641565] → [4.2658493:2658537]
B:BD[4.2658493] → [4.2658493:2658537]
```
        start_delay( DELAY_AUTOPICKUP, 1 );
```
[6.641565]
[4.2658537]
```
        start_delay( DELAY_AUTOPICKUP, 1, unthrown );
```

Replacement in crawl-ref/source/initfile.cc at line 384 [4.2957258]

B:BD[3.393695] → [6.787115:787175]

void game_options::add_dump_fields(const std::string &text)

[3.393695]

[6.787175]

void game_options::new_dump_fields(const std::string &text, bool add)

Replacement in crawl-ref/source/initfile.cc at line 387 [4.2957258]

B:BD[6.787232] → [6.787232:787300]

    append_vector(dump_order, split_string(",", text, true, true));

[6.787232]

[6.787300]

    std::vector<std::string> fields = split_string(",", text, true, true);
    if (add)
        append_vector(dump_order, fields);
    else
    {
        for (int f = 0, size = fields.size(); f < size; ++f)
        {
            for (int i = 0, dsize = dump_order.size(); i < dsize; ++i)
            {
                if (dump_order[i] == fields[f])
                {
                    dump_order.erase( dump_order.begin() + i );
                    break;
                }
            }
        }
    }

Deletion in crawl-ref/source/initfile.cc at line 624 [4.2957258]
B:BD[4.2965248] → [3.395553:395575]
```
#ifdef STASH_TRACKING
```
Replacement in crawl-ref/source/initfile.cc at line 625 [4.2957258]
∅:D[6.793872] → [3.395622:395629]
B:BD[3.395622] → [3.395622:395629]
```
#endif
```
[6.793872]
[6.793873]

Insertion in crawl-ref/source/initfile.cc at line 627 [4.2957258]

[6.793943]


    // The prompt conditions will be combined into explore_stop after
    // reading options.
    explore_stop_prompt    = ES_GREEDY_PICKUP;

Replacement in crawl-ref/source/initfile.cc at line 702 [4.2957258]

B:BD[6.795430] → [6.795430:795488]

    add_dump_fields("header,stats,misc,inventory,skills,"

[6.795430]

[2.143]

    new_dump_fields("header,stats,misc,inventory,skills,"

Insertion in crawl-ref/source/initfile.cc at line 1131 [4.2957258]
[6.798209]
[6.798209]
```
    Options.explore_stop |= Options.explore_stop_prompt;
    
```

Insertion in crawl-ref/source/initfile.cc at line 1158 [4.2957258]

[6.798375]

[3.404253]

}
int game_options::read_explore_stop_conditions(const std::string &field) const
{
    int conditions = 0;
    std::vector<std::string> stops = split_string(",", field);
    for (int i = 0, count = stops.size(); i < count; ++i)
    {
        const std::string &c = stops[i];
        if (c == "item" || c == "items")
            conditions |= ES_ITEM;
        else if (c == "pickup")
            conditions |= ES_PICKUP;
        else if (c == "greedy_pickup" || c == "greedy pickup")
            conditions |= ES_GREEDY_PICKUP;
        else if (c == "shop" || c == "shops")
            conditions |= ES_SHOP;
        else if (c == "stair" || c == "stairs")
            conditions |= ES_STAIR;
        else if (c == "altar" || c == "altars")
            conditions |= ES_ALTAR;
    }
    return (conditions);

Insertion in crawl-ref/source/initfile.cc at line 1193 [4.2957258]
[6.798483]
[3.404478]
```
    bool minus_equal = false;
```

Insertion in crawl-ref/source/initfile.cc at line 1223 [4.2957258]

[6.798688]

    else if (key.length() && key[key.length() - 1] == '-')
    {
        minus_equal = true;
        key = key.substr(0, key.length() - 1);
        trim_string(key);
    }

Replacement in crawl-ref/source/initfile.cc at line 1927 [4.2957258]

B:BD[3.421133] → [6.809998:810030]

∅:D[6.810030] → [3.421173:421302]

B:BD[3.421173] → [3.421173:421302]

∅:D[3.421302] → [4.2978834:2978844]

B:BD[4.2978834] → [4.2978834:2978844]

B:BD[4.2978844] → [3.421303:421393]

B:BD[3.421393] → [6.810031:810072]

∅:D[6.810072] → [3.421442:421492]

B:BD[3.421442] → [3.421442:421492]

B:BD[3.421492] → [6.810073:810114]

∅:D[6.810114] → [3.421541:421593]

B:BD[3.421541] → [3.421541:421593]

B:BD[3.421593] → [6.810115:810157]

∅:D[6.810157] → [3.421643:421695]

B:BD[3.421643] → [3.421643:421695]

B:BD[3.421695] → [6.810158:810200]

∅:D[3.421745] → [4.2979011:2979021]

∅:D[6.810200] → [4.2979011:2979021]

B:BD[4.2979011] → [4.2979011:2979021]

        explore_stop = ES_NONE;
        std::vector<std::string> stops = split_string(",", field);
        for (int i = 0, count = stops.size(); i < count; ++i)
        {
            const std::string &c = stops[i];
            if (c == "item" || c == "items")
                explore_stop |= ES_ITEM;
            else if (c == "shop" || c == "shops")
                explore_stop |= ES_SHOP;
            else if (c == "stair" || c == "stairs")
                explore_stop |= ES_STAIR;
            else if (c == "altar" || c == "altars")
                explore_stop |= ES_ALTAR;
        }

[3.421133]

[3.421746]

        if (!plus_equal && !minus_equal)
            explore_stop = ES_NONE;
        const int new_conditions = read_explore_stop_conditions(field);
        if (minus_equal)
            explore_stop &= ~new_conditions;
        else
            explore_stop |= new_conditions;
    }
    else if (key == "explore_stop_prompt")
    {
        if (!plus_equal && !minus_equal)
            explore_stop_prompt = ES_NONE;
        const int new_conditions = read_explore_stop_conditions(field);
        if (minus_equal)
            explore_stop_prompt &= ~new_conditions;
        else
            explore_stop_prompt |= new_conditions;

Deletion in crawl-ref/source/initfile.cc at line 1946 [4.2957258]
B:BD[3.421752] → [3.421752:421774]
```
#ifdef STASH_TRACKING
```
Deletion in crawl-ref/source/initfile.cc at line 1959 [4.2957258]
B:BD[3.422258] → [3.422258:422265]
```
#endif
```
Replacement in crawl-ref/source/initfile.cc at line 1993 [4.2957258]
B:BD[6.810488] → [6.810488:810520]
```
        add_dump_fields(field);
```
[6.810488]
[6.810520]
```
        new_dump_fields(field, !minus_equal);
```
Deletion in crawl-ref/source/files.cc at line 1165 [4.3084589]
∅:D[3.434815] → [4.3113053:3113054]
B:BD[4.3113053] → [4.3113053:3113054]
B:BD[4.3113054] → [3.434816:434838]
```
#ifdef STASH_TRACKING
```
Deletion in crawl-ref/source/files.cc at line 1173 [4.3084589]
B:BD[3.435274] → [6.869258:869265]
```
#endif
```
Deletion in crawl-ref/source/files.cc at line 1383 [4.3084589]
B:BD[3.436797] → [3.436797:436819]
```
#ifdef STASH_TRACKING
```
Deletion in crawl-ref/source/files.cc at line 1389 [4.3084589]
B:BD[3.436954] → [3.436954:436961]
```
#endif
```
Insertion in crawl-ref/source/externs.h at line 311 [4.3270163]
[6.896643]
[6.896643]
```
    bool is_explore() const;
```
Insertion in crawl-ref/source/externs.h at line 850 [4.3270163]
[3.445094]
[3.445094]
```
    int         explore_stop_prompt;
    
```

Replacement in crawl-ref/source/externs.h at line 949 [4.3270163]

B:BD[6.901745] → [6.901745:901796]

    void add_dump_fields(const std::string &text);

[6.901745]

[6.901796]

    void new_dump_fields(const std::string &text, bool add = true);

Insertion in crawl-ref/source/externs.h at line 951 [4.3270163]
[6.901866]
[6.901866]
```
    int  read_explore_stop_conditions(const std::string &) const;
```
Insertion in crawl-ref/source/enum.h at line 639 [4.3287960]
[3.448578]
[3.448578]
```
    CMD_EXPLORE_GREEDY,
```

Replacement in crawl-ref/source/enum.h at line 2858 [4.3287960]

B:BD[6.926140] → [6.926140:926369]

    RMODE_INTERLEVEL  = -3,   // Interlevel travel (Ctrl+G)
    RMODE_EXPLORE     = -2,   // Exploring (Ctrl+O)
    RMODE_TRAVEL      = -1,   // Classic or Plain Old travel
    RMODE_NOT_RUNNING = 0,    // must remain equal to 0

[6.926140]

[6.926369]

    RMODE_INTERLEVEL     = -4, // Interlevel travel (Ctrl+G)
    RMODE_EXPLORE_GREEDY = -3, // Explore + grab items (Tab/Ctrl+I)
    RMODE_EXPLORE        = -2, // Exploring (Ctrl+O)
    RMODE_TRAVEL         = -1, // Classic or Plain Old travel
    RMODE_NOT_RUNNING    = 0,  // must remain equal to 0

Deletion in crawl-ref/source/direct.cc at line 373 [4.3697945]
B:BD[3.453030] → [3.453030:453052]
```
#ifdef STASH_TRACKING
```
Deletion in crawl-ref/source/direct.cc at line 374 [4.3697945]
B:BD[3.453078] → [3.453078:453085]
```
#endif
```

Replacement in crawl-ref/source/direct.cc at line 789 [4.3697945]

B:BD[3.459236] → [3.459236:459399]

                && (in_los(x, y)
#ifdef STASH_TRACKING
                || (Options.target_oos && is_mapped(x, y) && is_stash(x, y))
#endif
                    ));

[3.459236]

[3.459399]

            && (in_los(x, y)
                || (Options.target_oos && is_mapped(x, y) && is_stash(x, y))));

Insertion in crawl-ref/source/delay.cc at line 362 [4.3963459]

[6.1000906]

            // Ask the player if they want to stop explore to examine
            // the loot, but only if we picked up at least one item
            // that the character did not throw.
            int estop = (you.running == RMODE_EXPLORE_GREEDY
                         && delay.parm1)? ES_GREEDY_PICKUP : ES_PICKUP;
            if ((Options.explore_stop & estop) && prompt_stop_explore(estop))
                stop_delay();

Deletion in crawl-ref/source/command.cc at line 56 [4.4082507]
B:BD[3.479519] → [3.479519:479541]
```
#ifdef STASH_TRACKING
```
Deletion in crawl-ref/source/command.cc at line 57 [4.4082507]
B:BD[3.479563] → [3.479563:479570]
```
#endif
```
Deletion in crawl-ref/source/command.cc at line 587 [4.4082507]
B:BD[6.1186870] → [6.1186870:1186892]
```
#ifdef STASH_TRACKING
```
Deletion in crawl-ref/source/command.cc at line 589 [4.4082507]
B:BD[6.1186935] → [6.1186935:1186942]
```
#endif
```
Deletion in crawl-ref/source/command.cc at line 1095 [4.4082507]
B:BD[6.1204976] → [6.1204976:1204998]
```
#ifdef STASH_TRACKING
```
Deletion in crawl-ref/source/command.cc at line 1098 [4.4082507]
B:BD[6.1205202] → [6.1205202:1205209]
```
#endif
```
Deletion in crawl-ref/source/chardump.cc at line 990 [4.4100336]
B:BD[4.4123653] → [3.548626:548648]
```
#ifdef STASH_TRACKING
```
Deletion in crawl-ref/source/chardump.cc at line 994 [4.4100336]
∅:D[6.1218255] → [3.548740:548747]
B:BD[3.548740] → [3.548740:548747]
```
#endif
```
Deletion in crawl-ref/source/acr.cc at line 1064 [4.4397395]
B:BD[4.4429457] → [3.550478:550500]
```
#ifdef STASH_TRACKING
```
Deletion in crawl-ref/source/acr.cc at line 1066 [4.4397395]
B:BD[3.550584] → [3.550584:550591]
```
#endif
```
Deletion in crawl-ref/source/acr.cc at line 1068 [4.4397395]
B:BD[3.550601] → [3.550601:550623]
```
#ifdef STASH_TRACKING
```
Deletion in crawl-ref/source/acr.cc at line 1081 [4.4397395]
B:BD[3.551035] → [3.551035:551042]
```
#endif
```
Insertion in crawl-ref/source/acr.cc at line 1238 [4.4397395]
[3.551979]
[3.551979]
```
    case CMD_EXPLORE_GREEDY:
```
Replacement in crawl-ref/source/acr.cc at line 1245 [4.4397395]
B:BD[3.552194] → [3.552194:552219]
```
        start_explore();
```
[3.552194]
[4.4432956]
```
        start_explore(cmd == CMD_EXPLORE_GREEDY);
```
Replacement in crawl-ref/source/acr.cc at line 2407 [4.4397395]
B:BD[6.1276816] → [6.1276816:1276858]
```
    case CONTROL('I'): return CMD_NO_CMD;
```
[6.1276816]
[6.1276858]
```
    case CONTROL('I'): return CMD_EXPLORE_GREEDY;
```

Deletion in crawl-ref/source/AppHdr.h at line 54 [4.4573713]

B:BD[3.588176] → [3.588176:588299]


// Enables stash-tracking: keeps track of items in the dungeon as a convenience
// for the player.
#define STASH_TRACKING

[1597293] Preliminary greedy-explore, parked on Ctrl-I. We can (re)move it if necessary.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/view.cc at line 1695 [4.16817]

Deletion in crawl-ref/source/view.cc at line 1697 [4.16817]

Insertion in crawl-ref/source/travel.h at line 49 [3.29464]

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

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

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

Insertion in crawl-ref/source/travel.h at line 367 [3.29464]

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

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

Deletion in crawl-ref/source/travel.cc at line 273 [3.39949]

Deletion in crawl-ref/source/travel.cc at line 280 [3.39949]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/stuff.h at line 63 [4.217090]

Replacement in crawl-ref/source/stuff.cc at line 701 [4.224557]

Replacement in crawl-ref/source/stuff.cc at line 706 [4.224557]

Deletion in crawl-ref/source/stash.h at line 12 [3.138156]

Insertion in crawl-ref/source/stash.h at line 48 [3.138156]

Insertion in crawl-ref/source/stash.h at line 206 [3.138156]

Insertion in crawl-ref/source/stash.h at line 217 [3.138156]

Deletion in crawl-ref/source/stash.h at line 329 [3.138156]

Deletion in crawl-ref/source/stash.cc at line 33 [3.147324]

Replacement in crawl-ref/source/stash.cc at line 164 [3.147324]

Insertion in crawl-ref/source/stash.cc at line 223 [3.147324]

Insertion in crawl-ref/source/stash.cc at line 230 [3.147324]

Replacement in crawl-ref/source/stash.cc at line 269 [3.147324]

Replacement in crawl-ref/source/stash.cc at line 271 [3.147324]

Replacement in crawl-ref/source/stash.cc at line 291 [3.147324]

Insertion in crawl-ref/source/stash.cc at line 864 [3.147324]

Replacement in crawl-ref/source/stash.cc at line 876 [3.147324]

Insertion in crawl-ref/source/stash.cc at line 890 [3.147324]

Deletion in crawl-ref/source/stash.cc at line 1543 [3.147324]

Deletion in crawl-ref/source/shopping.cc at line 140 [4.759950]

Deletion in crawl-ref/source/shopping.cc at line 141 [4.759950]

Deletion in crawl-ref/source/shopping.cc at line 162 [4.759950]

Replacement in crawl-ref/source/shopping.cc at line 163 [4.759950]

Deletion in crawl-ref/source/shopping.cc at line 216 [4.759950]

Deletion in crawl-ref/source/shopping.cc at line 217 [4.759950]

Replacement in crawl-ref/source/shopping.cc at line 219 [4.759950]

Insertion in crawl-ref/source/items.h at line 142 [4.2580284]

Replacement in crawl-ref/source/items.cc at line 2885 [4.2584728]

Replacement in crawl-ref/source/items.cc at line 2887 [4.2584728]

Replacement in crawl-ref/source/items.cc at line 2889 [4.2584728]

Replacement in crawl-ref/source/items.cc at line 2909 [4.2584728]

Replacement in crawl-ref/source/items.cc at line 2913 [4.2584728]

Replacement in crawl-ref/source/items.cc at line 2916 [4.2584728]

Insertion in crawl-ref/source/items.cc at line 2927 [4.2584728]

Insertion in crawl-ref/source/items.cc at line 2932 [4.2584728]

Replacement in crawl-ref/source/items.cc at line 2937 [4.2584728]

Insertion in crawl-ref/source/items.cc at line 2939 [4.2584728]

Replacement in crawl-ref/source/items.cc at line 2969 [4.2584728]

Replacement in crawl-ref/source/initfile.cc at line 384 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 387 [4.2957258]

Deletion in crawl-ref/source/initfile.cc at line 624 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 625 [4.2957258]

Insertion in crawl-ref/source/initfile.cc at line 627 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 702 [4.2957258]

Insertion in crawl-ref/source/initfile.cc at line 1131 [4.2957258]