fiddlerwoaroof/crawl - Change PRQ3EYE6QDRMGWIPRON2NVNDCY5YBDHD2NURV5H5T4GYV5YHUOTQC

Rework the steps of Zin's Vitalisation a bit.

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

Created by dolorous on May 20, 2008

PRQ3EYE6QDRMGWIPRON2NVNDCY5YBDHD2NURV5H5T4GYV5YHUOTQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.cc at line 829 [6.616635]
B:BD[4.1400] → [5.171:215]
```
        type = random2(type_max_chain + 1);
```
[4.1400]
[7.516]
```
        type = random2(type_max_chain * 3 / 2);
```

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

B:BD[8.341] → [2.171:241]

        // Remove negative afflictions, and/or add divine robustness.

[8.341]

[9.239]

        // Restore HP and MP.
        if (you.hp < you.hp_max || you.magic_points < you.max_magic_points)
        {
            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)
            {
                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)
                break;
        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.

Deletion in crawl-ref/source/spells1.cc at line 954 [6.616635]
B:BD[10.356] → [10.356:357]
B:BD[10.357] → [11.171:201]
∅:D[11.201] → [9.1113:1129]
∅:D[12.637] → [9.1113:1129]
B:BD[9.1113] → [9.1113:1129]
∅:D[12.971] → [9.1368:1384]
B:BD[9.1368] → [9.1368:1384]
B:BD[9.1384] → [11.202:218]
B:BD[11.218] → [13.1120:1192]
∅:D[14.245] → [11.293:431]
∅:D[13.1192] → [11.293:431]
B:BD[11.293] → [11.293:431]
∅:D[15.350] → [16.204:218]
∅:D[11.431] → [16.204:218]
∅:D[17.477] → [16.204:218]
∅:D[18.498] → [16.204:218]
∅:D[12.1031] → [16.204:218]
B:BD[16.204] → [16.204:218]
∅:D[18.534] → [16.218:250]
B:BD[16.218] → [16.218:250]
B:BD[16.250] → [11.432:547]
B:BD[11.547] → [14.246:299]
∅:D[14.299] → [11.602:655]
B:BD[11.602] → [11.602:655]
```
        // Divine robustness.
        case 3:
        case 4:
        case 5:
            if ((step == 3 || you.duration[DUR_VITALISATION_CHAIN] > 0)
                && you.attribute[ATTR_DIVINE_ROBUSTNESS] == (step - 3)
                && player_mutation_level(MUT_ROBUST) < (6 - step))
            {
                success = true;
                mprf(MSGCH_DURATION, "Zin %s divine robustness.",
                    (step == 3) ? "grants you" :
                    (step == 4) ? "strengthens your"
                                : "maximises your");
```

Deletion in crawl-ref/source/spells1.cc at line 955 [6.616635]

∅:D[19.291] → [20.171:228]

B:BD[11.655] → [20.171:228]

∅:D[20.228] → [21.279:334]

∅:D[15.408] → [21.279:334]

∅:D[11.723] → [21.279:334]

B:BD[12.1171] → [21.279:334]

B:BD[21.334] → [11.724:924]

∅:D[11.924] → [16.392:393]

B:BD[16.392] → [16.392:393]

B:BD[21.490] → [22.407:458]

∅:D[22.458] → [12.1580:1607]

∅:D[21.490] → [12.1580:1607]

B:BD[12.1580] → [12.1580:1607]

B:BD[12.1607] → [22.459:524]

B:BD[22.524] → [11.925:1004]

∅:D[23.213] → [9.1521:1558]

∅:D[24.447] → [9.1521:1558]

∅:D[22.524] → [9.1521:1558]

∅:D[11.1004] → [9.1521:1558]

∅:D[12.1607] → [9.1521:1558]

B:BD[9.1521] → [9.1521:1558]

B:BD[9.1558] → [4.1744:1745]

B:BD[9.1559] → [16.429:451]

∅:D[16.451] → [9.1579:1620]

B:BD[9.1579] → [9.1579:1620]

                you.attribute[ATTR_DIVINE_ROBUSTNESS]++;
                you.duration[DUR_DIVINE_ROBUSTNESS] +=
                    (step == 3) ? (you.skills[SK_INVOCATIONS] * 2) :
                    (step == 4) ? (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);
                need_chain = (player_mutation_level(MUT_ROBUST) < (5 - step));
                break;
            }
            step = 6;
            // Deliberate fall through.

Deletion in crawl-ref/source/spells1.cc at line 960 [6.616635]
B:BD[9.1688] → [9.1688:1708]
B:BD[9.1708] → [25.171:199]
∅:D[25.199] → [16.452:470]
B:BD[9.1708] → [16.452:470]
∅:D[16.470] → [9.1708:1726]
B:BD[9.1708] → [9.1708:1726]
B:BD[9.1726] → [13.1193:1308]
∅:D[26.235] → [9.1762:1775]
∅:D[25.317] → [9.1762:1775]
∅:D[13.1308] → [9.1762:1775]
B:BD[9.1762] → [9.1762:1775]
∅:D[9.1775] → [8.341:407]
B:BD[8.341] → [8.341:407]
∅:D[18.725] → [7.590:678]
B:BD[8.407] → [7.590:678]
B:BD[7.678] → [24.448:496]
∅:D[24.496] → [8.606:635]
∅:D[7.678] → [8.606:635]
B:BD[27.5455] → [8.606:635]
∅:D[28.262] → [29.567:568]
∅:D[30.477] → [29.567:568]
∅:D[8.671] → [29.567:568]
B:BD[29.567] → [29.567:568]
B:BD[29.568] → [25.318:346]
∅:D[25.346] → [16.471:489]
B:BD[29.568] → [16.471:489]
B:BD[16.489] → [31.171:189]
B:BD[31.189] → [13.1309:1424]
∅:D[26.300] → [9.1776:1789]
∅:D[25.464] → [9.1776:1789]
∅:D[13.1424] → [9.1776:1789]
B:BD[7.733] → [9.1776:1789]
∅:D[9.1789] → [8.684:770]
B:BD[8.684] → [8.684:770]
∅:D[18.757] → [7.734:822]
B:BD[8.770] → [7.734:822]
B:BD[7.822] → [24.497:565]
```
            break;
        need_chain = false;
        step = 0;
        type = 1;
        // Deliberate fall through, resetting the vitalisation chaining
        // indicator and the step counter.
    case 1:
        // Restore HP.
        if (you.hp < you.hp_max)
        {
            success = true;
            inc_hp(hp_amt, false);
            hp_amt *= 2;
            need_chain = (you.hp < you.hp_max);
            break;
        }
        need_chain = false;
        step = 0;
        type = 2;
        // Deliberate fall through, resetting the vitalisation chaining
        // indicator and the step counter.
    case 2:
        // Restore MP.
        if (you.magic_points < you.max_magic_points)
        {
            success = true;
            inc_mp(mp_amt, false);
            mp_amt *= 2;
            need_chain = (you.magic_points < you.max_magic_points);
```
Deletion in crawl-ref/source/spells1.cc at line 961 [6.616635]
B:BD[8.1008] → [8.1008:1018]
```
        }
```

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

B:BD[32.298] → [33.171:223]

        // Restore stats and/or add divine stamina.

[32.298]

[32.349]

        // Add divine stamina and divine robustness.
stamina_robustness:

Insertion in crawl-ref/source/spells1.cc at line 973 [6.616635]
[32.381]
[32.381]
```
        // Divine stamina.
```
Deletion in crawl-ref/source/spells1.cc at line 975 [6.616635]
∅:D[10.544] → [32.830:846]
B:BD[32.830] → [32.830:846]
```
        case 1:
```

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

B:BD[34.228] → [35.171:201]

B:BD[35.201] → [36.171:264]

∅:D[36.264] → [34.305:347]

B:BD[34.305] → [34.305:347]

            // Restore stats.
            if (you.strength < you.max_strength
                || you.intel < you.max_intel
                || you.dex < you.max_dex)

[34.228]

[34.347]

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

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

B:BD[34.393] → [35.202:390]

B:BD[35.390] → [36.265:443]

                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);

[34.393]

[34.560]

                mprf(MSGCH_DURATION, "Zin %s divine stamina.",
                    (step == 0) ? "grants you" :
                    (step == 2) ? "strengthens your"
                                : "maximises your");
                const int stamina_amt = step + 1;
                you.attribute[ATTR_DIVINE_STAMINA] += stamina_amt;
                you.duration[DUR_DIVINE_STAMINA] +=
                    (step == 0) ? (you.skills[SK_INVOCATIONS] * 2) :
                    (step == 2) ? (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, "");
                need_chain = true;

Replacement in crawl-ref/source/spells1.cc at line 1003 [6.616635]
B:BD[4.1979] → [33.224:246]
```
            step = 3;
```
[4.1979]
[32.1238]
```
            step++;
```

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

B:BD[5.322] → [5.322:379]

∅:D[5.379] → [33.247:275]

B:BD[32.1278] → [33.247:275]

            if (step >= step_max)
                break;
        // Divine stamina.

[5.322]

[33.275]

        // Divine robustness.
        case 1:

Deletion in crawl-ref/source/spells1.cc at line 1009 [6.616635]
B:BD[33.291] → [33.291:307]
```
        case 4:
```

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

B:BD[33.323] → [13.1541:1613]

B:BD[13.1613] → [3.171:251]

∅:D[3.251] → [37.171:387]

B:BD[38.239] → [37.171:387]

            if ((step == 3 || you.duration[DUR_VITALISATION_CHAIN] > 0)
                && ((you.attribute[ATTR_DIVINE_STAMINA] + 1) / 2) == (step - 3)
                && (player_mutation_level(MUT_STRONG) / 5) < (6 - step)
                && (player_mutation_level(MUT_CLEVER) / 5) < (6 - step)
                && (player_mutation_level(MUT_AGILE) / 5) < (6 - step))

[33.323]

[33.466]

            if ((step == 1 || you.duration[DUR_VITALISATION_CHAIN] > 0)
                && you.attribute[ATTR_DIVINE_ROBUSTNESS] == (step / 2)
                && player_mutation_level(MUT_ROBUST) < (3 - step / 2))

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

B:BD[33.512] → [33.512:677]

                mprf(MSGCH_DURATION, "Zin %s divine stamina.",
                    (step == 3) ? "grants you" :
                    (step == 4) ? "strengthens your"

[33.512]

[33.677]

                mprf(MSGCH_DURATION, "Zin %s divine robustness.",
                    (step == 1) ? "grants you" :
                    (step == 3) ? "strengthens your"

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

B:BD[19.293] → [3.252:379]

∅:D[3.379] → [33.784:968]

B:BD[33.784] → [33.784:968]

                const int stamina_amt = (step - 3) * 2 + 1;
                you.attribute[ATTR_DIVINE_STAMINA] += stamina_amt;
                you.duration[DUR_DIVINE_STAMINA] +=
                    (step == 3) ? (you.skills[SK_INVOCATIONS] * 2) :
                    (step == 4) ? (you.skills[SK_INVOCATIONS])

[19.293]

[33.968]

                you.attribute[ATTR_DIVINE_ROBUSTNESS]++;
                you.duration[DUR_DIVINE_ROBUSTNESS] +=
                    (step == 1) ? (you.skills[SK_INVOCATIONS] * 2) :
                    (step == 3) ? (you.skills[SK_INVOCATIONS])

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

B:BD[33.1037] → [3.380:586]

∅:D[3.586] → [36.673:702]

B:BD[33.1213] → [36.673:702]

B:BD[36.702] → [37.388:615]

                modify_stat(STAT_STRENGTH, stamina_amt, true, "");
                modify_stat(STAT_INTELLIGENCE, stamina_amt, true, "");
                modify_stat(STAT_DEXTERITY, stamina_amt, true, "");
                need_chain =
                    ((player_mutation_level(MUT_STRONG) / 5) < (5 - step)
                    && (player_mutation_level(MUT_CLEVER) / 5) < (5 - step)
                    && (player_mutation_level(MUT_AGILE) / 5) < (5 - step));

[33.1037]

[33.1248]

                const int old_hp_max = you.hp_max;
                calc_hp();
                set_hp(you.hp * you.hp_max / old_hp_max, false);
                need_chain = true;

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

B:BD[5.381] → [5.381:403]

            step = 6;

[5.381]

[5.403]

            step++;
            goto stamina_robustness;

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

B:BD[4.2568] → [4.2568:2802]

                                (type == 0) ? "better" :
                                (type == 1) ? "invigorated" :
                                (type == 2) ? "powerful"
                                            : "renewed");

[4.2568]

[8.1263]

                                (type == 0) ? "invigorated" :
                                (type == 1) ? "renewed" :
                                (type == 2) ? "better"
                                            : "powerful");

Rework the steps of Zin's Vitalisation a bit.

Dependencies

In channels

Change contents

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

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

Deletion in crawl-ref/source/spells1.cc at line 954 [6.616635]

Deletion in crawl-ref/source/spells1.cc at line 955 [6.616635]

Deletion in crawl-ref/source/spells1.cc at line 960 [6.616635]

Deletion in crawl-ref/source/spells1.cc at line 961 [6.616635]