fiddlerwoaroof/crawl - Change BLEMEEWDXTMGHF35D2NYDKU6O2NCFOTRXDKDT6TISL3PJTKUALFAC

Rework Zin's Vitalisation to be simpler, based mostly on dploog's

suggestions. Note that divine robustness is no longer available from Zin, but the code for it is still in place, since it can be adopted later for Elyvilon.

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

Created by dolorous on August 18, 2008

BLEMEEWDXTMGHF35D2NYDKU6O2NCFOTRXDKDT6TISL3PJTKUALFAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells1.h at line 35 [9.611815]
B:BD[7.171] → [8.170:251]
```
void vitalisation_chain(int amount);
void reduce_vitalisation_chain(int amount);
```
Replacement in crawl-ref/source/spells1.h at line 37 [9.611815]
B:BD[10.464] → [8.252:284]
```
int cast_vitalisation(int pow);
```
[10.464]
[9.613383]
```
bool cast_vitalisation();
```
Deletion in crawl-ref/source/spells1.cc at line 808 [9.616635]
∅:D[11.334] → [7.258:261]
∅:D[6.36213] → [7.258:261]
B:BD[12.869] → [7.258:261]
B:BD[7.261] → [8.286:322]
∅:D[8.322] → [7.299:339]
B:BD[7.299] → [7.299:339]
B:BD[7.339] → [8.323:439]
∅:D[8.439] → [7.459:460]
B:BD[7.459] → [7.459:460]
B:BD[7.460] → [8.440:542]
∅:D[13.277] → [7.566:591]
∅:D[14.277] → [7.566:591]
∅:D[8.542] → [7.566:591]
B:BD[7.566] → [7.566:591]
B:BD[7.591] → [8.543:617]
```
}
void vitalisation_chain(int amount)
{
    if (amount <= 0)
        return;
    const int old_value = you.duration[DUR_VITALISATION_CHAIN];
    you.duration[DUR_VITALISATION_CHAIN] += amount;
    if (you.duration[DUR_VITALISATION_CHAIN] > 30)
        you.duration[DUR_VITALISATION_CHAIN] = 30;
    if (old_value == 0)
        mpr("Zin amplifies your power of vitalisation!", MSGCH_DURATION);
```
Deletion in crawl-ref/source/spells1.cc at line 810 [9.616635]
B:BD[7.735] → [8.618:661]
∅:D[8.661] → [7.780:782]
B:BD[7.780] → [7.780:782]
B:BD[7.782] → [8.662:728]
∅:D[8.728] → [7.850:867]
B:BD[7.850] → [7.850:867]
B:BD[7.867] → [8.729:781]
∅:D[8.781] → [7.921:922]
B:BD[7.921] → [7.921:922]
B:BD[7.922] → [8.782:833]
∅:D[8.833] → [7.975:981]
B:BD[7.975] → [7.975:981]
B:BD[7.981] → [8.834:962]
∅:D[15.251] → [7.1098:1104]
∅:D[8.962] → [7.1098:1104]
B:BD[7.1098] → [7.1098:1104]
B:BD[7.1104] → [10.466:469]
```
void reduce_vitalisation_chain(int amount)
{
    if (you.duration[DUR_VITALISATION_CHAIN] == 0 || amount <= 0)
        return;
    you.duration[DUR_VITALISATION_CHAIN] -= amount;
    if (you.duration[DUR_VITALISATION_CHAIN] <= 0)
    {
        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 830 [9.616635]
B:BD[9.627890] → [8.963:994]
```
int cast_vitalisation(int pow)
```
[9.627890]
[16.5366]
```
bool cast_vitalisation()
```
Deletion in crawl-ref/source/spells1.cc at line 832 [9.616635]
B:BD[16.5368] → [7.1105:1174]
∅:D[17.199] → [7.1174:1195]
B:BD[7.1174] → [7.1174:1195]
∅:D[7.1195] → [18.265:357]
B:BD[18.265] → [18.265:357]
B:BD[18.357] → [19.171:199]
∅:D[19.199] → [18.357:358]
B:BD[18.357] → [18.357:358]
B:BD[18.358] → [8.995:1119]
∅:D[8.1119] → [18.446:452]
∅:D[7.1331] → [18.446:452]
B:BD[18.446] → [18.446:452]
∅:D[17.228] → [7.1332:1400]
B:BD[18.452] → [7.1332:1400]
B:BD[7.1400] → [20.171:219]
∅:D[21.198] → [18.516:556]
∅:D[22.215] → [18.516:556]
∅:D[20.219] → [18.516:556]
∅:D[23.220] → [18.516:556]
∅:D[7.1448] → [18.516:556]
B:BD[18.516] → [18.516:556]
B:BD[18.556] → [19.200:228]
∅:D[19.228] → [18.556:563]
B:BD[18.556] → [18.556:563]
```
    const int step_max_chain = 6;
    const int type_max_chain = 4;
    static int step;
    static int step_max;
    static int type;
    static int hp_amt;
    static int mp_amt;
    static bool need_chain;
    // If vitalisation chaining is turned off, start from the beginning.
    if (you.duration[DUR_VITALISATION_CHAIN] == 0)
    {
        step = 0;
        step_max = std::min(pow, step_max_chain);
        type = random2(type_max_chain * 3 / 2);
        hp_amt = 3;
        mp_amt = 1;
        need_chain = false;
    }
```
Insertion in crawl-ref/source/spells1.cc at line 833 [9.616635]
[18.589]
[24.303]
```
    int type = 0;
```

Replacement in crawl-ref/source/spells1.cc at line 835 [9.616635]

B:BD[24.304] → [25.260:278]

    switch (type)

[24.304]

[26.242]

    // Remove negative afflictions.
    if (you.disease || you.rotting || you.duration[DUR_CONF]
        || you.duration[DUR_PARALYSIS] || you.duration[DUR_POISONING]
        || you.duration[DUR_PETRIFIED])

Replacement in crawl-ref/source/spells1.cc at line 840 [9.616635]

B:BD[26.248] → [24.329:341]

B:BD[24.341] → [20.220:326]

    case 0:
        // Restore HP and MP.
        if (you.hp < you.hp_max || you.magic_points < you.max_magic_points)

[26.248]

[20.326]

do

Replacement in crawl-ref/source/spells1.cc at line 842 [9.616635]

B:BD[20.336] → [20.336:1078]

            success = true;
            inc_hp(hp_amt, false);
            inc_mp(mp_amt, false);
            hp_amt *= 2;
            mp_amt *= 2;
            need_chain =
                (you.hp < you.hp_max
                    || you.magic_points < you.max_magic_points);
            break;
        }
        need_chain = false;
        step = 0;
        type = 1;
        // Deliberate fall through, resetting the vitalisation chaining
        // indicator and the step counter.
    case 1:
        switch (step)
        {
        case 0:
        case 1:
        case 2:
            // Restore stats.
            if (you.strength < you.max_strength
                || you.intel < you.max_intel
                || you.dex < you.max_dex)

[20.336]

[20.1078]

            switch (random2(6))

Replacement in crawl-ref/source/spells1.cc at line 844 [9.616635]

B:BD[20.1092] → [20.1092:1633]

                success = true;
                restore_stat(STAT_STRENGTH, step + 1, true);
                restore_stat(STAT_INTELLIGENCE, step + 1, true);
                restore_stat(STAT_DEXTERITY, step + 1, true);
                need_chain =
                    (you.strength < you.max_strength
                        || you.intel < you.max_intel
                        || you.dex < you.max_dex);
                break;
            }
            step = 3;
            // Deliberate fall through.
            if (step >= step_max)

[20.1092]

[20.1633]

            case 0:
                if (you.disease)
                {
                    success = true;
                    you.disease = 0;
                }

Replacement in crawl-ref/source/spells1.cc at line 851 [9.616635]

B:BD[20.1656] → [20.1656:1977]

∅:D[27.241] → [21.239:271]

∅:D[20.1977] → [21.239:271]

B:BD[21.239] → [21.239:271]

B:BD[21.271] → [28.171:214]

∅:D[28.214] → [21.300:316]

B:BD[21.300] → [21.300:316]

B:BD[21.316] → [28.215:286]

∅:D[28.286] → [21.356:370]

B:BD[21.356] → [21.356:370]

∅:D[17.265] → [21.370:446]

B:BD[21.370] → [21.370:446]

B:BD[21.446] → [28.287:336]

B:BD[28.336] → [19.229:265]


        default:
            break;
        }
        if (success)
            break;
        need_chain = false;
        step = 0;
        type = 2;
        // Deliberate fall through, resetting the vitalisation chaining
        // indicator and the step counter.
    case 2:
        // Remove negative afflictions.
        switch (step)
        {
        // Remove confusion and poisoning.
        case 0:
            if (you.duration[DUR_CONF] || you.duration[DUR_POISONING])
            {
                success = true;
                you.duration[DUR_CONF] = 0;
                you.duration[DUR_POISONING] = 0;
                need_chain = false;

[20.1656]

[21.446]

            case 1:
                if (you.rotting)
                {
                    success = true;
                    you.rotting = 0;
                }

Replacement in crawl-ref/source/spells1.cc at line 858 [9.616635]

B:BD[21.469] → [21.469:483]

B:BD[21.483] → [29.171:234]

∅:D[29.234] → [21.483:484]

B:BD[21.483] → [21.483:484]

B:BD[21.484] → [22.216:250]

            }
            step = 1;
            // Deliberate fall through.
            if (step >= step_max)

[21.469]

[7.1483]

            case 2:
                if (you.duration[DUR_CONF])
                {
                    success = true;
                    you.duration[DUR_CONF] = 0;
                }

Replacement in crawl-ref/source/spells1.cc at line 865 [9.616635]

B:BD[7.1506] → [7.1506:1507]

B:BD[7.1507] → [28.337:377]

∅:D[28.377] → [21.576:592]

B:BD[21.576] → [21.576:592]

B:BD[21.592] → [28.378:422]

∅:D[28.422] → [21.637:651]

B:BD[21.637] → [21.637:651]

∅:D[17.302] → [21.651:683]

B:BD[21.651] → [21.651:683]

B:BD[21.683] → [28.423:489]

B:BD[28.489] → [19.266:302]


        // Remove sickness and rotting.
        case 1:
            if (you.disease || you.rotting)
            {
                success = true;
                you.disease = 0;
                you.rotting = 0;
                need_chain = false;

[7.1506]

[21.732]

            case 3:
                if (you.duration[DUR_PARALYSIS])
                {
                    success = true;
                    you.duration[DUR_PARALYSIS] = 0;
                }

Replacement in crawl-ref/source/spells1.cc at line 872 [9.616635]

B:BD[21.755] → [21.755:770]

B:BD[21.770] → [29.235:298]

B:BD[29.298] → [22.251:285]

            }
            step = 2;
            // Deliberate fall through.
            if (step >= step_max)

[21.755]

[7.1542]

            case 4:
                if (you.duration[DUR_POISONING])
                {
                    success = true;
                    you.duration[DUR_POISONING] = 0;
                }

Replacement in crawl-ref/source/spells1.cc at line 879 [9.616635]

B:BD[21.832] → [21.832:833]

B:BD[21.833] → [28.490:520]

∅:D[28.520] → [21.861:877]

B:BD[21.861] → [21.861:877]

B:BD[21.877] → [28.521:554]

∅:D[28.554] → [21.906:920]

B:BD[21.906] → [21.906:920]

∅:D[17.339] → [21.920:952]

B:BD[21.920] → [21.920:952]

B:BD[21.952] → [28.555:597]

B:BD[28.597] → [19.303:339]


        // Restore rotted HP.
        case 2:
            if (player_rotted())
            {
                success = true;
                unrot_hp(3 + random2(9));
                need_chain = false;

[7.1565]

[21.985]

            case 5:
                if (you.duration[DUR_PETRIFIED])
                {
                    success = true;
                    you.duration[DUR_PETRIFIED] = 0;
                }

Deletion in crawl-ref/source/spells1.cc at line 887 [9.616635]
∅:D[7.1625] → [21.1022:1086]
B:BD[21.1022] → [21.1022:1086]
B:BD[21.1086] → [22.286:320]
∅:D[22.320] → [29.333:356]
B:BD[29.333] → [29.333:356]
B:BD[30.655] → [31.290:291]
B:BD[21.1620] → [21.1620:1656]
```
            step = 3;
            // Deliberate fall through.
            if (step >= step_max)
                break;
        default:
            break;
```

Replacement in crawl-ref/source/spells1.cc at line 888 [9.616635]

B:BD[21.1666] → [21.1666:1688]

∅:D[19.565] → [24.989:1008]

∅:D[18.822] → [24.989:1008]

B:BD[26.539] → [24.989:1008]

B:BD[24.1018] → [18.823:824]

B:BD[18.824] → [32.465:493]

∅:D[32.493] → [33.490:508]

B:BD[18.824] → [33.490:508]

B:BD[33.508] → [34.190:208]

B:BD[34.208] → [8.1425:1540]

∅:D[32.611] → [23.285:298]

∅:D[8.1540] → [23.285:298]

B:BD[23.285] → [23.285:298]


        if (success)
            break;
        need_chain = false;
        step = 0;
        type = 3;
        // Deliberate fall through, resetting the vitalisation chaining
        // indicator and the step counter.
    case 3:

[21.1666]

[35.171]

        while (!success);
    }
    // Restore stats.
    else if (you.strength < you.max_strength
        || you.intel < you.max_intel
        || you.dex < you.max_dex)

Replacement in crawl-ref/source/spells1.cc at line 895 [9.616635]
∅:D[35.177] → [20.2031:2051]
B:BD[20.2031] → [20.2031:2051]
B:BD[20.2051] → [35.178:208]
```
stamina_robustness:
        int estep = step / 2;
```
[35.177]
[35.208]
```
        type = 1;
```
Replacement in crawl-ref/source/spells1.cc at line 897 [9.616635]
B:BD[35.209] → [35.209:262]
∅:D[36.223] → [23.349:371]
∅:D[35.262] → [23.349:371]
∅:D[20.2051] → [23.349:371]
B:BD[23.349] → [23.349:371]
```
        // Add divine stamina and divine robustness.
        switch (step)
```
[35.209]
[23.371]
```
        do
```

Replacement in crawl-ref/source/spells1.cc at line 899 [9.616635]

B:BD[23.381] → [20.2052:2079]

∅:D[20.2079] → [23.381:397]

B:BD[23.381] → [23.381:397]

B:BD[37.212] → [37.212:228]

B:BD[37.228] → [20.2080:2096]

B:BD[20.2096] → [35.263:411]

B:BD[35.411] → [4.171:408]

        // Divine stamina.
        case 0:
        case 2:
        case 4:
            if ((estep == 0 || you.duration[DUR_VITALISATION_CHAIN] > 0)
                && ((you.attribute[ATTR_DIVINE_STAMINA] + 1) / 2) == estep
                && ((player_mutation_level(MUT_STRONG) + 1) / 5) < (3 - estep)
                && ((player_mutation_level(MUT_CLEVER) + 1) / 5) < (3 - estep)
                && ((player_mutation_level(MUT_AGILE) + 1) / 5) < (3 - estep))

[23.381]

[37.347]

            switch (random2(3))

Replacement in crawl-ref/source/spells1.cc at line 901 [9.616635]

∅:D[17.1004] → [37.361:393]

B:BD[37.361] → [37.361:393]

B:BD[37.393] → [20.2477:2540]

B:BD[20.2540] → [35.631:789]

∅:D[35.789] → [20.2695:2865]

B:BD[20.2695] → [20.2695:2865]

B:BD[20.2865] → [35.790:993]

∅:D[35.993] → [20.3065:3272]

B:BD[20.3065] → [20.3065:3272]

B:BD[20.3272] → [38.171:454]

B:BD[38.454] → [4.409:664]

∅:D[39.652] → [38.691:773]

∅:D[4.664] → [38.691:773]

B:BD[38.691] → [38.691:773]

                success = true;
                mprf(MSGCH_DURATION, "Zin %s divine stamina.",
                    (estep == 0) ? "grants you" :
                    (estep == 1) ? "strengthens your"
                                 : "maximises your");
                const int stamina_amt = step + 1;
                you.attribute[ATTR_DIVINE_STAMINA] += stamina_amt;
                you.duration[DUR_DIVINE_STAMINA] +=
                    (estep == 0) ? (you.skills[SK_INVOCATIONS] * 2) :
                    (estep == 1) ? (you.skills[SK_INVOCATIONS])
                                 : (you.skills[SK_INVOCATIONS] / 2);
                modify_stat(STAT_STRENGTH, stamina_amt, true, "");
                modify_stat(STAT_INTELLIGENCE, stamina_amt, true, "");
                modify_stat(STAT_DEXTERITY, stamina_amt, true, "");
                // Keep vitalisation chaining on if divine stamina can
                // be increased two vitalisation attempts from now, or
                // if divine robustness can be increased one
                // vitalisation attempt from now.
                need_chain =
                    (((player_mutation_level(MUT_STRONG) + 1) / 5) < (2 - estep)
                        && ((player_mutation_level(MUT_CLEVER) + 1) / 5) < (2 - estep)
                        && ((player_mutation_level(MUT_AGILE) + 1) / 5) < (2 - estep))
                            || (player_mutation_level(MUT_ROBUST) < (3 - estep));

[37.361]

[37.560]

            case 0:
                if (you.strength < you.max_strength)
                {
                    success = true;
                    restore_stat(STAT_STRENGTH, 0, true);
                }

Replacement in crawl-ref/source/spells1.cc at line 908 [9.616635]

B:BD[37.583] → [37.583:597]

B:BD[7.1978] → [7.1978:1979]

B:BD[7.1979] → [20.3308:3328]

B:BD[20.3328] → [35.994:1031]

∅:D[36.246] → [23.1238:1278]

∅:D[40.251] → [23.1238:1278]

∅:D[37.620] → [23.1238:1278]

∅:D[41.643] → [23.1238:1278]

∅:D[35.1031] → [23.1238:1278]

∅:D[20.3328] → [23.1238:1278]

B:BD[23.1238] → [23.1238:1278]

B:BD[23.1278] → [22.321:322]

B:BD[22.322] → [20.3329:3375]

∅:D[20.3375] → [36.275:291]

B:BD[36.275] → [36.275:291]

B:BD[36.307] → [36.307:323]

B:BD[36.323] → [35.1032:1239]

∅:D[42.387] → [36.466:512]

∅:D[43.440] → [36.466:512]

∅:D[44.672] → [36.466:512]

∅:D[35.1239] → [36.466:512]

∅:D[20.3590] → [36.466:512]

B:BD[36.466] → [36.466:512]

B:BD[36.512] → [20.3591:3657]

B:BD[20.3657] → [35.1240:1398]

∅:D[35.1398] → [31.292:293]

B:BD[36.730] → [31.292:293]

B:BD[31.293] → [20.3760:3872]

B:BD[20.3872] → [3.171:374]

∅:D[3.374] → [36.1036:1037]

B:BD[36.1036] → [36.1036:1037]

B:BD[36.1037] → [20.4005:4148]

B:BD[20.4148] → [38.774:1127]

B:BD[38.1127] → [4.665:936]

            }
            step++;
            goto stamina_robustness;
            // Deliberate fall through.
        // Divine robustness.
        case 1:
        case 3:
        case 5:
            if ((estep == 0 || you.duration[DUR_VITALISATION_CHAIN] > 0)
                && you.attribute[ATTR_DIVINE_ROBUSTNESS] == estep
                && player_mutation_level(MUT_ROBUST) < (3 - estep))
            {
                success = true;
                mprf(MSGCH_DURATION, "Zin %s divine robustness.",
                    (estep == 0) ? "grants you" :
                    (estep == 1) ? "strengthens your"
                                 : "maximises your");
                you.attribute[ATTR_DIVINE_ROBUSTNESS]++;
                you.duration[DUR_DIVINE_ROBUSTNESS] +=
                    (estep == 0) ? (you.skills[SK_INVOCATIONS] * 2) :
                    (estep == 1) ? (you.skills[SK_INVOCATIONS])
                                 : (you.skills[SK_INVOCATIONS] / 2);
                const int old_hp_max = you.hp_max;
                calc_hp();
                set_hp(you.hp * you.hp_max / old_hp_max, false);
                // Keep vitalisation chaining on if divine robustness
                // can be increased two vitalisation attempts from now,
                // or if divine stamina can be increased one
                // vitalisation attempt from now.
                need_chain =
                    (player_mutation_level(MUT_ROBUST) < (2 - estep))
                        || (((player_mutation_level(MUT_STRONG) + 1) / 5) < (3 - estep)
                            && ((player_mutation_level(MUT_CLEVER) + 1) / 5) < (3 - estep)
                            && ((player_mutation_level(MUT_AGILE) + 1) / 5) < (3 - estep));

[37.583]

[36.1248]

            case 1:
                if (you.intel < you.max_intel)
                {
                    success = true;
                    restore_stat(STAT_INTELLIGENCE, 0, true);
                }
                break;
            case 2:
                if (you.dex < you.max_dex)
                {
                    success = true;
                    restore_stat(STAT_DEXTERITY, 0, true);
                }

Deletion in crawl-ref/source/spells1.cc at line 923 [9.616635]
B:BD[36.1285] → [22.380:381]
B:BD[22.381] → [20.4184:4241]
∅:D[20.4241] → [22.403:443]
B:BD[22.403] → [22.403:443]
∅:D[22.443] → [36.1285:1286]
B:BD[36.1285] → [36.1285:1286]
∅:D[40.320] → [23.1343:1379]
∅:D[36.1286] → [23.1343:1379]
B:BD[23.1343] → [23.1343:1379]
```
            step++;
            goto stamina_robustness;
            // Deliberate fall through.
        default:
            break;
```

Insertion in crawl-ref/source/spells1.cc at line 924 [9.616635]

[23.1389]

        while (!success);
    }
    else
    {
        // Add divine stamina.
        if (!you.duration[DUR_DIVINE_STAMINA])
        {
            success = true;
            type = 2;

Replacement in crawl-ref/source/spells1.cc at line 934 [9.616635]

B:BD[23.1390] → [23.1390:1430]

        if (success)
            break;

[23.1390]

[23.1430]

            mprf("%s grants you divine stamina.",
                 god_name(you.religion).c_str());

Replacement in crawl-ref/source/spells1.cc at line 937 [9.616635]

B:BD[23.1431] → [32.612:640]

∅:D[32.640] → [23.1431:1467]

B:BD[23.1431] → [23.1431:1467]

B:BD[23.1467] → [8.1614:1729]

B:BD[8.1729] → [35.1399:1405]

        need_chain = false;
        step = 0;
        type = 4;
        // Deliberate fall through, resetting the vitalisation chaining
        // indicator and the step counter.
    }

[23.1431]

[21.1790]

            const int stamina_amt = 3;
            you.attribute[ATTR_DIVINE_STAMINA] += stamina_amt;
            you.duration[DUR_DIVINE_STAMINA]
                = 35 + (you.skills[SK_INVOCATIONS]*5)/3;

Replacement in crawl-ref/source/spells1.cc at line 942 [9.616635]
∅:D[21.1791] → [24.1055:1068]
B:BD[24.1055] → [24.1055:1068]
B:BD[24.1068] → [32.759:782]
∅:D[32.782] → [24.1091:1106]
∅:D[18.868] → [24.1091:1106]
∅:D[17.1078] → [24.1091:1106]
∅:D[7.2106] → [24.1091:1106]
B:BD[24.1091] → [24.1091:1106]
```
    default:
        // Do nothing.
        break;
```
[21.1791]
[24.1106]
```
            modify_stat(STAT_STRENGTH, stamina_amt, true, "");
            modify_stat(STAT_INTELLIGENCE, stamina_amt, true, "");
            modify_stat(STAT_DEXTERITY, stamina_amt, true, "");
        }
```
Deletion in crawl-ref/source/spells1.cc at line 948 [9.616635]
B:BD[24.1113] → [22.444:497]
B:BD[22.497] → [8.1730:1790]
∅:D[8.1790] → [22.559:599]
B:BD[22.559] → [22.559:599]
```
#ifdef DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS,
         "vitalising: step = %d, type = %d, step_max = %d",
         step, type, step_max);
#endif
```

Replacement in crawl-ref/source/spells1.cc at line 951 [9.616635]

B:BD[18.989] → [7.2197:2568]

B:BD[7.2568] → [20.4242:4476]

∅:D[18.1032] → [24.1263:1264]

∅:D[7.2802] → [24.1263:1264]

∅:D[20.4476] → [24.1263:1264]

B:BD[24.1263] → [24.1263:1264]

B:BD[24.1264] → [5.171:301]

∅:D[5.301] → [7.2896:2948]

B:BD[7.2896] → [7.2896:2948]

∅:D[23.1633] → [18.1547:1548]

∅:D[7.2948] → [18.1547:1548]

B:BD[18.1547] → [18.1547:1548]

B:BD[18.1548] → [7.2949:3009]

B:BD[45.354] → [45.354:355]

∅:D[45.355] → [7.3010:3065]

B:BD[18.1682] → [7.3010:3065]

        mprf("You feel %s %s.", (step == 0) ? "only nominally" :
                                (step == 1) ? "very slightly" :
                                (step == 2) ? "slightly" :
                                (step == 3) ? "somewhat" :
                                (step == 4) ? "appropriately"
                                            : "impressively",
                                (type == 0) ? "invigorated" :
                                (type == 1) ? "renewed" :
                                (type == 2) ? "better"
                                            : "powerful");
        // If vitalisation has succeeded, pay the extended piety cost,
        // based on how far the step counter has advanced.
        int loss_amt = step + 1 + (random2(3) - 1);
        if (loss_amt > 0)
            lose_piety(loss_amt);
        // Increment the step counter.
        step++;

[18.989]

[7.3065]

        mprf("You feel %s.", (type == 0) ? "better" :
                             (type == 1) ? "renewed"
                                         : "powerful");

Replacement in crawl-ref/source/spells1.cc at line 958 [9.616635]

B:BD[5.303] → [5.303:410]

∅:D[5.410] → [18.1734:1735]

∅:D[7.3121] → [18.1734:1735]

B:BD[18.1734] → [18.1734:1735]

B:BD[18.1735] → [5.411:579]

∅:D[5.579] → [8.1862:2040]

B:BD[18.1735] → [8.1862:2040]

∅:D[8.2040] → [22.600:650]

B:BD[17.1263] → [22.600:650]

B:BD[22.650] → [8.2041:2122]

∅:D[8.2122] → [7.3386:3395]

B:BD[7.3386] → [7.3386:3395]

B:BD[7.3395] → [8.2123:2162]

∅:D[13.353] → [18.1782:1783]

∅:D[14.353] → [18.1782:1783]

∅:D[8.2162] → [18.1782:1783]

∅:D[7.3436] → [18.1782:1783]

B:BD[18.1782] → [18.1782:1783]

B:BD[18.1783] → [7.3437:3476]

    // Whether vitalisation has succeeded or failed, pay the minimum
    // piety cost.
    lose_piety(2);
    // If there's not enough piety left to vitalise again, turn off
    // vitalisation chaining.
    if (you.piety < piety_breakpoint(1))
        need_chain = false;
    // If vitalisation has succeeded, it hasn't succeeded as far as
    // possible, and vitalisation chaining is needed, turn on
    // vitalisation chaining for several turns.
    if (success && step < step_max && need_chain)
        vitalisation_chain(6);
    // Otherwise, turn off vitalisation chaining.
    else
        reduce_vitalisation_chain(30);
    return (success) ? (step + 1) : 0;

[5.303]

[16.5532]

    return (success);

Replacement in crawl-ref/source/religion.cc at line 771 [9.804403]

B:BD[46.348] → [47.2627:2729]

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

[46.348]

[48.2582]

        // Neither does Zin's divine stamina.

Deletion in crawl-ref/source/religion.cc at line 774 [9.804403]

B:BD[48.2625] → [8.4704:4758]

∅:D[8.4758] → [48.2681:2695]

B:BD[48.2681] → [48.2681:2695]

B:BD[48.2695] → [8.4759:4880]

∅:D[8.4880] → [28.4158:4226]

B:BD[28.4158] → [28.4158:4226]

B:BD[28.4226] → [10.3640:3685]

            if (you.duration[DUR_VITALISATION_CHAIN])
            {
                mpr("Your power of vitalisation disappears!");
                you.duration[DUR_VITALISATION_CHAIN] = 0;
            }
            if (you.duration[DUR_DIVINE_ROBUSTNESS])
                remove_divine_robustness();

Deletion in crawl-ref/source/religion.cc at line 4856 [9.804403]

B:BD[16.8846] → [8.4881:4931]

∅:D[8.4931] → [48.2897:2907]

B:BD[48.2897] → [48.2897:2907]

B:BD[48.2907] → [8.4932:5045]

∅:D[8.5045] → [48.3024:3035]

B:BD[48.3024] → [48.3024:3035]

B:BD[48.3035] → [28.4387:4436]

B:BD[28.4436] → [10.3855:3896]

        if (you.duration[DUR_VITALISATION_CHAIN])
        {
            mpr("Your power of vitalisation disappears!");
            you.duration[DUR_VITALISATION_CHAIN] = 0;
        }
        if (you.duration[DUR_DIVINE_ROBUSTNESS])
            remove_divine_robustness();

Deletion in crawl-ref/source/enum.h at line 1147 [9.3287960]
B:BD[49.3061] → [8.5209:5237]
```
    DUR_VITALISATION_CHAIN,
```

Replacement in crawl-ref/source/dat/descript/ability.txt at line 181 [50.3323]

B:BD[50.6282] → [50.6282:6572]

If Zin is most pleased with you, you can Vitalise yourself. This will
restore Health, Magic, attribute points, or unrot you. In case none of
these is necessary, you gain temporary boosts to your attributes
instead. It is possible to Vitalise several times in succession for
greater effect.

[50.6282]

[50.6572]

If Zin is most pleased with you, you can Vitalise yourself. This will 
remove a negative affliction from you, or restore one of your 
attributes. In case neither of these is necessary, it will give you 
temporary boosts to your attributes instead.

Deletion in crawl-ref/source/acr.cc at line 3024 [9.4397395]
B:BD[9.4458872] → [7.6101:6102]
B:BD[7.6102] → [8.5339:5373]
```
    reduce_vitalisation_chain(1);
```

Replacement in crawl-ref/source/abl-show.cc at line 85 [9.4494389]

B:BD[51.9024] → [5.3178:3656]

    ABFLAG_PIETY        = 0x00000004, // ability has its own piety (ie vitalise)
    ABFLAG_PAIN         = 0x00000008, // ability must hurt player (ie torment)
    ABFLAG_EXHAUSTION   = 0x00000010, // fails if you.exhausted
    ABFLAG_INSTANT      = 0x00000020, // doesn't take time to use
    ABFLAG_PERMANENT_HP = 0x00000040, // costs permanent HPs
    ABFLAG_PERMANENT_MP = 0x00000080, // costs permanent MPs
    ABFLAG_CONF_OK      = 0x00000100  // can use even if confused

[51.9024]

[52.109304]

    ABFLAG_PAIN         = 0x00000004, // ability must hurt player (ie torment)
    ABFLAG_EXHAUSTION   = 0x00000008, // fails if you.exhausted
    ABFLAG_INSTANT      = 0x00000010, // doesn't take time to use
    ABFLAG_PERMANENT_HP = 0x00000020, // costs permanent HPs
    ABFLAG_PERMANENT_MP = 0x00000040, // costs permanent MPs
    ABFLAG_CONF_OK      = 0x00000080  // can use even if confused

Replacement in crawl-ref/source/abl-show.cc at line 238 [9.4494389]

B:BD[53.4044] → [5.3657:3749]

    { ABIL_ZIN_VITALISATION, "Vitalisation", 0, 0, 100, 0, ABFLAG_PIETY | ABFLAG_CONF_OK },

[53.4044]

[54.7201]

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

Replacement in crawl-ref/source/abl-show.cc at line 390 [9.4494389]
B:BD[9.4505007] → [5.3750:3804]
```
    if (abil.piety_cost || abil.flags & ABFLAG_PIETY)
```
[9.4505007]
[9.4505032]
```
    if (abil.piety_cost)
```
Replacement in crawl-ref/source/abl-show.cc at line 1458 [9.4494389]
∅:D[8.5586] → [24.3879:3885]
B:BD[55.5995] → [24.3879:3885]
B:BD[24.3885] → [8.5587:5665]
∅:D[25.3009] → [24.3965:3989]
∅:D[18.4739] → [24.3965:3989]
∅:D[8.5665] → [24.3965:3989]
B:BD[24.3965] → [24.3965:3989]
B:BD[24.3989] → [2.2767:2826]
```
    {
        int result = cast_vitalisation(1 + (you.skills[SK_INVOCATIONS] / 4));
        if (result > 0)
            exercise(SK_INVOCATIONS, 2 + random2(result));
```
[8.5586]
[55.6122]
```
        if (cast_vitalisation())
            exercise(SK_INVOCATIONS, (coinflip() ? 3 : 2));
```
Deletion in crawl-ref/source/abl-show.cc at line 1461 [9.4494389]
B:BD[55.6137] → [24.4049:4055]
```
    }
```

Rework Zin's Vitalisation to be simpler, based mostly on dploog's

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spells1.h at line 35 [9.611815]

Replacement in crawl-ref/source/spells1.h at line 37 [9.611815]

Deletion in crawl-ref/source/spells1.cc at line 808 [9.616635]

Deletion in crawl-ref/source/spells1.cc at line 810 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 830 [9.616635]

Deletion in crawl-ref/source/spells1.cc at line 832 [9.616635]

Insertion in crawl-ref/source/spells1.cc at line 833 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 835 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 840 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 842 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 844 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 851 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 858 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 865 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 872 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 879 [9.616635]

Deletion in crawl-ref/source/spells1.cc at line 887 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 888 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 895 [9.616635]

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

Replacement in crawl-ref/source/spells1.cc at line 899 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 901 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 908 [9.616635]

Deletion in crawl-ref/source/spells1.cc at line 923 [9.616635]

Insertion in crawl-ref/source/spells1.cc at line 924 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 934 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 937 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 942 [9.616635]

Deletion in crawl-ref/source/spells1.cc at line 948 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 951 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 958 [9.616635]

Replacement in crawl-ref/source/religion.cc at line 771 [9.804403]

Deletion in crawl-ref/source/religion.cc at line 774 [9.804403]

Deletion in crawl-ref/source/religion.cc at line 4856 [9.804403]

Deletion in crawl-ref/source/enum.h at line 1147 [9.3287960]

Replacement in crawl-ref/source/dat/descript/ability.txt at line 181 [50.3323]

Deletion in crawl-ref/source/acr.cc at line 3024 [9.4397395]

Replacement in crawl-ref/source/abl-show.cc at line 85 [9.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 238 [9.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 390 [9.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1458 [9.4494389]

Deletion in crawl-ref/source/abl-show.cc at line 1461 [9.4494389]