fiddlerwoaroof/crawl - Change SOVD3G5ES7YEJRPWDNG7Z2QTTJ4L2MGZANUY47R3CQCKIKCPGKNAC

Be (much) nicer about damage when climbing up/down stairs while confused.

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

Created by haranp on February 8, 2009

SOVD3G5ES7YEJRPWDNG7Z2QTTJ4L2MGZANUY47R3CQCKIKCPGKNAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/misc.cc at line 1690 [5.1933596]
∅:D[3.2629] → [4.11584:11682]
B:BD[6.18804] → [4.11584:11682]
∅:D[7.271] → [5.1944584:1944619]
∅:D[4.11682] → [5.1944584:1944619]
B:BD[5.1944584] → [5.1944584:1944619]
```
        && stair_find >= DNGN_STONE_STAIRS_UP_I
        && stair_find <= DNGN_STONE_STAIRS_UP_III
        && random2(100) > you.dex)
```
[3.2629]
[5.1944619]
```
        && !grid_is_escape_hatch(stair_find)
        && coinflip())
```

Replacement in crawl-ref/source/misc.cc at line 1693 [5.1933596]

B:BD[5.1944625] → [5.1944625:1944705]

        mpr("In your confused state, you trip and fall back down the stairs.");

[5.1944625]

[5.1944705]

        const char* fall_where = "down the stairs";
        if (!grid_is_staircase(stair_find))
            fall_where = "through the gate";

Replacement in crawl-ref/source/misc.cc at line 1697 [5.1933596]

B:BD[5.1944706] → [8.4497:4604]

∅:D[8.4604] → [5.1944809:1944810]

B:BD[5.1944809] → [5.1944809:1944810]

        ouch(roll_dice(3 + you.burden_state, 5), NON_MONSTER,
             KILLED_BY_FALLING_DOWN_STAIRS);

[5.1944706]

[9.545092]

        mprf("In your confused state, you trip and fall back %s.", fall_where);
        ouch(1, NON_MONSTER, KILLED_BY_FALLING_DOWN_STAIRS);

Replacement in crawl-ref/source/misc.cc at line 1703 [5.1933596]

B:BD[5.1944863] → [10.2552:2594]

B:BD[10.2594] → [11.4897:4943]

    if (you.burden_state == BS_OVERLOADED
        && !grid_is_escape_hatch(stair_find))

[5.1944863]

[5.1944906]

    if (you.burden_state == BS_OVERLOADED && !grid_is_escape_hatch(stair_find))

Replacement in crawl-ref/source/misc.cc at line 2175 [5.1933596]
B:BD[12.2861] → [13.3599:3634]
```
        && random2(100) > you.dex)
```
[12.2861]
[5.1956294]
```
        && coinflip())
```

Replacement in crawl-ref/source/misc.cc at line 2177 [5.1933596]

B:BD[5.1956300] → [12.2901:2954]

        std::string fall_where = "down the stairs";

[5.1956300]

[2.12676]

        const char* fall_where = "down the stairs";

Deletion in crawl-ref/source/misc.cc at line 2180 [5.1933596]

B:BD[12.3222] → [12.3222:3319]


        mprf("In your confused state, you trip and fall %s.",
             fall_where.c_str());

Replacement in crawl-ref/source/misc.cc at line 2181 [5.1933596]

B:BD[5.1956376] → [6.19074:19144]

B:BD[6.19144] → [14.7461:7497]

B:BD[14.7497] → [8.4737:4845]

        // Nastier than when climbing stairs, but you'll aways get to
        // your destination. -- bwr
        ouch(roll_dice(6 + you.burden_state, 10), NON_MONSTER,
             KILLED_BY_FALLING_DOWN_STAIRS);

[5.1956376]

[5.1956587]

        mprf("In your confused state, you trip and fall %s.", fall_where);
        // Note that this only does damage; it doesn't cancel the level
        // transition.
        ouch(1, NON_MONSTER, KILLED_BY_FALLING_DOWN_STAIRS);