fiddlerwoaroof/crawl - Change HOUSHQ4DQK4MVKTCJ56MKYGYPDTF77HJCFVB5PYV7ALNZZJWFYFQC

Adapt Zin's old Divine Robustness into Elyvilon's Divine Vigour,

replacing the old Incredible Healing.

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

Created by dolorous on September 24, 2008

HOUSHQ4DQK4MVKTCJ56MKYGYPDTF77HJCFVB5PYV7ALNZZJWFYFQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.h at line 31 [9.611815]
∅:D[7.251] → [8.401:434]
B:BD[10.256] → [8.401:434]
```
void remove_divine_robustness();
```
[10.171]
[8.434]
```
void remove_divine_vigour();
bool cast_divine_vigour();
```
Replacement in crawl-ref/source/spells1.cc at line 801 [9.616635]
B:BD[8.469] → [8.469:501]
```
void remove_divine_robustness()
```
[10.735]
[8.501]
```
void remove_divine_vigour()
```

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

B:BD[8.503] → [11.231:289]

∅:D[11.289] → [8.552:644]

B:BD[8.552] → [8.552:644]

    mpr("Your divine robustness fades.", MSGCH_DURATION);
    you.duration[DUR_DIVINE_ROBUSTNESS] = 0;
    you.attribute[ATTR_DIVINE_ROBUSTNESS] = 0;

[8.503]

[8.644]

    mpr("Your divine vigour fades.", MSGCH_DURATION);
    you.duration[DUR_DIVINE_VIGOUR] = 0;
    you.attribute[ATTR_DIVINE_VIGOUR] = 0;

Insertion in crawl-ref/source/spells1.cc at line 808 [9.616635]
[8.661]
[8.661]
```
bool cast_divine_vigour()
{
    bool success = false;
```

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

[8.662]

    if (!you.duration[DUR_DIVINE_VIGOUR])
    {
        mprf("%s grants you divine vigour.",
             god_name(you.religion).c_str());
        const int vigour_amt = 1 + (you.skills[SK_INVOCATIONS]/6);
        const int old_hp_max = you.hp_max;
        you.attribute[ATTR_DIVINE_VIGOUR] = vigour_amt;
        you.duration[DUR_DIVINE_VIGOUR]
            = 35 + (you.skills[SK_INVOCATIONS]*5)/3;
        calc_hp();
        inc_hp(you.hp_max - old_hp_max, false);
        success = true;
    }
    else
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}

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

B:BD[6.2878] → [6.2878:2941]

            you.attribute[ATTR_DIVINE_STAMINA] += stamina_amt;

[6.2878]

[6.2941]

            you.attribute[ATTR_DIVINE_STAMINA] = stamina_amt;

Replacement in crawl-ref/source/religion.cc at line 256 [9.804403]
B:BD[12.2221] → [12.2221:2267]
```
    { "call upon Elyvilon for minor healing",
```
[12.2221]
[12.2267]
```
    { "call upon Elyvilon for lesser healing",
```
Replacement in crawl-ref/source/religion.cc at line 258 [9.804403]
B:BD[12.2312] → [12.2312:2361]
```
      "call upon Elyvilon for moderate healing",
```
[12.2312]
[12.2361]
```
      "call upon Elyvilon for greater healing",
```
Replacement in crawl-ref/source/religion.cc at line 260 [9.804403]
B:BD[12.2415] → [3.2534:2584]
```
      "call upon Elyvilon for greater healing" },
```
[12.2415]
[13.174]
```
      "call upon Elyvilon for divine vigour" },
```
Replacement in crawl-ref/source/religion.cc at line 342 [9.804403]
B:BD[12.4365] → [12.4365:4411]
```
    { "call upon Elyvilon for minor healing",
```
[12.4365]
[12.4411]
```
    { "call upon Elyvilon for lesser healing",
```
Replacement in crawl-ref/source/religion.cc at line 344 [9.804403]
B:BD[12.4456] → [12.4456:4505]
```
      "call upon Elyvilon for moderate healing",
```
[12.4456]
[12.4505]
```
      "call upon Elyvilon for greater healing",
```
Replacement in crawl-ref/source/religion.cc at line 346 [9.804403]
B:BD[12.4559] → [3.2585:2635]
```
      "call upon Elyvilon for greater healing" },
```
[12.4559]
[13.189]
```
      "call upon Elyvilon for divine vigour" },
```
Replacement in crawl-ref/source/religion.cc at line 763 [9.804403]
∅:D[14.2844] → [15.2524:2576]
B:BD[16.348] → [15.2524:2576]
```
        // neither does TSO's halo or divine shield
```
[14.2844]
[17.2692]
```
        // Neither does TSO's halo or divine shield.
```

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

[18.3973]

[19.867]

        // Neither does Ely's divine vigour.
        else if (god == GOD_ELYVILON)
        {
            if (you.duration[DUR_DIVINE_VIGOUR])
                remove_divine_vigour();
        }

Insertion in crawl-ref/source/religion.cc at line 4869 [9.804403]

[20.4961]

[21.3739]

        if (you.duration[DUR_DIVINE_VIGOUR])
            remove_divine_vigour();

Replacement in crawl-ref/source/player.cc at line 3924 [9.962854]
B:BD[9.1033948] → [22.2544:2589]
```
    if (you.duration[DUR_DIVINE_ROBUSTNESS])
```
[9.1033948]
[22.2589]
```
    if (you.duration[DUR_DIVINE_VIGOUR])
```

Replacement in crawl-ref/source/player.cc at line 4915 [9.962854]

B:BD[4.4148] → [4.4148:4367]

    // Frail and robust mutations, and divine robustness.
    hitp *= (10 + player_mutation_level(MUT_ROBUST)
                + you.attribute[ATTR_DIVINE_ROBUSTNESS]
                - player_mutation_level(MUT_FRAIL));

[4.4148]

[4.4367]

    // Frail and robust mutations, and divine vigour.
    hitp *= 10 + player_mutation_level(MUT_ROBUST)
               + you.attribute[ATTR_DIVINE_VIGOUR]
               - player_mutation_level(MUT_FRAIL);

Replacement in crawl-ref/source/output.cc at line 2156 [9.1088282]
B:BD[22.2643] → [22.2643:2688]
```
    if (you.duration[DUR_DIVINE_ROBUSTNESS])
```
[22.2643]
[22.2688]
```
    if (you.duration[DUR_DIVINE_VIGOUR])
```
Replacement in crawl-ref/source/enum.h at line 87 [9.3287960]
B:BD[9.3291862] → [9.3291862:3291889]
```
    ABIL_ELYVILON_HEALING,
```
[9.3291862]
[9.3291889]
```
    ABIL_ELYVILON_GREATER_HEALING,
```
Replacement in crawl-ref/source/enum.h at line 89 [9.3287960]
B:BD[9.3291920] → [23.10594:10646]
```
    ABIL_ELYVILON_GREATER_HEALING,          //  224
```
[9.3291920]
[24.8778]
```
    ABIL_ELYVILON_DIVINE_VIGOUR,            //  224
```

Replacement in crawl-ref/source/enum.h at line 154 [9.3287960]

B:BD[25.17263] → [26.4781:4852]

    ATTR_DIVINE_ROBUSTNESS,     // strength of Zin's Divine Robustness

[25.17263]

[27.4569]

    ATTR_DIVINE_VIGOUR,         // strength of Ely's Divine Vigour

Replacement in crawl-ref/source/enum.h at line 1095 [9.3287960]

B:BD[28.5545] → [26.4853:4924]

    DUR_DIVINE_ROBUSTNESS,      // duration of Zin's Divine Robustness

[28.5545]

[27.4638]

    DUR_DIVINE_VIGOUR,          // duration of Ely's Divine Vigour

Replacement in crawl-ref/source/dat/descript/ability.txt at line 323 [29.3323]
B:BD[29.8947] → [29.8947:8955]
```
Healing
```
[29.8947]
[29.8955]
```
Greater Healing
```
Replacement in crawl-ref/source/dat/descript/ability.txt at line 332 [29.3323]
B:BD[29.9085] → [29.9085:9101]
```
Greater Healing
```
[29.9085]
[29.9101]
```
Divine Vigour
```

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

B:BD[29.9102] → [5.4660:4736]

Depending on your Invocations skill, heal a great amount of your hitpoints.

[29.9102]

[29.9155]

Depending on your Invocations skill, heal a moderate amount of, and 
temporarily increase, your hitpoints.

Replacement in crawl-ref/source/acr.cc at line 2996 [9.4397395]

B:BD[26.5027] → [30.3993:4047]

B:BD[30.4047] → [8.4216:4252]

    if (_decrement_a_duration(DUR_DIVINE_ROBUSTNESS))
        remove_divine_robustness();

[26.5027]

[27.4814]

    if (_decrement_a_duration(DUR_DIVINE_VIGOUR))
        remove_divine_vigour();

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

B:BD[12.10585] → [12.10585:10641]

B:BD[12.10641] → [31.4992:5031]

      ABIL_ELYVILON_HEALING, ABIL_ELYVILON_RESTORATION,
      ABIL_ELYVILON_GREATER_HEALING },

[12.10585]

[32.528]

      ABIL_ELYVILON_GREATER_HEALING, ABIL_ELYVILON_RESTORATION,
      ABIL_ELYVILON_DIVINE_VIGOUR },

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

B:BD[33.661] → [33.661:733]

    { ABIL_ELYVILON_HEALING, "Healing", 2, 0, 250, 2, ABFLAG_CONF_OK },

[33.661]

[33.733]

    { ABIL_ELYVILON_GREATER_HEALING, "Greater Healing",
      2, 0, 250, 2, ABFLAG_CONF_OK },

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

B:BD[33.813] → [34.7001:7071]

    { ABIL_ELYVILON_GREATER_HEALING, "Greater Healing", 6, 0, 600, 5,

[33.813]

[33.883]

    { ABIL_ELYVILON_DIVINE_VIGOUR, "Divine Vigour", 6, 0, 600, 5,

Replacement in crawl-ref/source/abl-show.cc at line 670 [9.4494389]
B:BD[35.11315] → [35.11315:11347]
```
    case ABIL_ELYVILON_HEALING:
```
[35.11315]
[2.410]
```
    case ABIL_ELYVILON_GREATER_HEALING:
```
Replacement in crawl-ref/source/abl-show.cc at line 710 [9.4494389]
B:BD[35.12544] → [35.12544:12584]
```
    case ABIL_ELYVILON_GREATER_HEALING:
```
[35.12544]
[2.505]
```
    case ABIL_ELYVILON_DIVINE_VIGOUR:
```

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

B:BD[9.4527610] → [9.4527610:4527677]

        if (!cast_healing( 3 + (you.skills[SK_INVOCATIONS] / 6) ))

[9.4527610]

[36.3115]

        if (!cast_healing(3 + (you.skills[SK_INVOCATIONS] / 6)))

Replacement in crawl-ref/source/abl-show.cc at line 1674 [9.4494389]
B:BD[9.4527697] → [9.4527697:4527736]
```
        exercise( SK_INVOCATIONS, 1 );
```
[9.4527697]
[9.4527736]
```
        exercise(SK_INVOCATIONS, 1);
```
Replacement in crawl-ref/source/abl-show.cc at line 1679 [9.4494389]
B:BD[9.4527813] → [9.4527813:4527865]
```
        exercise( SK_INVOCATIONS, 2 + random2(3) );
```
[9.4527813]
[9.4527865]
```
        exercise(SK_INVOCATIONS, 2 + random2(3));
```

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

B:BD[9.4527881] → [9.4527881:4527981]

    case ABIL_ELYVILON_HEALING:
        if (!cast_healing( 10 + (you.skills[SK_INVOCATIONS] / 3) ))

[9.4527881]

[36.3144]

    case ABIL_ELYVILON_GREATER_HEALING:
        if (!cast_healing(10 + (you.skills[SK_INVOCATIONS] / 3)))

Replacement in crawl-ref/source/abl-show.cc at line 1686 [9.4494389]
B:BD[9.4528001] → [9.4528001:4528053]
```
        exercise( SK_INVOCATIONS, 3 + random2(5) );
```
[9.4528001]
[9.4528053]
```
        exercise(SK_INVOCATIONS, 3 + random2(5));
```
Replacement in crawl-ref/source/abl-show.cc at line 1690 [9.4494389]
B:BD[9.4528105] → [37.4665:4709]
∅:D[37.4709] → [9.4528146:4528171]
B:BD[9.4528146] → [9.4528146:4528171]
```
        restore_stat( STAT_ALL, 0, false );
        unrot_hp( 100 );
```
[9.4528105]
[9.4528171]
```
        restore_stat(STAT_ALL, 0, false);
        unrot_hp(100);
```
Replacement in crawl-ref/source/abl-show.cc at line 1693 [9.4494389]
B:BD[9.4528172] → [9.4528172:4528224]
```
        exercise( SK_INVOCATIONS, 4 + random2(6) );
```
[9.4528172]
[9.4528224]
```
        exercise(SK_INVOCATIONS, 4 + random2(6));
```

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

B:BD[9.4528240] → [9.4528240:4528346]

    case ABIL_ELYVILON_GREATER_HEALING:
        if (!cast_healing( 20 + you.skills[SK_INVOCATIONS] * 2 ))

[9.4528240]

[36.3173]

    case ABIL_ELYVILON_DIVINE_VIGOUR:
        if (!cast_divine_vigour())

Replacement in crawl-ref/source/abl-show.cc at line 1700 [9.4494389]
B:BD[9.4528366] → [9.4528366:4528419]
```
        exercise( SK_INVOCATIONS, 6 + random2(10) );
```
[9.4528366]
[9.4528419]
```
        exercise(SK_INVOCATIONS, 6 + random2(10));
```

Adapt Zin's old Divine Robustness into Elyvilon's Divine Vigour,

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Insertion in crawl-ref/source/religion.cc at line 4869 [9.804403]

Replacement in crawl-ref/source/player.cc at line 3924 [9.962854]

Replacement in crawl-ref/source/player.cc at line 4915 [9.962854]

Replacement in crawl-ref/source/output.cc at line 2156 [9.1088282]

Replacement in crawl-ref/source/enum.h at line 87 [9.3287960]

Replacement in crawl-ref/source/enum.h at line 89 [9.3287960]

Replacement in crawl-ref/source/enum.h at line 154 [9.3287960]

Replacement in crawl-ref/source/enum.h at line 1095 [9.3287960]

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

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

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

Replacement in crawl-ref/source/acr.cc at line 2996 [9.4397395]

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

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

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

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

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

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

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

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

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

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

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

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

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

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