fiddlerwoaroof/crawl - Change QUHEENPY2PYTEUS7C4R3CKE4FHSHGR2BIXB6EW676ESX3727PA3AC

- Move "shaft disappears in a puff of logic" logic further down, so it's

easier to test floating over traps

Don't yesno if an airborne player tries to move over a shaft.

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

Created by pauldubois on March 17, 2008

QUHEENPY2PYTEUS7C4R3CKE4FHSHGR2BIXB6EW676ESX3727PA3AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/traps.cc at line 426 [4.5308]

[3.430]

        if (!you.will_trigger_shaft())
        {
            if (trap_known && !you.airborne())
                mpr("You don't fall through the shaft.");
            if (!trap_known)
                grd[you.x_pos][you.y_pos] = DNGN_UNDISCOVERED_TRAP;
            return;
        }

Deletion in crawl-ref/source/traps.cc at line 445 [4.5308]

B:BD[3.700] → [3.700:827]

B:BD[3.827] → [5.133:192]

∅:D[5.192] → [3.882:981]

B:BD[3.882] → [3.882:981]

            return;
        }
        if (!you.will_trigger_shaft())
        {
            if (trap_known && !you.airborne())
                mpr("You don't fall through the shaft..");
            if (!trap_known)
                grd[you.x_pos][you.y_pos] = DNGN_UNDISCOVERED_TRAP;

Insertion in crawl-ref/source/traps.cc at line 449 [4.5308]
[3.1041]
[3.1041]
```
        {
```
Insertion in crawl-ref/source/traps.cc at line 455 [4.5308]
[3.1190]
[3.1190]
```
        }
```

Replacement in crawl-ref/source/player.cc at line 161 [7.962854]

B:BD[6.1112] → [2.2746:2796]

            if (trap_type_at_xy(x,y) == TRAP_ZOT)

[6.1112]

[2.2796]

            const trap_type type = trap_type_at_xy(x,y);
            if (type == TRAP_ZOT)

Insertion in crawl-ref/source/player.cc at line 171 [7.962854]

[2.3235]

            }
            else if (type == TRAP_SHAFT && you.airborne())
            {
                // No prompt

Replacement in crawl-ref/source/player.cc at line 185 [7.962854]

B:BD[6.1550] → [2.3621:4039]

                std::string prompt = "Really step ";
                            prompt += (trap_type_at_xy(x,y) == TRAP_ALARM ?
                                      "onto" : "into");
                            prompt += " that ";
                prompt += feature_description(new_grid, trap_type_at_xy(x,y),
                                              false, DESC_BASENAME, false);
                prompt += '?';

[6.1550]

[2.4039]

                std::string prompt = make_stringf(
                    "Really step %s that %s?",
                    (type == TRAP_ALARM) ? "onto" : "into",
                    feature_description(new_grid, type,
                                        false, DESC_BASENAME, false).c_str());