fiddlerwoaroof/crawl - Change DH3D44HGNRXTSZLL5HTHKOPKCO4VZQZVBEMFOAPRJGQMLGN2BFQAC

Drop Control Teleport and Controlled Blink by one spell level each.

[1750729] Controlled Blink (the spell) now decays to semi-controlled blink on levels that block teleport control and is less likely to be blocked by the Abyss.

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

Created by dshaligram on July 15, 2007

DH3D44HGNRXTSZLL5HTHKOPKCO4VZQZVBEMFOAPRJGQMLGN2BFQAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-data.h at line 398 [6.268152]
B:BD[4.120525] → [5.1045:1053]
```
     8,
```
[4.120525]
[2.1122]
```
     7,
```
Replacement in crawl-ref/source/spl-data.h at line 1412 [6.268152]
B:BD[4.122749] → [5.2867:2875]
```
     5,
```
[4.122749]
[2.2157]
```
     4,
```
Replacement in crawl-ref/source/spl-cast.cc at line 1092 [6.293070]
B:BD[6.321485] → [4.130897:130924]
```
        if (blink() == -1)
```
[6.321485]
[5.7027]
```
        if (blink(powc, true) == -1)
```
Replacement in crawl-ref/source/spells1.h at line 67 [6.611815]
B:BD[6.613929] → [4.152554:152571]
```
int blink(void);
```
[6.613929]
[6.613947]
```
int blink(int pow, bool high_level_controlled_blink);
```

Insertion in crawl-ref/source/spells1.cc at line 49 [6.616635]

[6.617719]

[6.617741]


static bool abyss_blocks_teleport(bool cblink)
{
    // Lugonu worshippers get their perks.
    if (you.religion == GOD_LUGONU)
        return (false);

Replacement in crawl-ref/source/spells1.cc at line 56 [6.616635]

B:BD[6.617742] → [4.152807:152823]

int blink(void)

[6.617742]

[6.617759]

    // Controlled Blink (the spell) works quite reliably in the Abyss.
    return (cblink? one_chance_in(3) : !one_chance_in(3));
}
int blink(int pow, bool high_level_controlled_blink)

Replacement in crawl-ref/source/spells1.cc at line 62 [6.616635]
B:BD[6.617761] → [6.617761:617783]
```
    struct dist beam;
```
[6.617761]
[6.617783]
```
    dist beam;
```

Replacement in crawl-ref/source/spells1.cc at line 67 [6.616635]

B:BD[6.617937] → [6.617937:618002]

    else if (you.level_type == LEVEL_ABYSS && !one_chance_in(3))

[6.617937]

[6.618002]

    else if (you.level_type == LEVEL_ABYSS
             && abyss_blocks_teleport(high_level_controlled_blink))

Insertion in crawl-ref/source/spells1.cc at line 75 [6.616635]

[6.618244]

        if (high_level_controlled_blink)
            return (cast_semi_controlled_blink(pow));

Replacement in crawl-ref/source/item_use.cc at line 3504 [6.2781507]
B:BD[6.2860968] → [6.2860968:2860985]
```
        blink();
```
[6.2860968]
[6.2860985]
```
        blink(1000, false);
```
Replacement in crawl-ref/source/decks.cc at line 505 [6.3987460]
B:BD[3.17503] → [3.17503:17520]
```
        blink();
```
[3.17503]
[3.17520]
```
        blink(1000, false);
```

Replacement in crawl-ref/source/acr.cc at line 559 [6.4397395]

B:BD[6.4412810] → [6.4412810:4412866]

        blink();            // wizards can always blink

[6.4412810]

[6.4412866]

        blink(1000, true);        // wizards can always blink

Drop Control Teleport and Controlled Blink by one spell level each.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-data.h at line 398 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 1412 [6.268152]

Replacement in crawl-ref/source/spl-cast.cc at line 1092 [6.293070]

Replacement in crawl-ref/source/spells1.h at line 67 [6.611815]

Insertion in crawl-ref/source/spells1.cc at line 49 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 56 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 62 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 67 [6.616635]

Insertion in crawl-ref/source/spells1.cc at line 75 [6.616635]

Replacement in crawl-ref/source/item_use.cc at line 3504 [6.2781507]

Replacement in crawl-ref/source/decks.cc at line 505 [6.3987460]

Replacement in crawl-ref/source/acr.cc at line 559 [6.4397395]