fiddlerwoaroof/crawl - Change GZMPIDNMBXZ4B2ZWKREHBPAVN53J6WRVY5W5KY52KEBHKU6IW4IQC

Cleaning up magic mapping. Patch by dolorous.

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

Created by j-p-e-g on September 13, 2007

GZMPIDNMBXZ4B2ZWKREHBPAVN53J6WRVY5W5KY52KEBHKU6IW4IQC

Dependencies

In channels

main

Change contents

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

B:BD[4.14831] → [2.5:77]

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

[4.14831]

[4.15127]

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

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

B:BD[2.108] → [2.108:171]

bool magic_mapping(int map_radius, int proportion, bool force)

[2.108]

[4.79135]

bool magic_mapping(int map_radius, int proportion, bool suppress_msg,
                   bool force)

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

[2.317]

        if (!suppress_msg)
            mpr("You feel momentarily disoriented.");

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

[2.345]


    if (!suppress_msg)
        mpr( "You feel aware of your surroundings." );

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

B:BD[4.326140] → [2.574:789]

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

[4.326140]

[4.326211]

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

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

B:BD[4.2862092] → [2.901:1049]

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

[4.2862092]

[2.1049]

        if (you.level_type == LEVEL_PANDEMONIUM)
        {
            if (!item_type_known(scroll))
            {
                mpr("You feel momentarily disoriented.");
                id_the_scroll = false;
            }
            else
                mpr("Your Earth magic cannot map Pandemonium.");
        }

Replacement in crawl-ref/source/item_use.cc at line 3654 [4.2781507]
∅:D[2.1062] → [4.2862194:2862248]
B:BD[4.2862194] → [4.2862194:2862248]
```
            mpr("You feel momentarily disoriented.");
```
[2.1062]
[4.2862432]
```
            id_the_scroll = magic_mapping(50, 90 + random2(11), false);
```

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

B:BD[4.2893427] → [2.1103:1178]

    else if (magic_mapping( 15, 50 + random2( you.skills[SK_EVOCATIONS])))

[4.2893427]

[4.2893436]

    else if (magic_mapping( 15, 50 + random2( you.skills[SK_EVOCATIONS]), true))

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

B:BD[5.4569] → [2.1268:1338]

        if (!magic_mapping( random2(power/10) + 15, random2(power) ))

[5.4569]

[2.1338]

        if (!magic_mapping( random2(power/10) + 15, random2(power), true))

Replacement in crawl-ref/source/acr.cc at line 792 [4.4397395]
B:BD[4.4415630] → [2.1425:1465]
```
        magic_mapping(1000, 100, true);
```
[4.4415630]
[6.1256923]
```
        magic_mapping(1000, 100, true, true);
```

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

B:BD[4.4511009] → [2.1470:1622]

        if ( magic_mapping(  3 + roll_dice( 2, you.skills[SK_EVOCATIONS]),
                             40 + roll_dice( 2, you.skills[SK_EVOCATIONS])))

[4.4511009]

[2.1622]

    case ABIL_MAPPING:          // Gnome + sense surrounds mut
        if (abil.ability == ABIL_MAPPING && you.mutation[MUT_MAPPING] < 3 &&
            you.level_type == LEVEL_PANDEMONIUM)
        {
            mpr("You feel momentarily disoriented.");
            return (false);
        }
        power = (abil.ability == ABIL_EVOKE_MAPPING) ?
            you.skills[SK_EVOCATIONS] : you.experience_level;
        if ( magic_mapping(  3 + roll_dice( 2,
                             (abil.ability == ABIL_EVOKE_MAPPING) ? power :
                             power + you.mutation[MUT_MAPPING] * 10),
                             40 + roll_dice( 2, power), true) )
        {

Insertion in crawl-ref/source/abl-show.cc at line 999 [4.4494389]
[2.1671]
[2.1671]
```
        }
```

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

B:BD[4.4511200] → [4.4511200:4511239]

        exercise( SK_EVOCATIONS, 1 );

[4.4511200]

[4.4511239]

        if (abil.ability == ABIL_EVOKE_MAPPING)
            exercise( SK_EVOCATIONS, 1 );

Deletion in crawl-ref/source/abl-show.cc at line 1007 [4.4494389]

B:BD[4.4511255] → [4.4511255:4511575]

    case ABIL_MAPPING:          // Gnome + sense surrounds mut
        mpr("You sense your surroundings.");
        magic_mapping(  3 + roll_dice( 2, you.experience_level )
                            + you.mutation[MUT_MAPPING] * 10,
                       40 + roll_dice( 2, you.experience_level ) );
        break;

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

B:BD[3.3377] → [3.3377:3536]

    if ((you.level_type == LEVEL_DUNGEON && you.mutation[MUT_MAPPING]) ||
        (you.level_type == LEVEL_PANDEMONIUM && you.mutation[MUT_MAPPING]==3))
    {

[3.3377]

[3.3536]

    if (you.mutation[MUT_MAPPING])

Deletion in crawl-ref/source/abl-show.cc at line 1924 [4.4494389]
B:BD[3.3596] → [3.3596:3602]
```
    }
```