fiddlerwoaroof/crawl - Change DRQ6OBPWBA5MKPVQXELBHOWBN3I374QHD7OBTYSOEU3XQ2WBXUJQC

Rename Zin's Revitalisation to Vitalisation.

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

Created by dolorous on May 15, 2008

DRQ6OBPWBA5MKPVQXELBHOWBN3I374QHD7OBTYSOEU3XQ2WBXUJQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.h at line 58 [12.611815]

B:BD[11.171] → [11.171:256]

void revitalisation_chain(int amount);
void reduce_revitalisation_chain(int amount);

[11.171]

[10.401]

void vitalisation_chain(int amount);
void reduce_vitalisation_chain(int amount);

Replacement in crawl-ref/source/spells1.h at line 62 [12.611815]
∅:D[11.256] → [13.170:204]
∅:D[10.464] → [13.170:204]
B:BD[14.243] → [13.170:204]
```
int cast_revitalisation(int pow);
```
[10.464]
[12.613383]
```
int cast_vitalisation(int pow);
```
Replacement in crawl-ref/source/spells1.cc at line 763 [12.616635]
B:BD[11.261] → [11.261:299]
```
void revitalisation_chain(int amount)
```
[11.261]
[11.299]
```
void vitalisation_chain(int amount)
```

Replacement in crawl-ref/source/spells1.cc at line 768 [12.616635]

B:BD[11.339] → [11.339:459]

    const int old_value = you.duration[DUR_REVITALISATION_CHAIN];
    you.duration[DUR_REVITALISATION_CHAIN] += amount;

[11.339]

[11.459]

    const int old_value = you.duration[DUR_VITALISATION_CHAIN];
    you.duration[DUR_VITALISATION_CHAIN] += amount;

Replacement in crawl-ref/source/spells1.cc at line 771 [12.616635]

B:BD[11.460] → [15.171:277]

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

[11.460]

[11.566]

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

Replacement in crawl-ref/source/spells1.cc at line 775 [12.616635]

B:BD[11.591] → [6.171:247]

        mpr("Zin amplifies your power of revitalisation!", MSGCH_DURATION);

[11.591]

[11.732]

        mpr("Zin amplifies your power of vitalisation!", MSGCH_DURATION);

Replacement in crawl-ref/source/spells1.cc at line 778 [12.616635]
B:BD[11.735] → [11.735:780]
```
void reduce_revitalisation_chain(int amount)
```
[11.735]
[11.780]
```
void reduce_vitalisation_chain(int amount)
```

Replacement in crawl-ref/source/spells1.cc at line 780 [12.616635]

B:BD[11.782] → [11.782:850]

    if (you.duration[DUR_REVITALISATION_CHAIN] == 0 || amount <= 0)

[11.782]

[11.850]

    if (you.duration[DUR_VITALISATION_CHAIN] == 0 || amount <= 0)

Replacement in crawl-ref/source/spells1.cc at line 783 [12.616635]

B:BD[11.867] → [11.867:921]

    you.duration[DUR_REVITALISATION_CHAIN] -= amount;

[11.867]

[11.921]

    you.duration[DUR_VITALISATION_CHAIN] -= amount;

Replacement in crawl-ref/source/spells1.cc at line 785 [12.616635]

B:BD[11.922] → [11.922:975]

    if (you.duration[DUR_REVITALISATION_CHAIN] <= 0)

[11.922]

[11.975]

    if (you.duration[DUR_VITALISATION_CHAIN] <= 0)

Replacement in crawl-ref/source/spells1.cc at line 787 [12.616635]

B:BD[11.981] → [11.981:1033]

B:BD[11.1033] → [5.171:251]

        you.duration[DUR_REVITALISATION_CHAIN] = 0;
        mpr("Your power of revitalisation returns to normal.", MSGCH_DURATION);

[11.981]

[11.1098]

        you.duration[DUR_VITALISATION_CHAIN] = 0;
        mpr("Your power of vitalisation returns to normal.", MSGCH_DURATION);

Replacement in crawl-ref/source/spells1.cc at line 812 [12.616635]
B:BD[12.627890] → [13.206:239]
```
int cast_revitalisation(int pow)
```
[12.627890]
[16.5366]
```
int cast_vitalisation(int pow)
```

Replacement in crawl-ref/source/spells1.cc at line 824 [12.616635]

B:BD[13.358] → [11.1196:1331]

    // If revitalisation chaining is turned off, start from the
    // beginning.
    if (you.duration[DUR_REVITALISATION_CHAIN] == 0)

[13.358]

[13.446]

    // If vitalisation chaining is turned off, start from the beginning.
    if (you.duration[DUR_VITALISATION_CHAIN] == 0)

Replacement in crawl-ref/source/spells1.cc at line 897 [12.616635]

B:BD[17.218] → [7.171:245]

            if ((step == 3 || you.duration[DUR_REVITALISATION_CHAIN] > 0)

[17.218]

[17.293]

            if ((step == 3 || you.duration[DUR_VITALISATION_CHAIN] > 0)

Replacement in crawl-ref/source/spells1.cc at line 932 [12.616635]

B:BD[18.1726] → [4.200:317]

        // Deliberate fall through, resetting the revitalisation
        // chaining indicator and the step counter.

[18.1726]

[18.1762]

        // Deliberate fall through, resetting the vitalisation chaining
        // indicator and the step counter.

Replacement in crawl-ref/source/spells1.cc at line 949 [12.616635]

B:BD[19.189] → [4.347:464]

        // Deliberate fall through, resetting the revitalisation
        // chaining indicator and the step counter.

[19.189]

[18.1776]

        // Deliberate fall through, resetting the vitalisation chaining
        // indicator and the step counter.

Replacement in crawl-ref/source/spells1.cc at line 966 [12.616635]

B:BD[19.208] → [4.494:611]

        // Deliberate fall through, resetting the revitalisation
        // chaining indicator and the step counter.

[19.208]

[20.285]

        // Deliberate fall through, resetting the vitalisation chaining
        // indicator and the step counter.

Replacement in crawl-ref/source/spells1.cc at line 999 [12.616635]

B:BD[21.323] → [21.323:397]

            if ((step == 3 || you.duration[DUR_REVITALISATION_CHAIN] > 0)

[21.323]

[8.171]

            if ((step == 3 || you.duration[DUR_VITALISATION_CHAIN] > 0)

Replacement in crawl-ref/source/spells1.cc at line 1038 [12.616635]

B:BD[20.1467] → [4.641:758]

        // Deliberate fall through, resetting the revitalisation
        // chaining indicator and the step counter.

[20.1467]

[18.1790]

        // Deliberate fall through, resetting the vitalisation chaining
        // indicator and the step counter.

Replacement in crawl-ref/source/spells1.cc at line 1048 [12.616635]

B:BD[9.497] → [9.497:559]

         "revitalising: step = %d, type = %d, step_max = %d",

[9.497]

[9.559]

         "vitalising: step = %d, type = %d, step_max = %d",

Replacement in crawl-ref/source/spells1.cc at line 1052 [12.616635]

∅:D[9.599] → [11.2107:2179]

B:BD[22.1113] → [11.2107:2179]

    // If revitalisation has succeeded, display an appropriate message.

[9.599]

[11.2179]

    // If vitalisation has succeeded, display an appropriate message.

Replacement in crawl-ref/source/spells1.cc at line 1079 [12.616635]

B:BD[13.1735] → [23.1079:1263]

    // If revitalisation has succeeded, it hasn't succeeded as far
    // as possible, and revitalisation chaining is needed, turn on
    // revitalisation chaining for several turns.

[13.1735]

[9.600]

    // If vitalisation has succeeded, it hasn't succeeded as far as
    // possible, and vitalisation chaining is needed, turn on
    // vitalisation chaining for several turns.

Replacement in crawl-ref/source/spells1.cc at line 1083 [12.616635]
∅:D[9.650] → [15.278:311]
B:BD[23.1314] → [15.278:311]
∅:D[24.311] → [11.3334:3386]
∅:D[15.311] → [11.3334:3386]
B:BD[11.3334] → [11.3334:3386]
```
        revitalisation_chain(6);
    // Otherwise, turn off revitalisation chaining.
```
[9.650]
[11.3386]
```
        vitalisation_chain(6);
    // Otherwise, turn off vitalisation chaining.
```
Replacement in crawl-ref/source/spells1.cc at line 1086 [12.616635]
B:BD[11.3395] → [15.312:353]
```
        reduce_revitalisation_chain(30);
```
[11.3395]
[13.1782]
```
        reduce_vitalisation_chain(30);
```
Replacement in crawl-ref/source/religion.cc at line 206 [12.804403]
B:BD[16.5579] → [16.5579:5621]
```
      "call upon Zin for revitalisation",
```
[25.2551]
[26.2509]
```
      "call upon Zin for vitalisation",
```
Replacement in crawl-ref/source/religion.cc at line 292 [12.804403]
B:BD[16.5714] → [16.5714:5756]
```
      "call upon Zin for revitalisation",
```
[25.2588]
[26.2520]
```
      "call upon Zin for vitalisation",
```

Replacement in crawl-ref/source/religion.cc at line 478 [12.804403]

B:BD[27.348] → [10.3536:3639]

        // neither does Zin's revitalisation chaining, divine
        // robustness, or divine stamina

[27.348]

[28.2582]

        // neither does Zin's vitalisation chaining, divine robustness,
        // or divine stamina

Replacement in crawl-ref/source/religion.cc at line 482 [12.804403]

B:BD[28.2625] → [28.2625:2681]

            if (you.duration[DUR_REVITALISATION_CHAIN])

[28.2625]

[28.2681]

            if (you.duration[DUR_VITALISATION_CHAIN])

Replacement in crawl-ref/source/religion.cc at line 484 [12.804403]

B:BD[28.2695] → [28.2695:2760]

B:BD[28.2760] → [29.4098:4158]

                mpr("Your power of revitalisation disappears!");
                you.duration[DUR_REVITALISATION_CHAIN] = 0;

[28.2695]

[29.4158]

                mpr("Your power of vitalisation disappears!");
                you.duration[DUR_VITALISATION_CHAIN] = 0;

Replacement in crawl-ref/source/religion.cc at line 4352 [12.804403]
B:BD[16.8846] → [28.2845:2897]
```
        if (you.duration[DUR_REVITALISATION_CHAIN])
```
[16.8846]
[28.2897]
```
        if (you.duration[DUR_VITALISATION_CHAIN])
```

Replacement in crawl-ref/source/religion.cc at line 4354 [12.804403]

B:BD[28.2907] → [28.2907:3024]

            mpr("Your power of revitalisation disappears!");
            you.duration[DUR_REVITALISATION_CHAIN] = 0;

[28.2907]

[28.3024]

            mpr("Your power of vitalisation disappears!");
            you.duration[DUR_VITALISATION_CHAIN] = 0;

Replacement in crawl-ref/source/enum.h at line 78 [12.3287960]
∅:D[25.2962] → [16.16997:17026]
∅:D[30.3202] → [16.16997:17026]
∅:D[2.10170] → [16.16997:17026]
B:BD[16.16997] → [16.16997:17026]
```
    ABIL_ZIN_REVITALISATION,
```
[2.10170]
[16.17026]
```
    ABIL_ZIN_VITALISATION,
```
Replacement in crawl-ref/source/enum.h at line 1108 [12.3287960]
B:BD[31.3061] → [11.5969:5999]
```
    DUR_REVITALISATION_CHAIN,
```
[31.3061]
[32.15103]
```
    DUR_VITALISATION_CHAIN,
```
Replacement in crawl-ref/source/acr.cc at line 3066 [12.4397395]
B:BD[11.6102] → [11.6102:6138]
```
    reduce_revitalisation_chain(1);
```
[11.6102]
[29.5026]
```
    reduce_vitalisation_chain(1);
```

Replacement in crawl-ref/source/abl-show.cc at line 114 [12.4494389]

B:BD[33.8967] → [26.6669:6735]

    { ABIL_ZIN_RECITE, ABIL_ZIN_REVITALISATION, ABIL_NON_ABILITY,

[33.8967]

[16.19701]

    { ABIL_ZIN_RECITE, ABIL_ZIN_VITALISATION, ABIL_NON_ABILITY,

Replacement in crawl-ref/source/abl-show.cc at line 236 [12.4494389]

B:BD[34.4044] → [18.4499:4580]

    { ABIL_ZIN_REVITALISATION, "Revitalisation", 0, 0, 100, 2, ABFLAG_CONF_OK },

[34.4044]

[35.7201]

    { ABIL_ZIN_VITALISATION, "Vitalisation", 0, 0, 100, 2, ABFLAG_CONF_OK },

Replacement in crawl-ref/source/abl-show.cc at line 676 [12.4494389]
B:BD[36.11035] → [26.6815:6849]
```
    case ABIL_ZIN_REVITALISATION:
```
[36.11035]
[37.5672]
```
    case ABIL_ZIN_VITALISATION:
```
Replacement in crawl-ref/source/abl-show.cc at line 1373 [12.4494389]
∅:D[3.2768] → [37.5961:5995]
B:BD[12.4519286] → [37.5961:5995]
```
    case ABIL_ZIN_REVITALISATION:
```
[3.2768]
[22.3879]
```
    case ABIL_ZIN_VITALISATION:
```

Replacement in crawl-ref/source/abl-show.cc at line 1375 [12.4494389]

B:BD[22.3885] → [13.4659:4739]

        int result = cast_revitalisation(1 + (you.skills[SK_INVOCATIONS] / 4));

[22.3885]

[22.3965]

        int result = cast_vitalisation(1 + (you.skills[SK_INVOCATIONS] / 4));

Rename Zin's Revitalisation to Vitalisation.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells1.h at line 58 [12.611815]

Replacement in crawl-ref/source/spells1.h at line 62 [12.611815]

Replacement in crawl-ref/source/spells1.cc at line 763 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 768 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 771 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 775 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 778 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 780 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 783 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 785 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 787 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 812 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 824 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 897 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 932 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 949 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 966 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 999 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 1038 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 1048 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 1052 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 1079 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 1083 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 1086 [12.616635]

Replacement in crawl-ref/source/religion.cc at line 206 [12.804403]

Replacement in crawl-ref/source/religion.cc at line 292 [12.804403]

Replacement in crawl-ref/source/religion.cc at line 478 [12.804403]

Replacement in crawl-ref/source/religion.cc at line 482 [12.804403]

Replacement in crawl-ref/source/religion.cc at line 484 [12.804403]

Replacement in crawl-ref/source/religion.cc at line 4352 [12.804403]

Replacement in crawl-ref/source/religion.cc at line 4354 [12.804403]

Replacement in crawl-ref/source/enum.h at line 78 [12.3287960]

Replacement in crawl-ref/source/enum.h at line 1108 [12.3287960]

Replacement in crawl-ref/source/acr.cc at line 3066 [12.4397395]

Replacement in crawl-ref/source/abl-show.cc at line 114 [12.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 236 [12.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 676 [12.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1373 [12.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1375 [12.4494389]