fiddlerwoaroof/crawl - Change X7X6JKZXOCG6NVLZLGNCQDFFXW4H3S77BVAJ5LS7ZHZ4GQVLMOMAC

Add confirmation before stepping on known magical traps.

(part of FR 1793669). Added description for reaching ego (bug 1792851). Added sorting statement before showing item knowledge, so items of the same class now are sorted alphabetically.

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

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

X7X6JKZXOCG6NVLZLGNCQDFFXW4H3S77BVAJ5LS7ZHZ4GQVLMOMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 2883 [3.804403]

B:BD[3.882889] → [2.257:332]

    if (!yesno( info, false, 'n' ) || !yesno("Are you sure?", false, 'n'))

[3.882889]

[3.882913]

    if (!yesno( info, true, 'n' ) || !yesno("Are you sure?", false, 'n'))

Replacement in crawl-ref/source/player.cc at line 173 [3.962854]

B:BD[4.338395] → [4.338395:338477]

    if (stepped 
        && !force
        && new_grid == DNGN_UNDISCOVERED_TRAP)

[4.338395]

[4.338477]

    if (stepped && !force)

Replacement in crawl-ref/source/player.cc at line 175 [3.962854]

B:BD[4.338483] → [4.338483:338704]

        const int skill = 4 + you.skills[SK_TRAPS_DOORS] 
                            + you.mutation[MUT_ACUTE_VISION]
                            - 2 * you.mutation[MUT_BLURRY_VISION];
        if (random2( skill ) > 6)

[4.338483]

[4.338704]

        if (new_grid == DNGN_UNDISCOVERED_TRAP)

Replacement in crawl-ref/source/player.cc at line 177 [3.962854]

B:BD[4.338714] → [4.338714:338854]

            mprf( MSGCH_WARN,
                  "Wait a moment, %s!  Do you really want to step there?",
                  you.your_name );

[4.338714]

[4.338854]

            const int skill = 4 + you.skills[SK_TRAPS_DOORS]
                                + you.mutation[MUT_ACUTE_VISION]
                                - 2 * you.mutation[MUT_BLURRY_VISION];

Replacement in crawl-ref/source/player.cc at line 181 [3.962854]

B:BD[4.338855] → [4.338855:338875]

            more();

[4.338855]

[4.338875]

            if (random2( skill ) > 6)
            {
                mprf( MSGCH_WARN,
                      "Wait a moment, %s!  Do you really want to step there?",
                      you.your_name );

Replacement in crawl-ref/source/player.cc at line 187 [3.962854]
B:BD[4.338876] → [4.338876:338919]
```
            exercise( SK_TRAPS_DOORS, 3 );
```
[4.338876]
[4.338919]
```
                more();
```

Replacement in crawl-ref/source/player.cc at line 189 [3.962854]

B:BD[4.338920] → [4.338920:338958]

            you.turn_is_over = false;

[4.338920]

[4.338958]

                exercise( SK_TRAPS_DOORS, 3 );
                you.turn_is_over = false;

Replacement in crawl-ref/source/player.cc at line 193 [3.962854]

B:BD[4.338959] → [4.338959:339086]

            id = trap_at_xy( x, y );
            if (id != -1)
                grd[x][y] = trap_category( env.trap[id].type );

[4.338959]

[4.339086]

                id = trap_at_xy( x, y );
                if (id != -1)
                    grd[x][y] = trap_category( env.trap[id].type );

Replacement in crawl-ref/source/player.cc at line 197 [3.962854]

B:BD[4.339087] → [4.339087:339115]

            return (false);

[4.339087]

[4.339115]

                return (false);
            }
        } // unknown trap
        else if (new_grid == DNGN_TRAP_MAGICAL)
        {
            std::string prompt = "Really step onto that "; // preposition?
            prompt += feature_description(new_grid, trap_type_at_xy(x,y),
                                          DESC_PLAIN, false);
            prompt += '?';
            
            // Zot traps require capital confirmation
            bool harmless = (trap_type_at_xy(x,y) != TRAP_ZOT);
            if (!yesno(prompt.c_str(), harmless, 'n'))
            {
                you.turn_is_over = false;
                return (false);
            }

Insertion in crawl-ref/source/itemname.cc at line 1626 [3.2667494]

[4.715799]

[3.2747743]

}
bool item_names( const item_def *it1,
                 const item_def *it2 )
{
    return it1->name(DESC_PLAIN, false, false, false)
           < it2->name(DESC_PLAIN, false, false, false);

Insertion in crawl-ref/source/itemname.cc at line 1667 [3.2667494]
[5.8713]
[4.716674]
```
        std::sort(items.begin(), items.end(), item_names);
```

Insertion in crawl-ref/source/describe.cc at line 1182 [3.3736416]

[3.3771789]

                break;
            case SPWPN_RETURNING:
                description += "It is enchanted to return to its owner "
                               "when thrown.";

Insertion in crawl-ref/source/debug.cc at line 2360 [3.4016436]
[6.761]
[6.761]
```
    {
        mpr("Unknown card.");
```
Insertion in crawl-ref/source/debug.cc at line 2363 [3.4016436]
[6.777]
[6.777]
```
    }
    
    bool found_card = false;
```
Insertion in crawl-ref/source/debug.cc at line 2372 [3.4016436]
[7.30641]
[6.967]
```
            found_card = true;
```
Insertion in crawl-ref/source/debug.cc at line 2376 [3.4016436]
[8.299]
[8.299]
```
    if (!found_card)
        mpr("Unknown card.");
```