fiddlerwoaroof/crawl - Change 3SUOBGK5YYVA6CAFQK3UCIADMZCRP6L53RF5DHYMGWGNRFIWVJNQC

Various religion-related fixes: Update the player's title when gaining

or losing piety or penance, so that Invocations-based titles are handled properly; don't display Zin's message about mutagenic glow if the player isn't glowing; and have Zin treat all chaotic spells consistently.

Created by David Lawrence Ramsey on September 24, 2009

3SUOBGK5YYVA6CAFQK3UCIADMZCRP6L53RF5DHYMGWGNRFIWVJNQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 942 [7.293070]
B:BD[6.343] → [6.343:387]
```
    if (spell_typematch(spell, SPTYP_HOLY))
```
[6.343]
[6.387]
```
    if (is_holy_spell(spell))
```

Insertion in crawl-ref/source/spl-cast.cc at line 954 [7.293070]

[8.128510]

[2.161]

    if (is_chaotic_spell(spell))
        did_god_conduct(DID_CHAOS, 10 + spell_difficulty(spell));

Replacement in crawl-ref/source/skills.cc at line 453 [7.745542]

B:BD[7.758501] → [9.6339:6398]

            redraw_skill( you.your_name, player_title() );

[7.758501]

[9.6398]

            redraw_skill(you.your_name, player_title());

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

B:BD[10.5694] → [11.10964:11032]

        dislikes.push_back("you use weapons or missiles of chaos");

[10.5694]

[12.8132]

        dislikes.push_back("you use chaotic magic or items");

Insertion in crawl-ref/source/religion.cc at line 874 [7.804403]
[7.806551]
[7.806551]
```
    if (val <= 0)
        return;
```

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

B:BD[13.3792] → [14.4515:4565]

B:BD[14.4565] → [15.2428:2490]

∅:D[15.2490] → [13.3913:3966]

B:BD[13.3913] → [13.3913:3966]

            // TSO's halo is once more available.
            if (god == GOD_SHINING_ONE && you.religion == god
                && you.piety >= piety_breakpoint(0))

[13.3792]

[13.3966]

            if (you.religion == god)

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

B:BD[13.3980] → [16.2523:2573]

                mpr("Your divine halo returns!");

[13.3980]

[13.4039]

                // In case the best skill is Invocations, redraw the god
                // title.
                redraw_skill(you.your_name, player_title());

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

[13.4213]

            // TSO's halo is once more available.
            else if (god == GOD_SHINING_ONE && you.religion == god
                && you.piety >= piety_breakpoint(0))
            {
                mpr("Your divine halo returns!");
            }

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

B:BD[7.807001] → [17.880:922]

    if (you.penance[god] == 0 && val > 0)

[7.807001]

[18.823]

    if (val <= 0)
        return;
    if (you.penance[god] == 0)

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

[19.2510]

[20.2573]

        you.penance[god] += val;
        you.penance[god] = std::min<unsigned char>(MAX_PENANCE,
                                                   you.penance[god]);

Insertion in crawl-ref/source/religion.cc at line 1046 [7.804403]
[17.1058]
[21.304]
```
        {
```

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

[21.348]

[3.3311]


            if (_need_water_walking() && !beogh_water_walk())
                fall_into_a_pool(you.pos(), true, grd(you.pos()));
        }

Deletion in crawl-ref/source/religion.cc at line 1083 [7.804403]
∅:D[21.348] → [18.867:873]
∅:D[17.1099] → [18.867:873]
∅:D[22.3884] → [18.867:873]
∅:D[23.3973] → [18.867:873]
B:BD[18.867] → [18.867:873]
B:BD[18.873] → [19.2511:2512]
B:BD[19.2512] → [24.2481:2510]
B:BD[24.2510] → [25.4110:4189]
```
    }
    you.penance[god] += val;
    you.penance[god] = std::min<unsigned char>(MAX_PENANCE, you.penance[god]);
```

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

B:BD[19.2514] → [26.3204:3278]

B:BD[26.3278] → [27.16721:16782]

    if (god == GOD_BEOGH && _need_water_walking() && !beogh_water_walk())
        fall_into_a_pool( you.pos(), true, grd(you.pos()) );

[19.2514]

[28.2529]

        if (you.religion == god)
        {
            // In case the best skill is Invocations, redraw the god
            // title.
            redraw_skill(you.your_name, player_title());
        }
    }
    else
    {
        you.penance[god] += val;
        you.penance[god] = std::min<unsigned char>(MAX_PENANCE,
                                                   you.penance[god]);
    }

Replacement in crawl-ref/source/religion.cc at line 3404 [7.804403]
B:BD[29.20237] → [29.20237:20258]
```
                else
```
[29.20237]
[29.20258]
```
                if (thing_done == DID_CAUSE_GLOWING)
```
Insertion in crawl-ref/source/religion.cc at line 3415 [7.804403]
[29.20673]
[29.20673]

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

B:BD[30.1955] → [30.1955:2138]

B:BD[30.2138] → [31.7394:7449]

            mprf( "You feel%sguilty.",
                  (piety_loss == 1) ? " a little " :
                  (piety_loss <  5) ? " " :
                  (piety_loss < 10) ? " very "
                                    : " extremely " );

[30.1955]

[30.2175]

            mprf("You feel%sguilty.",
                 (piety_loss == 1) ? " a little " :
                 (piety_loss <  5) ? " " :
                 (piety_loss < 10) ? " very "
                                   : " extremely ");

Replacement in crawl-ref/source/religion.cc at line 3623 [7.804403]
B:BD[30.2230] → [30.2230:2264]
```
        lose_piety( piety_loss );
```
[30.2230]
[30.2264]
```
        lose_piety(piety_loss);
```

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

[32.2850]

[33.2432]

            // In case the best skill is Invocations, redraw the god
            // title.
            redraw_skill(you.your_name, player_title());

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

[34.2669]

[4.2872]

        // In case the best skill is Invocations, redraw the god title.
        redraw_skill(you.your_name, player_title());

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

[35.2926]

[5.3258]

            // In case the best skill is Invocations, redraw the god
            // title.
            redraw_skill(you.your_name, player_title());

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

[7.853559]

[33.2506]

                // In case the best skill is Invocations, redraw the god
                // title.
                redraw_skill(you.your_name, player_title());

Insertion in crawl-ref/source/religion.cc at line 6636 [7.804403]
[36.3942]
[37.2529]
Replacement in crawl-ref/source/output.cc at line 1049 [7.1088282]
B:BD[38.7812] → [38.7812:7863]
```
    redraw_skill( you.your_name, player_title() );
```
[38.7812]
[38.7863]
```
    redraw_skill(you.your_name, player_title());
```
Insertion in crawl-ref/source/describe.cc at line 3767 [7.3736416]
[39.7817]
[39.7817]

Replacement in crawl-ref/source/debug.cc at line 3784 [7.4016436]

B:BD[7.4058455] → [7.4058455:4058514]

            redraw_skill( you.your_name, player_title() );

[7.4058455]

[7.4058514]

            redraw_skill(you.your_name, player_title());

Replacement in crawl-ref/source/debug.cc at line 3854 [7.4016436]
B:BD[7.4060067] → [7.4060067:4060122]
```
        redraw_skill( you.your_name, player_title() );
```
[7.4060067]
[7.4060122]
```
        redraw_skill(you.your_name, player_title());
```

Various religion-related fixes: Update the player's title when gaining

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 942 [7.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 954 [7.293070]

Replacement in crawl-ref/source/skills.cc at line 453 [7.745542]

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

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

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

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

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

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

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

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

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

Deletion in crawl-ref/source/religion.cc at line 1083 [7.804403]

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

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/output.cc at line 1049 [7.1088282]

Insertion in crawl-ref/source/describe.cc at line 3767 [7.3736416]

Replacement in crawl-ref/source/debug.cc at line 3784 [7.4016436]

Replacement in crawl-ref/source/debug.cc at line 3854 [7.4016436]