fiddlerwoaroof/crawl - Change G3VTDWCBBCQ2ERLIASBX5A2WJDJWSBTJZBOLABZ3I2FLH6ITK2QAC

Make Trog's Hand grant both regeneration and magic resistance.

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

Created by dolorous on May 6, 2009

G3VTDWCBBCQ2ERLIASBX5A2WJDJWSBTJZBOLABZ3I2FLH6ITK2QAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.h at line 57 [4.611815]

B:BD[4.615072] → [4.615072:615098]

void cast_regen(int pow);

[4.615072]

[4.615098]

void remove_regen(bool divine_ability = false);
void cast_regen(int pow, bool divine_ability = false);

Replacement in crawl-ref/source/spells1.cc at line 1304 [4.616635]

B:BD[4.638172] → [4.638172:638197]

void cast_regen(int pow)

[4.638172]

[4.638197]

void remove_regen(bool divine_ability)
{
    mpr("Your skin stops crawling.", MSGCH_DURATION);
    you.duration[DUR_REGENERATION] = 0;
    if (divine_ability)
    {
        mpr("You feel less resistant to magic.", MSGCH_DURATION);
        you.attribute[ATTR_DIVINE_REGENERATION] = 0;
    }
}
void cast_regen(int pow, bool divine_ability)

Insertion in crawl-ref/source/spells1.cc at line 1319 [4.616635]

[2.1144]

[5.295]


    if (divine_ability)
    {
        mpr("You feel resistant to magic.");
        you.attribute[ATTR_DIVINE_REGENERATION] = 1;
    }

Replacement in crawl-ref/source/religion.cc at line 252 [4.804403]

B:BD[6.2055] → [7.5666:5707]

      "call upon Trog for regeneration",

[6.2055]

[6.2110]

      "call upon Trog for regeneration and magic resistance",

Replacement in crawl-ref/source/religion.cc at line 338 [4.804403]

B:BD[6.4199] → [7.5751:5792]

      "call upon Trog for regeneration",

[6.4199]

[6.4254]

      "call upon Trog for regeneration and magic resistance",

Insertion in crawl-ref/source/religion.cc at line 882 [4.804403]

[8.348]

[9.5800]

        // Neither does Trog's regeneration or magic resistance.
        else if (god == GOD_TROG)
        {
            if (you.duration[DUR_REGENERATION]
                && you.attribute[ATTR_DIVINE_REGENERATION])
            {
                remove_regen(true);
            }
        }

Replacement in crawl-ref/source/player.cc at line 1099 [4.962854]
B:BD[4.974061] → [4.974061:974105]
```
    if (you.duration[DUR_REGENERATION] > 0)
```
[4.974061]
[4.974105]
```
    if (you.duration[DUR_REGENERATION])
```

Insertion in crawl-ref/source/player.cc at line 1272 [4.962854]

[4.977231]

[10.2445]


    // Trog's Hand
    if (you.attribute[ATTR_DIVINE_REGENERATION])
        rm += 70;

Replacement in crawl-ref/source/enum.h at line 114 [4.3287960]

B:BD[11.447417] → [12.903616:903695]

    AI_FORCE_INTERRUPT  = 0,        // Forcibly kills any activity that can be

[11.447417]

[12.903695]

    AI_FORCE_INTERRUPT = 0,         // Forcibly kills any activity that can be

Replacement in crawl-ref/source/enum.h at line 144 [4.3287960]

B:BD[4.3294300] → [4.3294300:3294347]

    ATTR_DIVINE_LIGHTNING_PROTECTION,  //    0

[4.3294300]

[13.3093]

    ATTR_DIVINE_LIGHTNING_PROTECTION,
    ATTR_DIVINE_REGENERATION,

Replacement in crawl-ref/source/acr.cc at line 2076 [4.4397395]

B:BD[4.4442316] → [14.22119:22218]

B:BD[3.16514] → [3.16514:16552]

∅:D[3.16552] → [14.22259:22330]

B:BD[14.22259] → [14.22259:22330]

    _decrement_a_duration(DUR_REGENERATION,
                          "Your skin stops crawling.",
                          coinflip(),
                          "Your skin is crawling a little less now.");

[4.4442316]

[4.4442408]

    if (_decrement_a_duration(DUR_REGENERATION,
                              NULL, coinflip(),
                              "Your skin is crawling a little less now."))
    {
        remove_regen(you.attribute[ATTR_DIVINE_REGENERATION]);
    }

Replacement in crawl-ref/source/acr.cc at line 2204 [4.4397395]

B:BD[4.4447888] → [15.3560:3636]

    if (you.duration[DUR_CONDENSATION_SHIELD] > 0 && player_res_cold() < 0)

[4.4447888]

[4.4448163]

    if (you.duration[DUR_CONDENSATION_SHIELD] && player_res_cold() < 0)

Replacement in crawl-ref/source/acr.cc at line 2323 [4.4397395]

B:BD[15.6511] → [16.11904:12008]

        if (you.duration[DUR_PARALYSIS] == 0
            && you.duration[DUR_PETRIFIED] == 0)
        {

[15.6511]

[12.1269677]

        if (!you.duration[DUR_PARALYSIS] && !you.duration[DUR_PETRIFIED])

Deletion in crawl-ref/source/acr.cc at line 2325 [4.4397395]
B:BD[12.1269728] → [16.12009:12019]
```
        }
```

Replacement in crawl-ref/source/acr.cc at line 2353 [4.4397395]

B:BD[4.4454308] → [17.3443:3517]

    if (you.duration[DUR_BACKLIGHT] > 0 && !--you.duration[DUR_BACKLIGHT]

[4.4454308]

[17.3517]

    if (you.duration[DUR_BACKLIGHT] && !--you.duration[DUR_BACKLIGHT]

Replacement in crawl-ref/source/abl-show.cc at line 1685 [4.4494389]
∅:D[18.2922] → [7.9115:9148]
B:BD[4.4527276] → [7.9115:9148]
```
        cast_regen(you.piety/2);
```
[18.2922]
[4.4527317]
```
        cast_regen(you.piety / 2, true);
```