fiddlerwoaroof/crawl - Change QZERCVTY5BISIKSDH6WUXGZPIBAF4KUCGSZEEGMGBCORNUXT4HXAC

Added two command hints: 'v'iewing for certain features,

and how to turn autopickup/autoprayer on again after an encounter with an invisible creature.

I also modified selection of book shops, so the offered books are more likely to be different. This changes balance in that on the whole more books are present, so maybe we should simply throw duplicates out rather than reroll. Oh, and manuals are now even rarer than before. Maybe they should be excepted from this new rule.

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

Created by j-p-e-g on September 4, 2007

QZERCVTY5BISIKSDH6WUXGZPIBAF4KUCGSZEEGMGBCORNUXT4HXAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/dungeon.cc at line 4699 [3.3429798]

[3.3639973]

[4.971636]

static bool need_varied_selection(shop_type shop)
{
    return (shop == SHOP_BOOK);
}

Insertion in crawl-ref/source/dungeon.cc at line 4754 [3.3429798]

[4.971975]

[3.3641173]


    // for books shops, store how many copies of a given book are on display
    int stocked[NUM_BOOKS];
    if (need_varied_selection(env.shop[i].type))
    {
        for (int k=0; k < NUM_BOOKS; k++)
             stocked[k] = 0;
    }

Replacement in crawl-ref/source/dungeon.cc at line 4785 [3.3429798]

B:BD[3.3641934] → [3.3641934:3641967]

            if (orb != NON_ITEM

[3.3641934]

[3.3641967]

            // try for a better selection
            if (orb != NON_ITEM && need_varied_selection(env.shop[i].type))
            {
                if (!one_chance_in(stocked[mitm[orb].sub_type] + 1))
                    orb = NON_ITEM; // try again
            }
            if (orb != NON_ITEM

Insertion in crawl-ref/source/dungeon.cc at line 4812 [3.3429798]

[3.3642510]

[4.972116]

        // increase stock of this subtype by 1, unless it is an artefact
        // (allow for several artefacts of the same underlying subtype)
        // - the latter is currently unused but would apply to e.g. jewellery
        if (need_varied_selection(env.shop[i].type) && !is_artefact(mitm[orb]))
            stocked[mitm[orb].sub_type]++;

Insertion in crawl-ref/source/direct.cc at line 1522 [3.3697945]

[5.8833]

[4.980764]

}
// Is a feature interesting enough to 'v'iew it, even if a player normally
// doesn't care about descriptions, i.e. does the description hold important
// information? (Yes, this is entirely subjective. JPEG)
static bool interesting_feature(dungeon_feature_type feat)
{
    switch (feat)
    {
        case DNGN_ENTER_ORCISH_MINES:
        case DNGN_ENTER_SLIME_PITS:
        case DNGN_ENTER_LABYRINTH:
//        case DNGN_SPARKLING_FOUNTAIN:
           return true;
        default:
           return false;
    }

Insertion in crawl-ref/source/direct.cc at line 1882 [3.3697945]

[2.1767]

        if (interesting_feature(grd[mx][my]))
            feature_desc += " (Press 'v' for more information.)";

Insertion in crawl-ref/source/delay.cc at line 1061 [3.3963459]
[6.633]
[6.633]
```
            std::vector<std::string> restart;
```
Insertion in crawl-ref/source/delay.cc at line 1066 [3.3963459]
[6.787]
[6.787]
```
                restart.push_back("Ctrl+V");
```
Insertion in crawl-ref/source/delay.cc at line 1073 [3.3963459]
[6.983]
[6.983]
```
                restart.push_back("Ctrl+A");
```

Replacement in crawl-ref/source/delay.cc at line 1077 [3.3963459]

B:BD[6.1037] → [6.1037:1090]

                mprf(MSGCH_WARN, "Deactivating %s.",

[6.1037]

[6.1090]

                mprf(MSGCH_WARN, "Deactivating %s; reactivate with %s.",

Replacement in crawl-ref/source/delay.cc at line 1079 [3.3963459]

B:BD[6.1155] → [6.1155:1228]

                                           deactivatees.end()).c_str());

[6.1155]

[6.1228]

                                           deactivatees.end()).c_str(),
                      comma_separated_line(restart.begin(),
                                           restart.end()).c_str());