fiddlerwoaroof/crawl - Change NNPZRCS5JFDUPFW55GG4EWGF3DO5N5VNN6BXOD4LNLHMAV4OYKQQC

Inform user on why a known shaft trap isn't triggered (fixes bug 2294949).

Be more agressive about making shaft traps on invalid levels disappear in a puff of logic.

If a wizard command creates a trap shaft on an invalid level, inform the user.

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

Created by zelgadis on November 22, 2008

NNPZRCS5JFDUPFW55GG4EWGF3DO5N5VNN6BXOD4LNLHMAV4OYKQQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/traps.cc at line 610 [5.5308]

[3.424]

[4.12200]

        // Paranoia
        if (!is_valid_shaft_level())
        {
            if (you_know && in_sight)
                mpr("The shaft disappears in a puff of logic!");
            trap_destroyed = true;
            break;
        }

Insertion in crawl-ref/source/traps.cc at line 622 [5.5308]

[4.12272]

        {
            if (you_trigger)
            {
               if (triggerer.airborne())
               {
                   if (you.flight_mode() == FL_LEVITATE)
                       mpr("You float over the shaft.");
                   else
                       mpr("You fly over the shaft.");
               }
               else
                   mpr("You carefully avoid triggering the shaft.");
            }

Insertion in crawl-ref/source/traps.cc at line 636 [5.5308]
[4.12291]
[4.12291]
```
        }
```
Replacement in crawl-ref/source/traps.cc at line 656 [5.5308]
∅:D[6.421] → [3.430:487]
B:BD[3.430] → [3.430:487]
```
        // Paranoia
        if (!is_valid_shaft_level())
```
[6.421]
[3.487]
```
        // Fire away!
```
Deletion in crawl-ref/source/traps.cc at line 658 [5.5308]
B:BD[3.497] → [4.12789:12827]
∅:D[7.484] → [3.526:592]
∅:D[4.12827] → [3.526:592]
B:BD[3.526] → [3.526:592]
B:BD[3.592] → [2.1411:1446]
∅:D[2.1446] → [3.1001:1011]
∅:D[4.12857] → [3.1001:1011]
B:BD[3.1001] → [3.1001:1011]
B:BD[3.1011] → [4.12858:12871]
∅:D[8.951] → [6.422:432]
∅:D[4.12871] → [6.422:432]
B:BD[3.1041] → [6.422:432]
B:BD[6.432] → [4.12872:12898]
```
            if (you_know && in_sight)
                mpr("The shaft disappears in a puff of logic!");
            trap_destroyed = true;
        }
        else
        {
            // Fire away!
```

Replacement in crawl-ref/source/misc.cc at line 1806 [9.1933596]

B:BD[3.18337] → [3.18337:18411]

                mpr("Strange, the shaft doesn't seem to lead anywhere.");

[3.18337]

[3.18411]

                mpr("The shaft disappears is a puff of logic!");
            find_trap(you.pos())->destroy();

Replacement in crawl-ref/source/misc.cc at line 1816 [9.1933596]

B:BD[3.18566] → [3.18566:18640]

                mpr("Strange, the shaft doesn't seem to lead anywhere.");

[3.18566]

[3.18640]

            {
                mpr("Strange, the shaft seems to lead back to this level.");
                mpr("The strain on the space-time continuum destroys the "
                    "shaft!");
            }
            find_trap(you.pos())->destroy();

Insertion in crawl-ref/source/debug.cc at line 3585 [9.4016436]

[10.24800]

[11.1039273]


    if (trap == TRAP_SHAFT && !is_valid_shaft_level())
        mpr("NOTE: Shaft traps aren't valid on this level.");