fiddlerwoaroof/crawl - Change AMFTO4UE74UYQBU3R2EYUU6BJ7SC4O4NOAFICRTLMT3MIFRQ6AKAC

Cleaned up magic mapping: the test regarding whether you can magic map

is done inside magic_mapping(), which now returns a bool success value. Functionally: this means that the randart magic mapping power can no longer map the Abyss or labyrinths, ditto Map card. We can change this part back if we want.

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

Created by haranp on July 13, 2007

AMFTO4UE74UYQBU3R2EYUU6BJ7SC4O4NOAFICRTLMT3MIFRQ6AKAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.h at line 64 [4.13254]

B:BD[4.14831] → [4.14831:15127]

// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: ability - acr - it_use3 - item_use - spell
 * *********************************************************************** */
void magic_mapping(int map_radius, int proportion);

[4.14831]

[4.15127]

bool magic_mapping(int map_radius, int proportion, bool force = false);

Replacement in crawl-ref/source/view.cc at line 2979 [4.16817]

B:BD[4.79084] → [4.79084:79135]

void magic_mapping(int map_radius, int proportion)

[4.79084]

[4.79135]

// Returns true if succeeded
bool magic_mapping(int map_radius, int proportion, bool force)

Insertion in crawl-ref/source/view.cc at line 2982 [4.16817]

[4.79137]

    if (!force &&
        ((you.level_type == LEVEL_ABYSS) ||
         (you.level_type == LEVEL_LABYRINTH && you.species != SP_MINOTAUR)))
    {
        return false;
    }

Insertion in crawl-ref/source/view.cc at line 3071 [4.16817]
[4.80382]
[4.80382]
```
    return true;
```

Replacement in crawl-ref/source/spl-cast.cc at line 1245 [4.293070]

B:BD[4.325750] → [2.145:271]

∅:D[2.271] → [4.325830:325938]

B:BD[4.325830] → [4.325830:325938]

        if ( (you.level_type == LEVEL_LABYRINTH && you.species != SP_MINOTAUR)
             || you.level_type == LEVEL_ABYSS)
            mpr("You feel momentarily disoriented.");
        else if (you.level_type == LEVEL_PANDEMONIUM)

[4.325750]

[4.325938]

        if (you.level_type == LEVEL_PANDEMONIUM)
        {

Insertion in crawl-ref/source/spl-cast.cc at line 1248 [4.293070]
[4.325999]
[4.325999]
```
        }
```
Deletion in crawl-ref/source/spl-cast.cc at line 1251 [4.293070]
B:BD[4.326022] → [4.326022:326081]
```
            mpr( "You feel aware of your surroundings." );
```

Replacement in crawl-ref/source/spl-cast.cc at line 1252 [4.293070]

B:BD[4.326140] → [4.326140:326211]

            magic_mapping( 5 + powc, 50 + random2avg( powc * 2, 2 ) );

[4.326140]

[4.326211]

            if ( magic_mapping( 5 + powc, 50 + random2avg( powc * 2, 2 ) ) )
                mpr( "You feel aware of your surroundings." );
            else
                mpr("You feel momentarily disoriented.");

Replacement in crawl-ref/source/item_use.cc at line 3402 [4.2781507]

B:BD[4.2862092] → [2.383:509]

∅:D[2.509] → [4.2862184:2862194]

B:BD[4.2862184] → [4.2862184:2862194]

        if ( (you.level_type == LEVEL_LABYRINTH && you.species != SP_MINOTAUR)
             || you.level_type == LEVEL_ABYSS)
        {

[4.2862092]

[4.2862194]

        id_the_scroll = magic_mapping(50, 90 + random2(11));
        if ( id_the_scroll )
            mpr("You feel aware of your surroundings.");
        else

Deletion in crawl-ref/source/item_use.cc at line 3408 [4.2781507]

B:BD[4.2862248] → [4.2862248:2862432]

            id_the_scroll = false;
        }
        else
        {
            mpr("You feel aware of your surroundings.");
            magic_mapping(50, 90 + random2(11));
        }

Replacement in crawl-ref/source/it_use3.cc at line 700 [4.2870456]

B:BD[4.2893249] → [4.2893249:2893271]

B:BD[4.2893271] → [2.512:611]

∅:D[2.611] → [4.2893321:2893382]

B:BD[4.2893321] → [4.2893321:2893382]

    else if (use < 15
             || (you.level_type == LEVEL_LABYRINTH &&
                 you.species != SP_MINOTAUR)
             || you.level_type == LEVEL_ABYSS || coinflip())

[4.2893249]

[4.2893382]

    else if (use < 15 || coinflip())

Replacement in crawl-ref/source/it_use3.cc at line 704 [4.2870456]
B:BD[4.2893427] → [4.2893427:2893436]
```
    else
```
[4.2893427]
[4.2893436]
```
    else if (magic_mapping( 15, 50 + random2( you.skills[SK_EVOCATIONS])))
```
Deletion in crawl-ref/source/it_use3.cc at line 707 [4.2870456]
B:BD[4.2893494] → [4.2893494:2893566]
```
        magic_mapping( 15, 50 + random2( you.skills[SK_EVOCATIONS] ) );
```
Insertion in crawl-ref/source/it_use3.cc at line 708 [4.2870456]
[4.2893586]
[4.2893586]
```
    }
    else
    {
        mpr("You see nothing.");
```

Replacement in crawl-ref/source/decks.cc at line 1190 [4.3987460]

B:BD[3.4569] → [3.4569:4634]

        magic_mapping( random2(power/10) + 15, random2(power) );

[3.4569]

[3.4634]

        if (!magic_mapping( random2(power/10) + 15, random2(power) ))
            mpr("The map is blank.");

Replacement in crawl-ref/source/acr.cc at line 720 [4.4397395]
B:BD[4.4415630] → [5.1256889:1256923]
```
        magic_mapping(1000, 100);
```
[4.4415630]
[5.1256923]
```
        magic_mapping(1000, 100, true);
```

Replacement in crawl-ref/source/abl-show.cc at line 958 [4.4494389]

B:BD[4.4511009] → [4.4511009:4511199]

        mpr("You sense your surroundings.");
        magic_mapping(  3 + roll_dice( 2, you.skills[SK_EVOCATIONS] ),
                       40 + roll_dice( 2, you.skills[SK_EVOCATIONS] ) );

[4.4511009]

[4.4511199]

        if ( magic_mapping(  3 + roll_dice( 2, you.skills[SK_EVOCATIONS]),
                             40 + roll_dice( 2, you.skills[SK_EVOCATIONS])))
            mpr("You sense your surroundings.");
        else
            mpr("You feel momentarily disoriented.");

Cleaned up magic mapping: the test regarding whether you can magic map

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.h at line 64 [4.13254]

Replacement in crawl-ref/source/view.cc at line 2979 [4.16817]

Insertion in crawl-ref/source/view.cc at line 2982 [4.16817]

Insertion in crawl-ref/source/view.cc at line 3071 [4.16817]

Replacement in crawl-ref/source/spl-cast.cc at line 1245 [4.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 1248 [4.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1251 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1252 [4.293070]

Replacement in crawl-ref/source/item_use.cc at line 3402 [4.2781507]

Deletion in crawl-ref/source/item_use.cc at line 3408 [4.2781507]

Replacement in crawl-ref/source/it_use3.cc at line 700 [4.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 704 [4.2870456]

Deletion in crawl-ref/source/it_use3.cc at line 707 [4.2870456]

Insertion in crawl-ref/source/it_use3.cc at line 708 [4.2870456]

Replacement in crawl-ref/source/decks.cc at line 1190 [4.3987460]

Replacement in crawl-ref/source/acr.cc at line 720 [4.4397395]

Replacement in crawl-ref/source/abl-show.cc at line 958 [4.4494389]