fiddlerwoaroof/crawl - Change BXQ2UMD4SSS5IUZZEDNVUKH6H26WE7LHARPAWIFEQCJM5WWLWCVQC

As per FR 2837779, change Forescry to Phase Shift (Trl). Same level,

same effect, but different name, description, and messages.

Also, See Invisible is now pure Ench, and has been moved into the Book of Enchantments.

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

Created by j-p-e-g on August 14, 2009

BXQ2UMD4SSS5IUZZEDNVUKH6H26WE7LHARPAWIFEQCJM5WWLWCVQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-data.h at line 1879 [5.268152]
B:BD[5.288460] → [5.288460:288503]
```
     SPTYP_ENCHANTMENT | SPTYP_DIVINATION,
```
[5.288460]
[6.3808]
```
     SPTYP_ENCHANTMENT,
```

Replacement in crawl-ref/source/spl-data.h at line 1891 [5.268152]

B:BD[5.288516] → [5.288516:288571]

    SPELL_FORESCRY, "Forescry",
     SPTYP_DIVINATION,

[5.288516]

[6.3841]

    SPELL_PHASE_SHIFT, "Phase Shift",
     SPTYP_TRANSLOCATION,

Replacement in crawl-ref/source/spl-cast.cc at line 2018 [5.293070]

B:BD[5.336296] → [7.13109:13163]

    case SPELL_FORESCRY:
        cast_forescry(powc);

[5.336296]

[5.336564]

    case SPELL_PHASE_SHIFT:
        cast_phase_shift(powc);

Insertion in crawl-ref/source/spl-book.cc at line 196 [5.397614]
[5.401535]
[5.401560]
```
     SPELL_SEE_INVISIBLE,
```
Deletion in crawl-ref/source/spl-book.cc at line 201 [5.397614]
B:BD[5.401652] → [5.401652:401673]
```
     SPELL_NO_SPELL,
```
Replacement in crawl-ref/source/spl-book.cc at line 362 [5.397614]
B:BD[5.406815] → [5.406815:406862]
```
     SPELL_SEE_INVISIBLE,
     SPELL_FORESCRY,
```
[5.406790]
[4.1403]
```
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
```
Insertion in crawl-ref/source/spl-book.cc at line 371 [5.397614]
[8.1029]
[9.137352]
```
     SPELL_PHASE_SHIFT,
```
Deletion in crawl-ref/source/spl-book.cc at line 378 [5.397614]
B:BD[5.407084] → [5.407084:407105]
```
     SPELL_NO_SPELL,
```
Replacement in crawl-ref/source/spells4.h at line 32 [5.434549]
∅:D[3.313] → [5.435282:435311]
B:BD[5.435282] → [5.435282:435311]
```
void cast_forescry(int pow);
```
[3.313]
[10.470]
```
void cast_phase_shift(int pow);
```

Replacement in crawl-ref/source/spells4.cc at line 332 [5.436250]

B:BD[5.447365] → [7.16911:16978]

∅:D[7.16978] → [5.447430:447458]

B:BD[5.447430] → [5.447430:447458]

// Cast_forescry: raises evasion (by 8 currently) via Divinations.
void cast_forescry(int pow)

[5.447365]

[5.447458]

// Cast_phase_shift: raises evasion (by 8 currently) via Translocations.
void cast_phase_shift(int pow)

Replacement in crawl-ref/source/spells4.cc at line 335 [5.436250]

B:BD[5.447460] → [5.447460:447570]

    if (!you.duration[DUR_FORESCRY])
        mpr("You begin to receive glimpses of the immediate future...");

[5.447460]

[11.211]

    if (!you.duration[DUR_PHASE_SHIFT])
        mpr("You begin to phase in and out of the material plane...");

Replacement in crawl-ref/source/spells4.cc at line 338 [5.436250]

B:BD[11.220] → [11.220:275]

        mpr("Your vision of the future intensifies.");

[11.220]

[5.447570]

        mpr("Your phasing becomes more pronounced.");

Replacement in crawl-ref/source/spells4.cc at line 340 [5.436250]
B:BD[5.447571] → [5.447571:447623]
```
    you.duration[DUR_FORESCRY] += 5 + random2(pow);
```
[5.447571]
[5.447623]
```
    you.duration[DUR_PHASE_SHIFT] += 5 + random2(pow);
```

Replacement in crawl-ref/source/spells4.cc at line 342 [5.436250]

B:BD[5.447624] → [5.447624:447706]

    if (you.duration[DUR_FORESCRY] > 30)
        you.duration[DUR_FORESCRY] = 30;

[5.447624]

[5.447706]

    if (you.duration[DUR_PHASE_SHIFT] > 30)
        you.duration[DUR_PHASE_SHIFT] = 30;

Replacement in crawl-ref/source/spells1.cc at line 1145 [5.616635]

B:BD[12.440] → [12.440:512]

        DUR_FORESCRY, DUR_SEE_INVISIBLE, DUR_WEAPON_BRAND, DUR_SILENCE,

[12.440]

[12.512]

        DUR_PHASE_SHIFT, DUR_SEE_INVISIBLE, DUR_WEAPON_BRAND, DUR_SILENCE,

Replacement in crawl-ref/source/spells1.cc at line 1259 [5.616635]

B:BD[5.635310] → [5.635310:635374]

    if (you.duration[DUR_FORESCRY])
        cast_forescry(pow);

[5.635310]

[5.635374]

    if (you.duration[DUR_PHASE_SHIFT])
        cast_phase_shift(pow);

Replacement in crawl-ref/source/player.cc at line 2454 [5.962854]
B:BD[13.2836] → [13.2836:2872]
```
    if (you.duration[DUR_FORESCRY])
```
[13.2836]
[13.2872]
```
    if (you.duration[DUR_PHASE_SHIFT])
```
Replacement in crawl-ref/source/player.cc at line 2561 [5.962854]
B:BD[5.999957] → [5.999957:999993]
```
    if (you.duration[DUR_FORESCRY])
```
[5.999957]
[5.999993]
```
    if (you.duration[DUR_PHASE_SHIFT])
```
Replacement in crawl-ref/source/player.cc at line 3892 [5.962854]
B:BD[14.3469] → [14.3469:3492]
```
    case DUR_FORESCRY:
```
[14.3469]
[14.3492]
```
    case DUR_PHASE_SHIFT:
```

Replacement in crawl-ref/source/player.cc at line 4144 [5.962854]

B:BD[5.1032908] → [14.7739:7806]

    _output_expiring_message(DUR_FORESCRY, "You are forewarned.");

[5.1032908]

[5.1033009]

    _output_expiring_message(DUR_PHASE_SHIFT,
                             "You phase in and out of the material plane.");

Replacement in crawl-ref/source/output.cc at line 493 [5.1088282]

B:BD[15.5516] → [16.7092:7166]

    textcolor(you.duration[DUR_FORESCRY] ? LIGHTBLUE : HUD_VALUE_COLOUR);

[15.5516]

[15.5611]

    textcolor(you.duration[DUR_PHASE_SHIFT] ? LIGHTBLUE : HUD_VALUE_COLOUR);

Replacement in crawl-ref/source/output.cc at line 2399 [5.1088282]

∅:D[14.11668] → [17.3364:3400]

B:BD[18.4327] → [17.3364:3400]

B:BD[17.3400] → [14.11669:11747]

    if (you.duration[DUR_FORESCRY])
        status.push_back(_get_expiration_string(DUR_FORESCRY, "forewarned"));

[14.11668]

[18.4422]

    if (you.duration[DUR_PHASE_SHIFT])
        status.push_back(_get_expiration_string(DUR_PHASE_SHIFT, "phasing"));

Replacement in crawl-ref/source/enum.h at line 1202 [5.3287960]
∅:D[19.4482] → [5.3311802:3311820]
B:BD[5.3311802] → [5.3311802:3311820]
```
    DUR_FORESCRY,
```
[19.4482]
[20.15035]
```
    DUR_PHASE_SHIFT,
```
Replacement in crawl-ref/source/enum.h at line 2798 [5.3287960]
B:BD[5.3367172] → [21.6192:6212]
```
    SPELL_FORESCRY,
```
[5.3367172]
[21.6212]
```
    SPELL_PHASE_SHIFT,
```
Replacement in crawl-ref/source/decks.cc at line 1885 [5.3987460]
B:BD[22.22098] → [23.17529:17560]
∅:D[23.17560] → [22.22128:22159]
B:BD[22.22128] → [22.22128:22159]
B:BD[22.22159] → [23.17561:17592]
```
    bool do_forescry  = false;
    bool do_stoneskin = false;
    bool do_shield    = false;
```
[22.22098]
[22.22187]
```
    bool do_phaseshift = false;
    bool do_stoneskin  = false;
    bool do_shield     = false;
```

Replacement in crawl-ref/source/decks.cc at line 1893 [5.3987460]

B:BD[22.22246] → [23.17653:17788]

        if (coinflip()) do_forescry  = true;
        if (coinflip()) do_stoneskin = true;
        if (coinflip()) do_shield    = true;

[22.22246]

[22.22383]

        if (coinflip()) do_phaseshift = true;
        if (coinflip()) do_stoneskin  = true;
        if (coinflip()) do_shield     = true;

Replacement in crawl-ref/source/decks.cc at line 1900 [5.3987460]

B:BD[22.22457] → [23.17816:17951]

        if (coinflip()) do_forescry  = true;
        if (coinflip()) do_stoneskin = true;
        if (coinflip()) do_shield    = true;

[22.22457]

[22.22594]

        if (coinflip()) do_phaseshift = true;
        if (coinflip()) do_stoneskin  = true;
        if (coinflip()) do_shield     = true;

Replacement in crawl-ref/source/decks.cc at line 1907 [5.3987460]
∅:D[23.18003] → [22.22660:22692]
B:BD[22.22660] → [22.22660:22692]
```
            do_forescry = true;
```
[23.18003]
[22.22692]
```
            do_phaseshift = true;
```
Replacement in crawl-ref/source/decks.cc at line 1909 [5.3987460]
B:BD[22.22705] → [22.22705:22738]
```
            do_stoneskin = true;
```
[22.22705]
[22.22738]
```
            do_stoneskin  = true;
```
Replacement in crawl-ref/source/decks.cc at line 1912 [5.3987460]
B:BD[5.4000685] → [23.18004:18025]
∅:D[23.18025] → [22.22768:22811]
B:BD[22.22768] → [22.22768:22811]
```
    if (do_forescry)
        cast_forescry( random2(power/4) );
```
[5.4000685]
[23.18026]
```
    if (do_phaseshift)
        cast_phase_shift( random2(power/4) );
```
Replacement in crawl-ref/source/debug.cc at line 4781 [5.4016436]
B:BD[24.7555] → [24.7555:7571]
```
    "forescry",
```
[24.7555]
[24.7571]
```
    "phase shift",
```

Deletion in crawl-ref/source/dat/descript/spells.txt at line 252 [26.2853]

∅:D[25.7967] → [26.13337:13352]

B:BD[26.13337] → [26.13337:13352]

B:BD[26.13352] → [25.7968:8171]

%%%%
Forescry
This spell makes the caster aware of the immediate future; while not far enough to predict the result of a fight, it does give the caster ample time to get out of the way of a punch (reflexes allowing).

Insertion in crawl-ref/source/dat/descript/spells.txt at line 388 [26.2853]

[2.2816]

[26.19240]

%%%%
Phase Shift
This spell causes the caster to sporadically phase in and out of the material plane, causing blows to occasionally pass through.

Replacement in crawl-ref/source/acr.cc at line 2207 [5.4397395]

B:BD[5.4447349] → [27.3062:3178]

    if (_decrement_a_duration(DUR_FORESCRY,
                              "You feel firmly rooted in the present.",

[5.4447349]

[14.17197]

    if (_decrement_a_duration(DUR_PHASE_SHIFT,
                              "You feel completely stable again.",

Replacement in crawl-ref/source/acr.cc at line 2210 [5.4397395]

∅:D[14.17239] → [27.3223:3301]

B:BD[27.3223] → [27.3223:3301]

                              "Your vision of the future begins to falter."))

[14.17239]

[28.3869]

                              "Your phasing is about to run out."))

As per FR 2837779, change Forescry to Phase Shift (Trl). Same level,

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-data.h at line 1879 [5.268152]

Replacement in crawl-ref/source/spl-data.h at line 1891 [5.268152]

Replacement in crawl-ref/source/spl-cast.cc at line 2018 [5.293070]

Insertion in crawl-ref/source/spl-book.cc at line 196 [5.397614]

Deletion in crawl-ref/source/spl-book.cc at line 201 [5.397614]

Replacement in crawl-ref/source/spl-book.cc at line 362 [5.397614]

Insertion in crawl-ref/source/spl-book.cc at line 371 [5.397614]

Deletion in crawl-ref/source/spl-book.cc at line 378 [5.397614]

Replacement in crawl-ref/source/spells4.h at line 32 [5.434549]

Replacement in crawl-ref/source/spells4.cc at line 332 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 335 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 338 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 340 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 342 [5.436250]

Replacement in crawl-ref/source/spells1.cc at line 1145 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 1259 [5.616635]

Replacement in crawl-ref/source/player.cc at line 2454 [5.962854]

Replacement in crawl-ref/source/player.cc at line 2561 [5.962854]

Replacement in crawl-ref/source/player.cc at line 3892 [5.962854]

Replacement in crawl-ref/source/player.cc at line 4144 [5.962854]

Replacement in crawl-ref/source/output.cc at line 493 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 2399 [5.1088282]

Replacement in crawl-ref/source/enum.h at line 1202 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2798 [5.3287960]

Replacement in crawl-ref/source/decks.cc at line 1885 [5.3987460]

Replacement in crawl-ref/source/decks.cc at line 1893 [5.3987460]

Replacement in crawl-ref/source/decks.cc at line 1900 [5.3987460]

Replacement in crawl-ref/source/decks.cc at line 1907 [5.3987460]

Replacement in crawl-ref/source/decks.cc at line 1909 [5.3987460]

Replacement in crawl-ref/source/decks.cc at line 1912 [5.3987460]

Replacement in crawl-ref/source/debug.cc at line 4781 [5.4016436]

Deletion in crawl-ref/source/dat/descript/spells.txt at line 252 [26.2853]

Insertion in crawl-ref/source/dat/descript/spells.txt at line 388 [26.2853]

Replacement in crawl-ref/source/acr.cc at line 2207 [5.4397395]

Replacement in crawl-ref/source/acr.cc at line 2210 [5.4397395]