fiddlerwoaroof/crawl - Change FJ2URTFOTFNB5VZUQMFTO7MMQBBWSOPRY2RE3UG2ZFJYOXBIMC7QC

A few improvements to banished() and entry cause tracking.

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

Created by zelgadis on September 30, 2007

FJ2URTFOTFNB5VZUQMFTO7MMQBBWSOPRY2RE3UG2ZFJYOXBIMC7QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/misc.cc at line 476 [3.1933596]

B:BD[2.9249] → [2.9249:9291]

    if (old_level_type == you.level_type)

[2.9249]

[2.9291]

    if (!(old_level_type != you.level_type
          || you.entry_cause == EC_UNKNOWN))
    {

Insertion in crawl-ref/source/misc.cc at line 480 [3.1933596]
[2.9307]
[2.9307]
```
    }
```
Insertion in crawl-ref/source/effects.cc at line 155 [3.3382105]
[4.9156]
[4.9156]
```
    std::string cast_into = "";
```
Replacement in crawl-ref/source/effects.cc at line 158 [3.3382105]
B:BD[4.9157] → [4.9157:9196]
```
    if (gate_type == DNGN_ENTER_ABYSS)
```
[4.9157]
[5.1106]
```
    switch(gate_type)
```

Replacement in crawl-ref/source/effects.cc at line 160 [3.3382105]

B:BD[5.1112] → [4.9197:9340]

        const std::string what = "Cast into the Abyss" + who_banished(who);
        take_note(Note(NOTE_USER_NOTE, 0, 0, what.c_str()), true);

[5.1112]

[5.1113]

    case DNGN_ENTER_ABYSS:
        if (you.level_type == LEVEL_ABYSS)
        {
            mpr("You feel trapped.");
            return;
        }
        cast_into = "the Abyss";
        break;
    case DNGN_EXIT_ABYSS:
        if (you.level_type != LEVEL_ABYSS)
        {
            mpr("You feel dizzy for a moment.");
            return;
        }
        break;
    case DNGN_ENTER_PANDEMONIUM:
        if (you.level_type == LEVEL_PANDEMONIUM)
        {
            mpr("You feel trapped.");
            return;
        }
        cast_into = "Pandemonium";
        break;
    case DNGN_TRANSIT_PANDEMONIUM:
        if (you.level_type != LEVEL_PANDEMONIUM)
        {
            banished(DNGN_ENTER_PANDEMONIUM, who);
            return;
        }
        break;
    case DNGN_EXIT_PANDEMONIUM:
        if (you.level_type != LEVEL_PANDEMONIUM)
        {
            mpr("You feel dizzy for a moment.");
            return;
        }
        break;
    case DNGN_ENTER_LABYRINTH:
        if (you.level_type == LEVEL_LABYRINTH)
        {
            mpr("You feel trapped.");
            return;
        }
        cast_into = "a Labyrinth";
        break;
    case DNGN_ENTER_HELL:
    case DNGN_ENTER_DIS:
    case DNGN_ENTER_GEHENNA:
    case DNGN_ENTER_COCYTUS:
    case DNGN_ENTER_TARTARUS: 
        if (player_in_hell() || player_in_branch(BRANCH_VESTIBULE_OF_HELL))
        {
            mpr("You feel dizzy for a moment.");
            return;
        }
        cast_into = "Hell";
        break;
    default:
        mprf(MSGCH_DIAGNOSTICS, "Invalid banished() gateway %d",
             static_cast<int>(gate_type));
        ASSERT(false);

Replacement in crawl-ref/source/effects.cc at line 231 [3.3382105]

B:BD[2.17692] → [2.17692:17834]

    if (who.find("self") != std::string::npos || who == you.your_name
        || who == "you" || who == "You" || crawl_state.is_god_acting())

[2.17692]

[2.17834]

    if (crawl_state.is_god_acting())

Insertion in crawl-ref/source/effects.cc at line 235 [3.3382105]

[2.17937]

    }
    else if (who.find("self") != std::string::npos || who == you.your_name
             || who == "you" || who == "You")
    {
        you.entry_cause = EC_SELF_EXPLICIT;

Insertion in crawl-ref/source/effects.cc at line 265 [3.3382105]

[2.18835]

[6.53413]


    if (!crawl_state.is_god_acting())
        you.entry_cause_god = GOD_NO_GOD;

Insertion in crawl-ref/source/effects.cc at line 269 [3.3382105]

[6.53414]

[2.18836]

    if (cast_into != "" && you.entry_cause != EC_SELF_EXPLICIT)
    {
        const std::string what = "Cast into " + cast_into + who_banished(who);
        take_note(Note(NOTE_USER_NOTE, 0, 0, what.c_str()), true);
    }