fiddlerwoaroof/crawl - Change 3WAR2UAC4C4D2GOK4AUV4JITGFSBO3NIBAXGQZXSMFUTNTCLTU4AC

[1757174] Disallow mapping in labyrinths.

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

Created by dshaligram on October 24, 2007

3WAR2UAC4C4D2GOK4AUV4JITGFSBO3NIBAXGQZXSMFUTNTCLTU4AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-data.h at line 718 [4.268152]
B:BD[4.279256] → [5.121156:121174]
```
     SPFLAG_NONE,
```
[4.279256]
[6.1672]
```
     SPFLAG_MAPPING,
```
Replacement in crawl-ref/source/spl-data.h at line 785 [4.268152]
B:BD[4.279892] → [5.121308:121326]
```
     SPFLAG_NONE,
```
[4.279892]
[6.1786]
```
     SPFLAG_MAPPING,
```
Replacement in crawl-ref/source/spl-data.h at line 882 [4.268152]
B:BD[4.280609] → [5.121549:121567]
```
     SPFLAG_NONE,
```
[4.280609]
[6.1957]
```
     SPFLAG_MAPPING,
```
Replacement in crawl-ref/source/spl-data.h at line 1388 [4.268152]
B:BD[4.284652] → [5.122693:122711]
```
     SPFLAG_NONE,
```
[4.284652]
[6.2848]
```
     SPFLAG_MAPPING,
```

Replacement in crawl-ref/source/spl-cast.h at line 29 [4.291319]

B:BD[7.46343] → [7.46343:46413]

    SPFLAG_UNHOLY               = 0x0040        // counts at "unholy"

[7.46343]

[7.46413]

    SPFLAG_UNHOLY               = 0x0040,       // counts at "unholy"
    SPFLAG_MAPPING              = 0x0080        // a mapping spell of some kind

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

B:BD[4.312599] → [8.2156:2194]

        if (spfl < spell_fail(spell))

[4.312599]

[4.312636]

        const int spfail_chance = spell_fail(spell);
        // Divination mappings backfire in Labyrinths.
        if (you.level_type == LEVEL_LABYRINTH
            && testbits(flags, SPFLAG_MAPPING))
        {
            mprf(MSGCH_WARN,
                 "The warped magic of this place twists your "
                 "spell in on itself!");
            spfl = spfail_chance / 2 - 1;
        }
        if (spfl < spfail_chance)

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

B:BD[8.2370] → [8.2370:2442]

                                    * (spell_fail(spell) - spfl) + 250;

[8.2370]

[4.313634]

                                    * (spfail_chance - spfl) + 250;

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

B:BD[8.2498] → [8.2498:2559]

                            spell_fail(spell) - spfl, 100 );

[8.2498]

[4.313929]

                            spfail_chance - spfl, 100 );

Replacement in crawl-ref/source/spl-book.cc at line 1502 [4.397614]

B:BD[5.141975] → [9.1685:1789]

    // All checks passed, we can cast the spell
    if (your_spells(spell, powc, false) == SPRET_ABORT)

[5.141975]

[3.8690]

    const int flags = get_spell_flags(spell);
    // Labyrinths block divinations.
    if (you.level_type == LEVEL_LABYRINTH
        && testbits(flags, SPFLAG_MAPPING))
    {
        mpr("Something interferes with your magic!");
    }
    // All checks passed, we can cast the spell    
    else if (your_spells(spell, powc, false) == SPRET_ABORT)

Deletion in crawl-ref/source/spl-book.cc at line 1517 [4.397614]
∅:D[9.1842] → [5.142373:142374]
B:BD[5.142373] → [5.142373:142374]
Deletion in crawl-ref/source/spl-book.cc at line 1518 [4.397614]
∅:D[9.1868] → [4.434318:434319]
∅:D[5.142415] → [4.434318:434319]
B:BD[4.434318] → [4.434318:434319]

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

B:BD[4.2892882] → [10.12119:12212]

    use = ((!you.duration[DUR_CONF]) ? random2(you.skills[SK_EVOCATIONS] * 6) : random2(5));

[4.2892882]

[4.2892961]

    use = ((!you.duration[DUR_CONF]) ?
           random2(you.skills[SK_EVOCATIONS] * 6) : random2(5));

Replacement in crawl-ref/source/it_use3.cc at line 734 [4.2870456]
B:BD[4.2893163] → [4.2893163:2893186]
```
    else if (use < 10)
```
[4.2893163]
[4.2893186]
```
    else if (use < 10 || you.level_type == LEVEL_LABYRINTH)
```

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

[4.2893192]

        if (you.level_type == LEVEL_LABYRINTH)
            mpr("You see a maze of twisty little passages, all alike.");

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

B:BD[2.1475] → [2.1475:1601]

        if (abil.ability == ABIL_MAPPING && you.mutation[MUT_MAPPING] < 3 &&
            you.level_type == LEVEL_PANDEMONIUM)

[2.1475]

[2.1601]

        if (abil.ability == ABIL_MAPPING && you.mutation[MUT_MAPPING] < 3
            && (you.level_type == LEVEL_PANDEMONIUM
                || you.level_type == LEVEL_LABYRINTH))

[1757174] Disallow mapping in labyrinths.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-data.h at line 718 [4.268152]

Replacement in crawl-ref/source/spl-data.h at line 785 [4.268152]

Replacement in crawl-ref/source/spl-data.h at line 882 [4.268152]

Replacement in crawl-ref/source/spl-data.h at line 1388 [4.268152]