fiddlerwoaroof/crawl - Change NJFYSNTX33RAPYMVYJYGSCHOE7AWYX4ZG6ZRJZBDVDQWTANTM2QQC

To make Zin's Revitalisation less of a potion effect, consoliodate the

negative status removal effects into the first 3 steps, and add divine robustness as the last 3 steps (as it counteracts frailty, one of Xom's favored negative mutations).

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

Created by dolorous on May 8, 2008

NJFYSNTX33RAPYMVYJYGSCHOE7AWYX4ZG6ZRJZBDVDQWTANTM2QQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.cc at line 825 [7.616635]
B:BD[6.271] → [6.271:300]
```
        // Remove confusion.
```
[6.271]
[6.300]
```
        // Remove confusion and poisoning.
```

Replacement in crawl-ref/source/spells1.cc at line 827 [7.616635]

B:BD[6.316] → [6.316:356]

            if (you.duration[DUR_CONF])

[6.316]

[6.356]

            if (you.duration[DUR_CONF] || you.duration[DUR_POISONING])

Insertion in crawl-ref/source/spells1.cc at line 831 [7.616635]
[6.446]
[6.446]
```
                you.duration[DUR_POISONING] = 0;
```
Replacement in crawl-ref/source/spells1.cc at line 841 [7.616635]
B:BD[6.547] → [6.547:576]
```
        // Remove poisoning.
```
[8.1507]
[6.576]
```
        // Remove sickness and rotting.
```

Replacement in crawl-ref/source/spells1.cc at line 843 [7.616635]

B:BD[6.592] → [6.592:637]

            if (you.duration[DUR_POISONING])

[6.592]

[6.637]

            if (you.disease || you.rotting)

Replacement in crawl-ref/source/spells1.cc at line 846 [7.616635]

B:BD[6.683] → [6.683:732]

                you.duration[DUR_POISONING] = 0;

[6.683]

[6.732]

                you.disease = 0;
                you.rotting = 0;

Replacement in crawl-ref/source/spells1.cc at line 857 [7.616635]
B:BD[6.833] → [6.833:861]
```
        // Remove sickness.
```
[6.833]
[6.861]
```
        // Restore rotted HP.
```
Replacement in crawl-ref/source/spells1.cc at line 859 [7.616635]
B:BD[6.877] → [6.877:906]
```
            if (you.disease)
```
[6.877]
[6.906]
```
            if (player_rotted())
```

Replacement in crawl-ref/source/spells1.cc at line 862 [7.616635]

B:BD[6.952] → [6.952:985]

                you.disease = 0;

[6.952]

[6.985]

                unrot_hp(3 + random2(9));

Replacement in crawl-ref/source/spells1.cc at line 872 [7.616635]
∅:D[5.357] → [6.1086:1113]
B:BD[6.1086] → [6.1086:1113]
```
        // Remove rotting.
```
[5.357]
[6.1113]
```
        // Divine robustness, level 1.
```

Replacement in crawl-ref/source/spells1.cc at line 874 [7.616635]

B:BD[6.1129] → [6.1129:1158]

            if (you.rotting)

[6.1129]

[6.1158]

            if (you.attribute[ATTR_DIVINE_ROBUSTNESS] < 1)

Replacement in crawl-ref/source/spells1.cc at line 877 [7.616635]

B:BD[6.1204] → [6.1204:1237]

                you.rotting = 0;

[6.1204]

[6.1237]

                mpr("Zin grants you divine robustness.", MSGCH_DURATION);
                you.attribute[ATTR_DIVINE_ROBUSTNESS] = 1;
                you.duration[DUR_DIVINE_ROBUSTNESS] += 19 + random2(19);
                calc_hp();

Replacement in crawl-ref/source/spells1.cc at line 890 [7.616635]
B:BD[6.1338] → [6.1338:1368]
```
        // Restore rotted HP.
```
[6.1338]
[6.1368]
```
        // Divine robustness, level 2.
```

Replacement in crawl-ref/source/spells1.cc at line 892 [7.616635]

B:BD[6.1384] → [9.171:204]

            if (player_rotted())

[6.1384]

[9.204]

            if (you.attribute[ATTR_DIVINE_ROBUSTNESS] < 2)

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

B:BD[9.250] → [9.250:292]

                unrot_hp(1 + random2(3));

[9.250]

[9.292]

                mpr("Zin strengthens your divine robustness.", MSGCH_DURATION);
                you.attribute[ATTR_DIVINE_ROBUSTNESS] = 2;
                you.duration[DUR_DIVINE_ROBUSTNESS] += 13 + random2(13);
                calc_hp();

Replacement in crawl-ref/source/spells1.cc at line 908 [7.616635]
B:BD[9.393] → [9.393:428]
```
        // Restore more rotted HP.
```
[9.393]
[6.1384]
```
        // Divine robustness, level 3.
```

Replacement in crawl-ref/source/spells1.cc at line 910 [7.616635]

B:BD[6.1400] → [6.1400:1433]

            if (player_rotted())

[6.1400]

[6.1433]

            if (you.attribute[ATTR_DIVINE_ROBUSTNESS] < 3)

Replacement in crawl-ref/source/spells1.cc at line 913 [7.616635]

B:BD[6.1479] → [3.171:213]

                unrot_hp(2 + random2(6));

[6.1479]

[6.1521]

                mpr("Zin maximises your divine robustness.", MSGCH_DURATION);
                you.attribute[ATTR_DIVINE_ROBUSTNESS] = 3;
                you.duration[DUR_DIVINE_ROBUSTNESS] += 7 + random2(7);
                calc_hp();

Insertion in crawl-ref/source/skills2.cc at line 2115 [7.647133]
[2.2457]
[2.2457]
```
                + you.attribute[ATTR_DIVINE_ROBUSTNESS]
```

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

B:BD[10.348] → [4.2528:2582]

        // neither does Zin's revitalisation chaining

[10.348]

[4.2582]

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

Insertion in crawl-ref/source/religion.cc at line 484 [7.804403]

[4.2760]

                you.duration[DUR_REVITALISATION_CHAIN] = 0;
            }
            if (you.duration[DUR_DIVINE_ROBUSTNESS])
            {
                mpr("Your divine robustness is withdrawn.");
                you.duration[DUR_DIVINE_ROBUSTNESS] = 0;

Insertion in crawl-ref/source/religion.cc at line 492 [7.804403]
[4.2820]
[4.2820]
```
                calc_hp();
```

Insertion in crawl-ref/source/religion.cc at line 4322 [7.804403]

[4.3035]

[11.8846]

        if (you.duration[DUR_DIVINE_ROBUSTNESS])
        {
            mpr("Your divine robustness is withdrawn.");
            you.attribute[ATTR_DIVINE_ROBUSTNESS] = 0;
            you.duration[DUR_DIVINE_ROBUSTNESS] = 0;
            calc_hp();
        }

Insertion in crawl-ref/source/enum.h at line 174 [7.3287960]
[12.17263]
[13.4707]
```
    ATTR_DIVINE_ROBUSTNESS,     // strength of Zin's Divine Robustness
```
Insertion in crawl-ref/source/enum.h at line 1074 [7.3287960]
[14.5545]
[13.4775]
```
    DUR_DIVINE_ROBUSTNESS,      // duration of Zin's Divine Robustness
```

Insertion in crawl-ref/source/acr.cc at line 3065 [7.4397395]

[8.6138]

[15.1269835]


    if ( _decrement_a_duration(DUR_DIVINE_ROBUSTNESS))
    {
        mpr("Your divine robustness fades.", MSGCH_DURATION);
        you.attribute[ATTR_DIVINE_ROBUSTNESS] = 0;
        calc_hp();
    }

To make Zin's Revitalisation less of a potion effect, consoliodate the

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells1.cc at line 825 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 827 [7.616635]

Insertion in crawl-ref/source/spells1.cc at line 831 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 841 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 843 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 846 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 857 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 859 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 862 [7.616635]

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

Replacement in crawl-ref/source/spells1.cc at line 874 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 877 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 890 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 892 [7.616635]

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

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

Replacement in crawl-ref/source/spells1.cc at line 910 [7.616635]

Replacement in crawl-ref/source/spells1.cc at line 913 [7.616635]

Insertion in crawl-ref/source/skills2.cc at line 2115 [7.647133]

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

Insertion in crawl-ref/source/religion.cc at line 484 [7.804403]

Insertion in crawl-ref/source/religion.cc at line 492 [7.804403]

Insertion in crawl-ref/source/religion.cc at line 4322 [7.804403]

Insertion in crawl-ref/source/enum.h at line 174 [7.3287960]

Insertion in crawl-ref/source/enum.h at line 1074 [7.3287960]

Insertion in crawl-ref/source/acr.cc at line 3065 [7.4397395]