fiddlerwoaroof/crawl - Change LVCBY444HPB4RRFMUAZPHVZ67IC3L6DB27AEMCW3DEXHLBF73TMQC

Changed door-open failure message to match the door-close message.

Added special case messages for doors already open or closed. Maybe there should be flavor messages for # gateways? We use the same noun (gate/gateway) for # and +++.

Remove leading underscore from find_connected_identical() now that it's public.

Change large door descriptions slightly:

"open/closed large door" -> "large open/closed door"
"There's a creature in the large doorway!" -> "… in the doorway"
Other messages read a bit better without the adjective, but if it's removed then almost all the flavor is gone. So I left them alone.

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

Created by pauldubois on March 15, 2008

LVCBY444HPB4RRFMUAZPHVZ67IC3L6DB27AEMCW3DEXHLBF73TMQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/terrain.h at line 47 [4.24828]

B:BD[4.26358] → [3.201:270]

void _find_connected_identical(coord_def d, dungeon_feature_type ft,

[4.26358]

[3.270]

void find_connected_identical(coord_def d, dungeon_feature_type ft,

Replacement in crawl-ref/source/terrain.h at line 49 [4.24828]

B:BD[3.328] → [3.328:371]

std::string get_door_noun(int door_count);

[3.328]

[5.136]

void get_door_description(int door_size, const char** adjective, const char** noun);

Replacement in crawl-ref/source/terrain.cc at line 240 [4.26938]

B:BD[3.434] → [3.434:503]

void _find_connected_identical(coord_def d, dungeon_feature_type ft,

[3.434]

[3.503]

void find_connected_identical(coord_def d, dungeon_feature_type ft,

Replacement in crawl-ref/source/terrain.cc at line 246 [4.26938]

B:BD[3.635] → [3.635:903]

        _find_connected_identical(coord_def(d.x+1, d.y), ft, out);
        _find_connected_identical(coord_def(d.x-1, d.y), ft, out);
        _find_connected_identical(coord_def(d.x, d.y+1), ft, out);
        _find_connected_identical(coord_def(d.x, d.y-1), ft, out);

[3.635]

[3.903]

        find_connected_identical(coord_def(d.x+1, d.y), ft, out);
        find_connected_identical(coord_def(d.x-1, d.y), ft, out);
        find_connected_identical(coord_def(d.x, d.y+1), ft, out);
        find_connected_identical(coord_def(d.x, d.y-1), ft, out);

Replacement in crawl-ref/source/terrain.cc at line 253 [4.26938]

B:BD[4.32648] → [3.910:952]

std::string get_door_noun(int door_count)

[4.32648]

[3.952]

void get_door_description(int door_size, const char** adjective, const char** noun)

Replacement in crawl-ref/source/terrain.cc at line 255 [4.26938]

B:BD[3.954] → [3.954:1155]

    switch (door_count)
    {
     case 0:  return "buggy opening";
     case 1:  return "door";
     case 2:  return "large door";
     case 3:  return "gate";
     default: return "huge gate";
    }

[3.954]

[3.1155]

    const char* descriptions[] = {
        "miniscule " , "buggy door",
        ""           , "door",
        "large "     , "door",
        ""           , "gate",
        "huge "      , "gate",
    };
    const unsigned int idx = MIN((unsigned int)door_size*2, ARRAYSIZE(descriptions)-2);
    *adjective = descriptions[idx];
    *noun = descriptions[idx+1];

Replacement in crawl-ref/source/monstuff.cc at line 5280 [6.1396662]
B:BD[3.3679] → [3.3679:3710]
```
    std::string noun = "door";
```
[3.3679]
[3.3710]
```
    const char *adj, *noun="door";
```

Replacement in crawl-ref/source/monstuff.cc at line 5296 [6.1396662]

B:BD[3.4104] → [3.4104:4219]

        _find_connected_identical(pos, grd(pos), all_door);
        noun = get_door_noun(all_door.size()).c_str();

[3.4104]

[3.4219]

        find_connected_identical(pos, grd(pos), all_door);
        get_door_description(all_door.size(), &adj, &noun);

Replacement in crawl-ref/source/monstuff.cc at line 5320 [6.1396662]

B:BD[7.494] → [3.4642:4708]

            mprf("Something unseen opens the %s.", noun.c_str());

[7.494]

[7.547]

            mprf("Something unseen opens the %s%s.", adj, noun);

Replacement in crawl-ref/source/direct.cc at line 1818 [6.3697945]

B:BD[3.5082] → [3.5082:5157]

        std::string desc = (grid == DNGN_OPEN_DOOR) ? "open " : "closed ";

[3.5082]

[3.5157]

        std::set<coord_def> all_door;
        find_connected_identical(coord_def(mx, my), grd[mx][my], all_door);
        const char *adj, *noun;
        get_door_description(all_door.size(), &adj, &noun);

Replacement in crawl-ref/source/direct.cc at line 1823 [6.3697945]

B:BD[3.5158] → [3.5158:5329]

        std::set<coord_def> all_door;
        _find_connected_identical(coord_def(mx, my), grd[mx][my], all_door);
        desc += get_door_noun(all_door.size()).c_str();

[3.5158]

[3.5329]

        std::string desc = adj;
        desc += (grid == DNGN_OPEN_DOOR) ? "open " : "closed ";
        desc += noun;

Replacement in crawl-ref/source/acr.cc at line 3443 [6.4397395]

B:BD[2.323] → [2.323:390]

        if (!in_bounds(dx, dy) || grd[dx][dy] != DNGN_CLOSED_DOOR)

[2.323]

[2.390]

        const dungeon_feature_type feat = 
            in_bounds(dx, dy) ? grd[dx][dy] : DNGN_UNSEEN;
        if (feat != DNGN_CLOSED_DOOR)

Replacement in crawl-ref/source/acr.cc at line 3447 [6.4397395]

B:BD[2.400] → [2.400:445]

            mpr( "There's no door there." );

[2.400]

[2.445]

            switch (feat) {
            case DNGN_OPEN_DOOR:
                mpr("It's already open!"); break;
            default:
                mpr("There isn't anything that you can open there!"); break;
            }

Replacement in crawl-ref/source/acr.cc at line 3461 [6.4397395]

B:BD[8.3279] → [8.3279:3355]

B:BD[8.3355] → [9.2944:3011]

        _find_connected_identical(coord_def(dx,dy), grd[dx][dy], all_door);
        const char* noun = get_door_noun(all_door.size()).c_str();

[8.3279]

[9.3011]

        find_connected_identical(coord_def(dx,dy), grd[dx][dy], all_door);
        const char *adj, *noun;
        get_door_description(all_door.size(), &adj, &noun);

Insertion in crawl-ref/source/acr.cc at line 3469 [6.4397395]
[10.3048]
[10.3048]
```
            // XXX: better flavor for larger doors?
```

Replacement in crawl-ref/source/acr.cc at line 3471 [6.4397395]

B:BD[10.3096] → [8.3426:3476]

                mprf("The %s flies open!", noun);

[10.3096]

[10.3141]

            {
                mprf("The %s%s flies open!", adj, noun);
            }

Replacement in crawl-ref/source/acr.cc at line 3476 [6.4397395]

B:BD[10.3172] → [8.3477:3591]

                // XXX: better flavor for gateways?
                mprf("The %s flies open with a bang!", noun);

[10.3172]

[10.3229]

                mprf("The %s%s flies open with a bang!", adj, noun);

Replacement in crawl-ref/source/acr.cc at line 3482 [6.4397395]

B:BD[6.4465983] → [8.3592:3659]

            mprf( "As you open the %s, it creaks loudly!", noun );

[6.4465983]

[6.4466045]

            mprf( "As you open the %s%s, it creaks loudly!", adj, noun );

Replacement in crawl-ref/source/acr.cc at line 3488 [6.4397395]

B:BD[8.3746] → [8.3746:3796]

            mprf( "You %s the %s.", verb, noun );

[8.3746]

[6.4466269]

            mprf( "You %s the %s%s.", verb, adj, noun );

Replacement in crawl-ref/source/acr.cc at line 3537 [6.4397395]

B:BD[6.4467166] → [6.4467166:4467205]

    if (grd[dx][dy] == DNGN_OPEN_DOOR)

[6.4467166]

[6.4467205]

    const dungeon_feature_type feat = 
        in_bounds(dx, dy) ? grd[dx][dy] : DNGN_UNSEEN;
    if (feat == DNGN_OPEN_DOOR)

Replacement in crawl-ref/source/acr.cc at line 3542 [6.4397395]

B:BD[8.4044] → [8.4044:4120]

B:BD[8.4120] → [9.3021:3088]

        _find_connected_identical(coord_def(dx,dy), grd[dx][dy], all_door);
        const char* noun = get_door_noun(all_door.size()).c_str();

[8.4044]

[8.4189]

        find_connected_identical(coord_def(dx,dy), grd[dx][dy], all_door);
        const char *adj, *noun;
        get_door_description(all_door.size(), &adj, &noun);

Replacement in crawl-ref/source/acr.cc at line 3581 [6.4397395]

B:BD[10.3478] → [8.5129:5182]

                mprf("You slam the %s shut!", noun);

[10.3478]

[10.3526]

            {
                mprf("You slam the %s%s shut!", adj, noun);
            }

Replacement in crawl-ref/source/acr.cc at line 3586 [6.4397395]

B:BD[10.3557] → [8.5183:5257]

                mprf("You slam the %s shut with an echoing bang!", noun);

[10.3557]

[10.3626]

                mprf("You slam the %s%s shut with an echoing bang!", adj, noun);

Replacement in crawl-ref/source/acr.cc at line 3592 [6.4397395]

B:BD[6.4467856] → [8.5258:5324]

            mprf("As you close the %s, it creaks loudly!", noun);

[6.4467856]

[6.4467917]

            mprf("As you close the %s%s, it creaks loudly!", adj, noun);

Replacement in crawl-ref/source/acr.cc at line 3598 [6.4397395]

B:BD[8.5413] → [8.5413:5463]

            mprf( "You %s the %s.", verb, noun );

[8.5413]

[6.4468143]

            mprf( "You %s the %s%s.", verb, adj, noun );

Replacement in crawl-ref/source/acr.cc at line 3611 [6.4397395]

B:BD[6.4468245] → [6.4468245:4468308]

        mpr("There isn't anything that you can close there!");

[6.4468245]

[6.4468308]

        switch (feat)
        {
        case DNGN_CLOSED_DOOR:
            mpr("It's already closed!"); break;
        default:
            mpr("There isn't anything that you can close there!"); break;
        }