fiddlerwoaroof/crawl - Change JW2KRJHES33W7UTWZ6NDO4TLMK4EFU4HKZXBWR2UJOMPCCOTR4CQC

Streamlined god-given abilities.

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

Created by haranp on December 10, 2006

JW2KRJHES33W7UTWZ6NDO4TLMK4EFU4HKZXBWR2UJOMPCCOTR4CQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 2702 [3.293070]

B:BD[3.366631] → [3.366631:366690]

            && (!player_under_penance() && you.piety >= 50

[3.366631]

[3.366690]

            && (!player_under_penance() && you.piety >= piety_breakpoint(1)

Insertion in crawl-ref/source/spells2.cc at line 44 [3.569242]
[3.570391]
[3.570391]
```
#include "religion.h"
```

Replacement in crawl-ref/source/spells2.cc at line 1543 [3.569242]

B:BD[3.610431] → [3.610431:610500]

                 && you.piety >= 100 && random2(200) <= you.piety)))

[3.610431]

[3.610500]

                 && you.piety >= piety_breakpoint(3)
                 && random2(200) <= you.piety)))

Insertion in crawl-ref/source/religion.h at line 20 [3.800304]
[3.800883]
[3.801115]
```
int piety_breakpoint(int i);
```

Insertion in crawl-ref/source/religion.cc at line 79 [3.804403]

[4.1151]

[3.806351]

};
const char* god_gain_power_messages[MAX_NUM_GODS][MAX_GOD_ABILITIES] =
{
    // no god
    { "", "", "", "", "" },
    // Zin
    { "repel the undead",
      "call upon Zin for minor healing",
      "call down a plague",
      "utter a Holy Word",      
      "summon a guardian angel" },
    // TSO
    { "repel the undead",
      "smite your foes",
      "dispel the undead",
      "hurl bolts of divine anger",
      "summon a divine warrior" },
    // Kikubaaqudgha
    { "recall your undead slaves",
      "Kikubaaqudgha is protecting you from some side-effects of death magic.",
      "permanently enslave the undead",
      "",
      "summon an emissary of Death" },
    // Yredelemnul
    { "animate corpses",
      "recall your undead slaves",
      "animate legions of the dead",
      "drain ambient lifeforce",
      "control the undead" },
    // Xom
    { "", "", "",
      "", "" },
    // Vehumet
    { "gain power from killing in Vehumet's name",
      "You can call upon Vehumet to aid your destructive magics with prayer.",
      "During prayer you have some protection from summoned creatures.",
      "", "" },
    // Okawaru
    { "give your body great, but temporary strength",
      "call upon Okawaru for minor healing",
      "",
      "",
      "haste yourself" },
    // Makhleb
    { "gain power from killing in Makhleb's name",
      "harness Makhleb's destructive might",
      "summon a lesser servant of Makhleb",
      "hurl Makhleb's greater destruction",
      "summon a greater servant of Makhleb" },
    // Sif Muna
    { "tap ambient magical fields",
      "freely open your mind to new spells",
      "",
      "Sif Muna is protecting you from some side-effects of spellcasting.",
      "" },
    // Trog
    { "go berserk at will",
      "give your body great, but temporary, strength",
      "",
      "haste yourself",
      "" },
    // Nemelex
    { "", "", "",
      "", "" },
    // Elyvilon
    { "call upon Elyvilon for minor healing",
      "call upon Elyvilon for purification",
      "call upon Elyvilon for moderate healing",
      "call upon Elyvilon to restore your abilities",
      "call upon Elyvilon for incredible healing" }
};
const char* god_lose_power_messages[MAX_NUM_GODS][MAX_GOD_ABILITIES] =
{
    // no god
    { "", "", "", "", "" },
    // Zin
    { "repel the undead",
      "call upon Zin for minor healing",
      "call down a plague",
      "utter a Holy Word",      
      "summon a guardian angel" },
    // TSO
    { "repel the undead",
      "smite your foes",
      "dispel the undead",
      "hurl bolts of divine anger",
      "summon a divine warrior" },
    // Kikubaaqudgha
    { "recall your undead slaves",
      "Kikubaaqudgha is no longer shielding you from miscast death magic.",
      "permanently enslave the undead",
      "",
      "summon an emissary of Death" },
    // Yredelemnul
    { "animate corpses",
      "recall your undead slaves",
      "animate legions of the dead",
      "drain ambient lifeforce",
      "control the undead" },
    // Xom
    { "", "", "",
      "", "" },
    // Vehumet
    { "gain power from killing in Vehumet's name",
      "Vehumet will no longer aid your destructive magics.",
      "Vehumet will no longer shield you from summoned creatures.",
      "",
      "" },
    // Okawaru
    { "give your body great, but temporary strength",
      "call upon Okawaru for minor healing",
      "",
      "",
      "haste yourself" },
    // Makhleb
    { "gain power from killing in Makhleb's name",
      "harness Makhleb's destructive might",
      "summon a lesser servant of Makhleb",
      "hurl Makhleb's greater destruction",
      "summon a greater servant of Makhleb" },
    // Sif Muna
    { "tap ambient magical fields",
      "forget spells at will",
      "",
      "Sif Muna is no longer protecting you from miscast magic.",
      "" },
    // Trog
    { "go berserk at will",
      "give your body great, but temporary, strength",
      "",
      "haste yourself",
      "" },
    // Nemelex
    { "", "", "",
      "", "" },
    // Elyvilon
    { "call upon Elyvilon for minor healing",
      "call upon Elyvilon for purification",
      "call upon Elyvilon for moderate healing",
      "call upon Elyvilon to restore your abilities",
      "call upon Elyvilon for incredible healing" }

Insertion in crawl-ref/source/religion.cc at line 223 [3.804403]
[3.806354]
[3.806354]

Deletion in crawl-ref/source/religion.cc at line 1546 [3.804403]

B:BD[3.841226] → [3.841226:841276]

B:BD[3.841276] → [5.191004:191055]

∅:D[5.191055] → [3.841276:841395]

B:BD[3.841276] → [3.841276:841395]

B:BD[3.841422] → [3.841422:841657]

B:BD[3.841657] → [5.191056:191168]

∅:D[5.191168] → [3.841658:842180]

B:BD[3.841658] → [3.841658:842180]

B:BD[3.842180] → [6.196301:196380]

∅:D[6.196380] → [3.842260:842734]

B:BD[3.842260] → [3.842260:842734]

B:BD[3.842734] → [5.191169:191220]

∅:D[5.191220] → [3.842734:844436]

B:BD[3.842734] → [3.842734:844436]

B:BD[3.844436] → [5.191221:191272]

∅:D[5.191272] → [3.844436:845869]

B:BD[3.844436] → [3.844436:845869]

B:BD[3.845869] → [5.191273:191324]

∅:D[5.191324] → [3.845869:846046]

B:BD[3.845869] → [3.845869:846046]

B:BD[3.846046] → [5.191325:191351]

∅:D[5.191351] → [3.846046:846657]

B:BD[3.846046] → [3.846046:846657]

B:BD[3.846776] → [3.846776:847249]


    if (you.piety >= 30 && old_piety < 30)
    {
	take_note(Note(NOTE_GOD_POWER, you.religion, 0));
        switch (you.religion)
        {
        case GOD_NO_GOD:
        case GOD_XOM:
        case GOD_NEMELEX_XOBEH:
            break;
        default:
            strcpy(info, "You can now ");
            strcat(info,
                    (you.religion == GOD_ZIN || you.religion == GOD_SHINING_ONE)
                            ? "repel the undead" :
                    (you.religion == GOD_SIF_MUNA)
                            ? "tap ambient magical fields" :
                    (you.religion == GOD_KIKUBAAQUDGHA)
                            ? "recall your undead slaves" :
                    (you.religion == GOD_YREDELEMNUL)
                            ? "animate corpses" :
                    (you.religion == GOD_VEHUMET)
                            ? "gain power from killing in Vehumet's name" :
                    (you.religion == GOD_MAKHLEB)
                            ? "gain power from killing in Makhleb's name" :
                    (you.religion == GOD_OKAWARU)
                            ? "give your body great, but temporary strength" :
                    (you.religion == GOD_TROG)
                            ? "go berserk at will" :
                    (you.religion == GOD_ELYVILON)
                            ? "call upon Elyvilon for minor healing"
                // Unknown god
                            : "endure this program bug @30");
            strcat(info, ".");
            god_speaks(you.religion, info);
            break;
        }
    }
    if (you.piety >= 50 && old_piety < 50)
    {
	take_note(Note(NOTE_GOD_POWER, you.religion, 1));
        switch (you.religion)
        {
        case GOD_NO_GOD:
        case GOD_XOM:
        case GOD_NEMELEX_XOBEH:
            break;
        case GOD_KIKUBAAQUDGHA:
            simple_god_message(" is protecting you from some side-effects of death magic.");
            break;
        case GOD_VEHUMET:
            god_speaks(you.religion, "You can call upon Vehumet to aid your destructive magics with prayer.");
            break;
        default:
            strcpy(info, "You can now ");
            strcat(info,
                   (you.religion == GOD_ZIN)
                           ? "call upon Zin for minor healing" :
                   (you.religion == GOD_SHINING_ONE)
                           ? "smite your foes" :
                   (you.religion == GOD_YREDELEMNUL)
                           ? "recall your undead slaves" :
                   (you.religion == GOD_OKAWARU)
                           ? "call upon Okawaru for minor healing" :
                   (you.religion == GOD_MAKHLEB)
                           ? "harness Makhleb's destructive might" :
                   (you.religion == GOD_SIF_MUNA)
                           ? "freely open your mind to new spells" :
                   (you.religion == GOD_TROG)
                           ? "give your body great, but temporary, strength" :
                   (you.religion == GOD_ELYVILON)
                           ? "call upon Elyvilon for purification"
                   // Unknown god
                           : "endure this program bug @50");
            strcat(info, ".");
            god_speaks(you.religion, info);
            break;
        }
    }
    if (you.piety >= 75 && old_piety < 75)
    {
	take_note(Note(NOTE_GOD_POWER, you.religion, 2));
        switch (you.religion)
        {
        case GOD_NO_GOD:
        case GOD_XOM:
        case GOD_OKAWARU:
        case GOD_NEMELEX_XOBEH:
        case GOD_SIF_MUNA:
        case GOD_TROG:
            break;
        case GOD_VEHUMET:
            god_speaks(you.religion,"During prayer you have some protection from summoned creatures.");
            break;
        default:
            strcpy(info, "You can now ");
            strcat(info,
                     (you.religion == GOD_ZIN)
                                 ? "call down a plague" :
                     (you.religion == GOD_SHINING_ONE)
                                 ? "dispel the undead" :
                     (you.religion == GOD_KIKUBAAQUDGHA)
                                 ? "permanently enslave the undead" :
                     (you.religion == GOD_YREDELEMNUL)
                                 ? "animate legions of the dead" :
                     (you.religion == GOD_MAKHLEB)
                                 ? "summon a lesser servant of Makhleb" :
                     (you.religion == GOD_ELYVILON)
                                 ? "call upon Elyvilon for moderate healing"
                     // Unknown god
                                 : "endure this program bug @75");
            strcat(info, ".");
            god_speaks(you.religion, info);
            break;
        }
    }
    if (you.piety >= 100 && old_piety < 100)
    {
	take_note(Note(NOTE_GOD_POWER, you.religion, 3));
        switch (you.religion)
        {
        case GOD_NO_GOD:
        case GOD_XOM:
        case GOD_OKAWARU:
        case GOD_NEMELEX_XOBEH:
        case GOD_KIKUBAAQUDGHA:
        case GOD_VEHUMET:
            break;
        case GOD_SIF_MUNA:
            simple_god_message
                (" is protecting you from some side-effects of spellcasting.");
            break;
        default:
            strcpy(info, "You can now ");
            strcat(info,
                        (you.religion == GOD_ZIN)
                                ? "utter a Holy Word" :
                        (you.religion == GOD_SHINING_ONE)
                                ? "hurl bolts of divine anger" :
                        (you.religion == GOD_YREDELEMNUL)
                                ? "drain ambient lifeforce" :
                        (you.religion == GOD_MAKHLEB)
                                ? "hurl Makhleb's greater destruction" :
                        (you.religion == GOD_TROG)
                                ? "haste yourself" :
                        (you.religion == GOD_ELYVILON)
                                ? "call upon Elyvilon to restore your abilities"
                        // Unknown god
                                : "endure this program bug @100");

Replacement in crawl-ref/source/religion.cc at line 1547 [3.804403]

B:BD[3.847250] → [3.847250:847406]

            strcat(info, ".");
            god_speaks(you.religion, info);
            break;
        }
    }
    if (you.piety >= 120 && old_piety < 120)

[3.847250]

[3.847406]

    for ( int i = 0; i < MAX_GOD_ABILITIES; ++i )

Replacement in crawl-ref/source/religion.cc at line 1549 [3.804403]

B:BD[3.847412] → [5.191352:191403]

∅:D[5.191403] → [3.847412:847442]

B:BD[3.847412] → [3.847412:847442]

	take_note(Note(NOTE_GOD_POWER, you.religion, 4));
        switch (you.religion)

[3.847412]

[3.847442]

        if ( you.piety >= piety_breakpoint(i) &&
             old_piety < piety_breakpoint(i) )

Replacement in crawl-ref/source/religion.cc at line 1552 [3.804403]

B:BD[3.847452] → [3.847452:848729]

        case GOD_NO_GOD:
        case GOD_XOM:
        case GOD_NEMELEX_XOBEH:
        case GOD_VEHUMET:
        case GOD_SIF_MUNA:
        case GOD_TROG:
            break;
        default:
            strcpy(info, "You can now ");
            strcat(info,
                     (you.religion == GOD_ZIN)
                                ? "summon a guardian angel" :
                     (you.religion == GOD_SHINING_ONE)
                                ? "summon a divine warrior" :
                     (you.religion == GOD_KIKUBAAQUDGHA)
                                ? "summon an emissary of Death" :
                     (you.religion == GOD_YREDELEMNUL)
                                ? "control the undead" :
                     (you.religion == GOD_OKAWARU)
                                ? "haste yourself" :
                     (you.religion == GOD_MAKHLEB)
                                ? "summon a greater servant of Makhleb" :
                     (you.religion == GOD_ELYVILON)
                                ? "call upon Elyvilon for incredible healing"
                     // Unknown god
                                : "endure this program bug @120");
            strcat(info, ".");
            god_speaks(you.religion, info);
            break;

[3.847452]

[3.848729]

            take_note(Note(NOTE_GOD_POWER, you.religion, i));
            const char* pmsg = god_gain_power_messages[(int)you.religion][i];
            const char first = pmsg[0];
            if ( first )
            {
                if ( isupper(first) )
                    god_speaks(you.religion, pmsg);
                else
                {
                    snprintf(info, INFO_SIZE, "You can now %s.", pmsg);
                    god_speaks(you.religion, info);
                }
            }

Replacement in crawl-ref/source/religion.cc at line 1572 [3.804403]
∅:D[5.191649] → [3.849023:849024]
B:BD[3.849023] → [3.849023:849024]
B:BD[3.849024] → [5.191650:191702]
```
}                               // end gain_piety()
```
[5.191649]
[3.849711]
```
}
```
Replacement in crawl-ref/source/religion.cc at line 1593 [3.804403]
∅:D[5.191954] → [3.853452:853501]
B:BD[3.853452] → [3.853452:853501]
```
        if (you.piety < 120 && old_piety >= 120)
```
[5.191954]
[3.853501]
```
        for ( int i = 0; i < MAX_GOD_ABILITIES; ++i )
```

Replacement in crawl-ref/source/religion.cc at line 1595 [3.804403]

B:BD[3.853511] → [3.853511:853545]

            switch (you.religion)

[3.853511]

[3.853545]

            if ( you.piety < piety_breakpoint(i) &&
                 old_piety >= piety_breakpoint(i) )

Replacement in crawl-ref/source/religion.cc at line 1598 [3.804403]

B:BD[3.853559] → [3.853559:854941]

            case GOD_NO_GOD:
            case GOD_XOM:
            case GOD_NEMELEX_XOBEH:
            case GOD_VEHUMET:
            case GOD_SIF_MUNA:
            case GOD_TROG:
                break;
            default:
                strcpy(info, "You can no longer ");
                strcat(info,
                           (you.religion == GOD_ZIN)
                                ? "summon guardian angels" :
                           (you.religion == GOD_SHINING_ONE)
                                ? "summon divine warriors" :
                           (you.religion == GOD_KIKUBAAQUDGHA)
                                ? "summon Death's emissaries" :
                           (you.religion == GOD_YREDELEMNUL)
                                ? "control undead beings" :
                           (you.religion == GOD_OKAWARU)
                                ? "haste yourself" :
                           (you.religion == GOD_MAKHLEB)
                                ? "summon a greater servant of Makhleb" :
                           (you.religion == GOD_ELYVILON)
                                ? "call upon Elyvilon for incredible healing"
                           // Unknown god
                                : "endure this program bug @120");
                strcat(info, ".");
                god_speaks(you.religion, info);
                break;

[3.853559]

[3.854941]

                const char* pmsg=god_lose_power_messages[(int)you.religion][i];
                const char first = pmsg[0];
                if ( first )
                {
                    if ( isupper(first) )
                        god_speaks(you.religion, pmsg);
                    else
                    {
                        snprintf(info,INFO_SIZE,"You can no longer %s.",pmsg);
                        god_speaks(you.religion, info);
                    }
                }

Deletion in crawl-ref/source/religion.cc at line 1612 [3.804403]

B:BD[3.854965] → [3.854965:855230]

B:BD[3.855230] → [5.191955:191985]

∅:D[5.191985] → [3.855230:855982]

B:BD[3.855230] → [3.855230:855982]

B:BD[3.856097] → [3.856097:856898]

B:BD[3.856898] → [5.191986:192077]

∅:D[5.192077] → [3.856986:860025]

B:BD[3.856986] → [3.856986:860025]

B:BD[3.860056] → [3.860056:860534]

B:BD[3.860534] → [5.192078:192190]

∅:D[5.192190] → [3.860534:861365]

B:BD[3.860534] → [3.860534:861365]


        if (you.piety < 100 && old_piety >= 100)
        {
            switch (you.religion)
            {
            case GOD_NO_GOD:
            case GOD_XOM:
            case GOD_OKAWARU:
            case GOD_NEMELEX_XOBEH:
            case GOD_KIKUBAAQUDGHA:
            case GOD_VEHUMET:
                break;
            case GOD_SIF_MUNA:
                god_speaks(you.religion,"Sif Muna is no longer protecting you from miscast magic.");
                break;
            default:
                strcpy(info, "You can no longer ");
                strcat(info,
                        (you.religion == GOD_ZIN)
                            ? "utter a Holy Word" :
                        (you.religion == GOD_ELYVILON)
                            ? "call upon Elyvilon to restore your abilities" :
                        (you.religion == GOD_SHINING_ONE)
                            ? "hurl bolts of divine anger" :
                        (you.religion == GOD_YREDELEMNUL)
                            ? "drain ambient life force" :
                        (you.religion == GOD_MAKHLEB)
                            ? "direct Makhleb's greater destructive powers" :
                        (you.religion == GOD_TROG)
                            ? "haste yourself"
                        // Unknown god
                            : "endure this program bug @100");
                strcat(info, ".");
                god_speaks(you.religion, info);
                break;
            }
        }
        if (you.piety < 75 && old_piety >= 75)
        {
            switch (you.religion)
            {
            case GOD_NO_GOD:
            case GOD_XOM:
            case GOD_OKAWARU:
            case GOD_NEMELEX_XOBEH:
            case GOD_SIF_MUNA:
            case GOD_TROG:
                break;
            case GOD_VEHUMET:
                simple_god_message(" will no longer shield you from summoned creatures.");
                break;
            default:
                strcpy(info, "You can no longer ");
                strcat(info,
                       (you.religion == GOD_ZIN)
                                ? "call down a plague" :
                       (you.religion == GOD_SHINING_ONE)
                                ? "dispel undead" :
                       (you.religion == GOD_KIKUBAAQUDGHA)
                                ? "enslave undead" :
                       (you.religion == GOD_YREDELEMNUL)
                                ? "animate legions of the dead" :
                       (you.religion == GOD_MAKHLEB)
                                ? "summon a servant of Makhleb" :
                       (you.religion == GOD_ELYVILON)
                                ? "call upon Elyvilon for moderate healing"
                       // Unknown god
                                : "endure this program bug @75");
                strcat(info, ".");
                god_speaks(you.religion, info);
                break;
            }
        }
        if (you.piety < 50 && old_piety >= 50)
        {
            switch (you.religion)
            {
            case GOD_NO_GOD:
            case GOD_XOM:
            case GOD_NEMELEX_XOBEH:
                break;
            case GOD_KIKUBAAQUDGHA:
                simple_god_message(" is no longer shielding you from miscast death magic.");
                break;
            case GOD_VEHUMET:
                simple_god_message(" will no longer aid your destructive magics.");
                break;
            default:
                strcpy(info, "You can no longer ");
                strcat(info,
                       (you.religion == GOD_ZIN)
                            ? "call upon Zin for minor healing" :
                       (you.religion == GOD_SHINING_ONE)
                            ? "smite your foes" :
                       (you.religion == GOD_YREDELEMNUL)
                            ? "recall your undead slaves" :
                       (you.religion == GOD_OKAWARU)
                            ? "call upon Okawaru for minor healing" :
                       (you.religion == GOD_MAKHLEB)
                            ? "hurl Makhleb's destruction" :
                       (you.religion == GOD_SIF_MUNA)
                            ? "forget spells at will" :
                       (you.religion == GOD_TROG)
                            ? "give your body great, but temporary, strength" :
                       (you.religion == GOD_ELYVILON)
                            ? "call upon Elyvilon for Purification"
                       // Unknown god
                            : "endure this program bug @50");
                strcat(info, ".");
                god_speaks(you.religion, info);
                break;
            }
        }
        if (you.piety < 30 && old_piety >= 30)
        {
            switch (you.religion)
            {
            case GOD_NO_GOD:
            case GOD_XOM:
            case GOD_NEMELEX_XOBEH:
                break;
            default:
                strcpy(info, "You can no longer ");
                strcat(info,
                    (you.religion == GOD_ZIN || you.religion == GOD_SHINING_ONE)
                            ? "repel the undead" :
                    (you.religion == GOD_KIKUBAAQUDGHA)
                            ? "recall your undead slaves" :
                    (you.religion == GOD_YREDELEMNUL)
                            ? "animate corpses" :
                    (you.religion == GOD_SIF_MUNA)
                            ? "tap ambient magical fields" :
                    (you.religion == GOD_VEHUMET)
                            ? "gain power from killing in Vehumet's name" :
                    (you.religion == GOD_MAKHLEB)
                            ? "gain power from killing in Makhleb's name" :
                    (you.religion == GOD_OKAWARU)
                            ? "give your body great, but temporary, strength" :
                    (you.religion == GOD_TROG)
                            ? "go berserk at will" :
                    (you.religion == GOD_ELYVILON)
                            ? "call upon Elyvilon for minor healing."
                    // Unknown god
                            : "endure this program bug @30");
                strcat(info, ".");
                god_speaks(you.religion, info);
                break;
            }
        }

Replacement in crawl-ref/source/religion.cc at line 1613 [3.804403]
B:BD[3.861371] → [3.861371:861423]
```
}                               // end lose_piety()
```
[3.861371]
[3.861423]
```
}
```

Insertion in crawl-ref/source/religion.cc at line 2634 [3.804403]

[3.889019]


int piety_breakpoint(int i)
{
    int breakpoints[MAX_GOD_ABILITIES] = { 30, 50, 75, 100, 120 };
    if ( i >= MAX_GOD_ABILITIES || i < 0 )
        return 255;
    else
        return breakpoints[i];
}

Replacement in crawl-ref/source/output.cc at line 163 [3.1088282]

B:BD[3.1091143] → [3.1091143:1091191]

            ouch(-9999, 0, KILLED_BY_WEAKNESS);

[3.1091143]

[3.1091191]

            ouch(INSTANT_DEATH, 0, KILLED_BY_WEAKNESS);

Replacement in crawl-ref/source/output.cc at line 194 [3.1088282]

B:BD[3.1091806] → [3.1091806:1091855]

            ouch(-9999, 0, KILLED_BY_STUPIDITY);

[3.1091806]

[3.1091855]

            ouch(INSTANT_DEATH, 0, KILLED_BY_STUPIDITY);

Replacement in crawl-ref/source/output.cc at line 223 [3.1088282]

B:BD[3.1092412] → [3.1092412:1092462]

            ouch(-9999, 0, KILLED_BY_CLUMSINESS);

[3.1092412]

[3.1092462]

            ouch(INSTANT_DEATH, 0, KILLED_BY_CLUMSINESS);

Replacement in crawl-ref/source/output.cc at line 856 [3.1088282]

B:BD[2.6375] → [2.6375:6429]

         !player_under_penance() && you.piety >= 75);

[2.6375]

[2.6429]

         !player_under_penance() && you.piety >= piety_breakpoint(2));

Replacement in crawl-ref/source/notes.cc at line 24 [5.370339]

B:BD[5.370714] → [5.370714:371597]

/* I can't believe I'm writing code this bad */
static int real_god_power( int religion, int idx ) {
    switch ( religion ) {
    case GOD_NO_GOD:
    case GOD_XOM:
    case GOD_NEMELEX_XOBEH:
	return -1;
    case GOD_ZIN:
    case GOD_SHINING_ONE:
    case GOD_YREDELEMNUL:
    case GOD_MAKHLEB:	
    case GOD_ELYVILON:
	return idx;
    case GOD_KIKUBAAQUDGHA:
	if ( idx < 3 )
	    return idx;
	if ( idx == 3 )
	    return -1;
	return idx-1;	
    case GOD_VEHUMET:
	return ( idx > 3 ? -1 : idx );
    case GOD_OKAWARU:
	if ( idx < 2 )
	    return idx;
	if ( idx == 2 || idx == 3 )
	    return -1;
	return idx - 2;
    case GOD_SIF_MUNA:
	if ( idx == 2 || idx == 4 ) return -1;
	if ( idx < 2 ) return idx;
	if ( idx == 3 ) return 2;
    case GOD_TROG:
	if ( idx == 2 || idx == 4 ) return -1;
	if ( idx < 2 ) return idx;
	if ( idx == 3 ) return idx-1;
    default:
	return -1;
    }

[5.370714]

[5.371597]

// return the real number of the power (casting out nonexistent powers),
// starting from 0, or -1 if the power doesn't exist
static int real_god_power( int religion, int idx )
{
    if ( god_gain_power_messages[religion][idx][0] == 0 )
        return -1;
    int count = 0;
    for ( int j = 0; j < idx; ++j )
        if ( god_gain_power_messages[religion][j][0] )
            ++count;
    return count;

Replacement in crawl-ref/source/misc.cc at line 589 [3.1933596]

B:BD[3.1945867] → [3.1945867:1945918]

                ouch(-9999, 0, KILLED_BY_WINNING);

[3.1945867]

[3.1945918]

                ouch(INSTANT_DEATH, 0, KILLED_BY_WINNING);

Replacement in crawl-ref/source/misc.cc at line 593 [3.1933596]
B:BD[3.1945943] → [3.1945943:1945986]
```
        ouch(-9999, 0, KILLED_BY_LEAVING);
```
[3.1945943]
[3.1945986]
```
        ouch(INSTANT_DEATH, 0, KILLED_BY_LEAVING);
```

Replacement in crawl-ref/source/fight.cc at line 2060 [3.3140790]

B:BD[3.3201648] → [3.3201648:3201710]

            && (!player_under_penance() && you.piety >= 75)))

[3.3201648]

[3.3201710]

            && (!player_under_penance() && you.piety >= piety_breakpoint(2))))

Insertion in crawl-ref/source/externs.h at line 1084 [3.3270163]
[5.903195]
[5.903195]
```
extern const char* god_gain_power_messages[MAX_NUM_GODS][MAX_GOD_ABILITIES];
```

Replacement in crawl-ref/source/describe.cc at line 6376 [3.3736416]

∅:D[6.477949] → [3.3942209:3942253]

B:BD[3.3942209] → [3.3942209:3942253]

static void print_god_abil_desc( int abil )

[6.477949]

[3.3942253]

extern ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES];
static bool print_god_abil_desc( int god, int numpower )

Replacement in crawl-ref/source/describe.cc at line 6380 [3.3736416]

B:BD[3.3942255] → [3.3942255:3942394]

    const ability_def &abil_info = get_ability_def( abil );
    const std::string cost = "(" + make_cost_description( abil_info ) + ")";

[3.3942255]

[3.3942394]

    const char* pmsg = god_gain_power_messages[god][numpower];
    char buf[200];
    // if no message then no power
    if ( !pmsg[0] )
        return false;
    
    // The power could be either passive or an active ability.
    // Determine which.
    const ability_type abil = god_abilities[god][numpower];
    if ( isupper(pmsg[0]) )
        strcpy(buf, pmsg);
    else
        snprintf(buf, sizeof buf, "You can %s.", pmsg);
    std::string cost;
    if ( abil != ABIL_NON_ABILITY )
    {
        cost = "(" + make_cost_description(get_ability_def(abil)) + ")";
        cost = std::string(79 - strlen(buf) - cost.length(), ' ') + cost;
    }

Replacement in crawl-ref/source/describe.cc at line 6401 [3.3736416]

B:BD[3.3942458] → [3.3942458:3942577]

B:BD[3.3942577] → [5.990551:990585]

    std::string str( abil_info.name );
    str += std::string( 79 - str.length() - cost.length(), ' ' ) + cost + EOL;
    cprintf( "%s", str.c_str() );

[3.3942458]

[3.3942605]

    cprintf( "%s%s\n", buf, cost.c_str() );
    return true;

Replacement in crawl-ref/source/describe.cc at line 6682 [3.3736416]
B:BD[3.3955442] → [5.992041:992079]
```
        bool penance_ability = false;
```
[3.3955442]
[3.3955442]
```
        bool have_any = false;
```
Replacement in crawl-ref/source/describe.cc at line 6689 [3.3736416]
B:BD[3.3955704] → [5.992080:992141]
```
            penance_ability = true; // suppress "none" later
```
[3.3955704]
[5.992141]
```
            have_any = true;
```

Replacement in crawl-ref/source/describe.cc at line 6697 [3.3736416]

B:BD[3.3956125] → [3.3956125:3956264]

        // mv: No abilities (except divine protection)
        // under penance (fix me if I'm wrong)
        if (player_under_penance())

[3.3956125]

[5.992456]

        // mv: No abilities (except divine protection) under penance
        if (!player_under_penance())

Replacement in crawl-ref/source/describe.cc at line 6700 [3.3736416]

B:BD[5.992466] → [5.992466:992542]

            if ( !penance_ability )
                cprintf( "None." EOL );

[5.992466]

[3.3956311]

            for ( int i = 0; i < MAX_GOD_ABILITIES; ++i )
                if ( you.piety >= piety_breakpoint(i) )
                    if (print_god_abil_desc(which_god, i))
                        have_any = true;

Replacement in crawl-ref/source/describe.cc at line 6706 [3.3736416]

B:BD[3.3956321] → [3.3956321:3956344]

B:BD[3.3956344] → [5.992543:992610]

∅:D[5.992610] → [3.3956410:3957509]

B:BD[3.3956410] → [3.3956410:3957509]

B:BD[3.3957509] → [5.992611:992680]

∅:D[5.992680] → [3.3957574:3959565]

B:BD[3.3957574] → [3.3957574:3959565]

B:BD[3.3959676] → [3.3959676:3960970]

B:BD[3.3960970] → [5.992681:992858]

∅:D[5.992858] → [3.3960970:3961078]

B:BD[3.3960970] → [3.3960970:3961078]

B:BD[3.3961144] → [3.3961144:3962551]

        else
        {
            switch (which_god) //mv: finally let's print abilities
            {
            case GOD_ZIN:
                if (you.piety >= 30)
                    print_god_abil_desc( ABIL_ZIN_REPEL_UNDEAD );
                else 
                    cprintf( "None." EOL ); 
                if (you.piety >= 50)  
                    print_god_abil_desc( ABIL_ZIN_HEALING );
                if (you.piety >= 75)
                    print_god_abil_desc( ABIL_ZIN_PESTILENCE );
                if (you.piety >= 100) 
                    print_god_abil_desc( ABIL_ZIN_HOLY_WORD );
                if (you.piety >= 120) 
                    print_god_abil_desc( ABIL_ZIN_SUMMON_GUARDIAN );
                break;
            case GOD_SHINING_ONE:
                if (you.piety >= 30)
                    print_god_abil_desc( ABIL_TSO_REPEL_UNDEAD );
                else 
                    cprintf( "None." EOL );
                if (you.piety >= 50)
                    print_god_abil_desc( ABIL_TSO_SMITING );
                if (you.piety >= 75)
                    print_god_abil_desc( ABIL_TSO_ANNIHILATE_UNDEAD );
                if (you.piety >= 100)
                    print_god_abil_desc( ABIL_TSO_CLEANSING_FLAME );
                if (you.piety >= 120)
                    print_god_abil_desc( ABIL_TSO_SUMMON_DAEVA );
                break;
            case GOD_KIKUBAAQUDGHA:
                if (you.piety >= 30)
                    print_god_abil_desc( ABIL_KIKU_RECALL_UNDEAD_SLAVES );
                else 
                    cprintf( "None." EOL );
                if (you.piety >= 50)
                    cprintf("You are protected from some of the side-effects of death magic." EOL);
                if (you.piety >= 75)
                    print_god_abil_desc( ABIL_KIKU_ENSLAVE_UNDEAD );
                if (you.piety >= 120) 
                    print_god_abil_desc( ABIL_KIKU_INVOKE_DEATH );
                break;
            case GOD_YREDELEMNUL:
                if (you.piety >= 30)
                    print_god_abil_desc( ABIL_YRED_ANIMATE_CORPSE );
                else 
                    cprintf( "None." EOL );
                if (you.piety >= 50)
                    print_god_abil_desc( ABIL_YRED_RECALL_UNDEAD );
                if (you.piety >= 75)
                    print_god_abil_desc( ABIL_YRED_ANIMATE_DEAD );
                if (you.piety >= 100)
                    print_god_abil_desc( ABIL_YRED_DRAIN_LIFE );
                if (you.piety >= 120)
                    print_god_abil_desc( ABIL_YRED_CONTROL_UNDEAD );
                break;
            case GOD_VEHUMET:
                if (you.piety >= 30)  
                {
                    cprintf( "You can gain power from the those you kill " EOL
                             "   in Vehumet's name, or those slain by your servants." EOL );
                }
                else 
                    cprintf( "None." EOL );
                if (you.piety >= 50)  
                    cprintf( "Vehumet assists with destructive magics during prayer." EOL );
                if (you.piety >= 75)  
                    cprintf( "During prayer you have some protection from summoned creatures." EOL );
                break;
            case GOD_OKAWARU:
                if (you.piety >= 30)
                    print_god_abil_desc( ABIL_OKAWARU_MIGHT );
                else 
                    cprintf( "None." EOL );
                if (you.piety >= 50)
                    print_god_abil_desc( ABIL_OKAWARU_HEALING );
                if (you.piety >= 120)
                    print_god_abil_desc( ABIL_OKAWARU_HASTE );
                break;
            case GOD_MAKHLEB:
                if (you.piety >= 30)
                {
                    cprintf( "You can gain power from the deaths " EOL
                             "   of those you kill in Makhleb's name." EOL );
                }
                else 
                    cprintf( "None." EOL );
                if (you.piety >= 50)
                    print_god_abil_desc( ABIL_MAKHLEB_MINOR_DESTRUCTION );
                if (you.piety >= 75)
                    print_god_abil_desc( ABIL_MAKHLEB_LESSER_SERVANT_OF_MAKHLEB );
                if (you.piety >= 100)
                    print_god_abil_desc( ABIL_MAKHLEB_MAJOR_DESTRUCTION );
                if (you.piety >= 120)
                    print_god_abil_desc( ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB );
                break;
            case GOD_SIF_MUNA:
                if (you.piety >= 30)
                    print_god_abil_desc( ABIL_SIF_MUNA_CHANNEL_ENERGY );
                else 
                    cprintf( "None." EOL );
                if (you.piety >= 50)
                    print_god_abil_desc( ABIL_SIF_MUNA_FORGET_SPELL );
                if (you.piety >= 100) 
                    cprintf( "You are protected from some side-effects of spellcasting." EOL );
                break;
            case GOD_TROG:
                if (you.piety >= 30)
                    print_god_abil_desc( ABIL_TROG_BERSERK );
                else 
                    cprintf( "None." EOL );
                if (you.piety >= 50)
                    print_god_abil_desc( ABIL_TROG_MIGHT );
                if (you.piety >= 100)
                    print_god_abil_desc( ABIL_TROG_HASTE_SELF );
                break;
            case GOD_ELYVILON:
                if (you.piety >= 30)
                    print_god_abil_desc( ABIL_ELYVILON_LESSER_HEALING );
                else 
                    cprintf( "None." EOL );
                if (you.piety >= 50)  
                    print_god_abil_desc( ABIL_ELYVILON_PURIFICATION );
                if (you.piety >= 75) 
                    print_god_abil_desc( ABIL_ELYVILON_HEALING );
                if (you.piety >= 100)
                    print_god_abil_desc( ABIL_ELYVILON_RESTORATION );
                if (you.piety >= 120) 
                    print_god_abil_desc( ABIL_ELYVILON_GREATER_HEALING );
                break;
            default:   //mv: default is Xom, Nemelex and all bugs.
                cprintf( "None." EOL );
            } //end of printing abilities
        }

[3.3956321]

[3.3962551]

        if ( !have_any )
            cprintf( "None." EOL );

Insertion in crawl-ref/source/defines.h at line 156 [3.3982910]

[5.1021352]

// The maximum number of abilities any god can have
#define MAX_GOD_ABILITIES               5

Replacement in crawl-ref/source/command.cc at line 51 [3.4082507]
∅:D[6.479475] → [3.4083459:4083503]
B:BD[3.4083459] → [3.4083459:4083503]
```
        ouch(-9999, 0, KILLED_BY_QUITTING);
```
[6.479475]
[3.4083503]
```
        ouch(INSTANT_DEATH, 0, KILLED_BY_QUITTING);
```

Replacement in crawl-ref/source/acr.cc at line 2164 [3.4397395]

B:BD[3.4462516] → [3.4462516:4462568]

            ouch( -9999, 0, KILLED_BY_STARVATION );

[3.4462516]

[3.4462568]

            ouch( INSTANT_DEATH, 0, KILLED_BY_STARVATION );

Insertion in crawl-ref/source/abl-show.cc at line 83 [3.4494389]

[3.4496208]

// declaring this const messes up externs later, so don't do it
ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] =
{
    // no god
    { ABIL_NON_ABILITY, ABIL_NON_ABILITY, ABIL_NON_ABILITY,
      ABIL_NON_ABILITY, ABIL_NON_ABILITY },
    // Zin
    { ABIL_ZIN_REPEL_UNDEAD, ABIL_ZIN_HEALING, ABIL_ZIN_PESTILENCE,
      ABIL_ZIN_HOLY_WORD, ABIL_ZIN_SUMMON_GUARDIAN },
    // TSO
    { ABIL_TSO_REPEL_UNDEAD, ABIL_TSO_SMITING, ABIL_TSO_ANNIHILATE_UNDEAD,
      ABIL_TSO_CLEANSING_FLAME, ABIL_TSO_SUMMON_DAEVA },
    // Kikubaaqudgha
    { ABIL_KIKU_RECALL_UNDEAD_SLAVES, ABIL_NON_ABILITY,
      ABIL_KIKU_ENSLAVE_UNDEAD, ABIL_NON_ABILITY,
      ABIL_KIKU_INVOKE_DEATH },
    // Yredelemnul
    { ABIL_YRED_ANIMATE_CORPSE, ABIL_YRED_RECALL_UNDEAD,
      ABIL_YRED_ANIMATE_DEAD, ABIL_YRED_DRAIN_LIFE,
      ABIL_YRED_CONTROL_UNDEAD },
    // Xom
    { ABIL_NON_ABILITY, ABIL_NON_ABILITY, ABIL_NON_ABILITY,
      ABIL_NON_ABILITY, ABIL_NON_ABILITY },
    // Vehumet
    { ABIL_NON_ABILITY, ABIL_NON_ABILITY, ABIL_NON_ABILITY,
      ABIL_NON_ABILITY, ABIL_NON_ABILITY },
    // Okawaru
    { ABIL_OKAWARU_MIGHT, ABIL_OKAWARU_HEALING, ABIL_NON_ABILITY,
      ABIL_NON_ABILITY, ABIL_OKAWARU_HASTE },
    // Makhleb
    { ABIL_NON_ABILITY, ABIL_MAKHLEB_MINOR_DESTRUCTION,
      ABIL_MAKHLEB_LESSER_SERVANT_OF_MAKHLEB,
      ABIL_MAKHLEB_MAJOR_DESTRUCTION,
      ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB },
    // Sif Muna
    { ABIL_SIF_MUNA_CHANNEL_ENERGY,
      ABIL_SIF_MUNA_FORGET_SPELL, ABIL_NON_ABILITY,
      ABIL_NON_ABILITY, ABIL_NON_ABILITY },
    // Trog
    { ABIL_TROG_BERSERK, ABIL_TROG_MIGHT, ABIL_NON_ABILITY,
      ABIL_TROG_HASTE_SELF, ABIL_NON_ABILITY },
    // Nemelex
    { ABIL_NON_ABILITY, ABIL_NON_ABILITY, ABIL_NON_ABILITY,
      ABIL_NON_ABILITY, ABIL_NON_ABILITY },
    // Elyvilon
    { ABIL_ELYVILON_LESSER_HEALING, ABIL_ELYVILON_PURIFICATION,
      ABIL_ELYVILON_HEALING, ABIL_ELYVILON_RESTORATION,
      ABIL_ELYVILON_GREATER_HEALING }
};

Replacement in crawl-ref/source/abl-show.cc at line 1561 [3.4494389]
B:BD[3.4539811] → [3.4539811:4539841]
```
        switch (you.religion)
```
[3.4539811]
[3.4539841]
```
        for ( int i = 0; i < MAX_GOD_ABILITIES; ++i )
```

Replacement in crawl-ref/source/abl-show.cc at line 1563 [3.4494389]

B:BD[3.4539851] → [3.4539851:4540672]

B:BD[3.4540672] → [5.1284070:1284130]

∅:D[5.1284130] → [3.4540728:4543309]

B:BD[3.4540728] → [3.4540728:4543309]

B:BD[3.4543309] → [5.1284131:1284228]

∅:D[5.1284228] → [3.4543309:4543424]

B:BD[3.4543309] → [3.4543309:4543424]

B:BD[3.4543567] → [3.4543567:4543603]

        case GOD_ZIN:
            if (you.piety >= 30)
                insert_ability( ABIL_ZIN_REPEL_UNDEAD );
            if (you.piety >= 50)
                insert_ability( ABIL_ZIN_HEALING );
            if (you.piety >= 75)
                insert_ability( ABIL_ZIN_PESTILENCE );
            if (you.piety >= 100)
                insert_ability( ABIL_ZIN_HOLY_WORD );
            if (you.piety >= 120)
                insert_ability( ABIL_ZIN_SUMMON_GUARDIAN );
            break;
        case GOD_SHINING_ONE:
            if (you.piety >= 30)
                insert_ability( ABIL_TSO_REPEL_UNDEAD );
            if (you.piety >= 50)
                insert_ability( ABIL_TSO_SMITING );
            if (you.piety >= 75)
                insert_ability( ABIL_TSO_ANNIHILATE_UNDEAD );
            if (you.piety >= 100)
                insert_ability( ABIL_TSO_CLEANSING_FLAME );
            if (you.piety >= 120)
                insert_ability( ABIL_TSO_SUMMON_DAEVA );
            break;
        case GOD_YREDELEMNUL:
            if (you.piety >= 30)
                insert_ability( ABIL_YRED_ANIMATE_CORPSE );
            if (you.piety >= 50)
                insert_ability( ABIL_YRED_RECALL_UNDEAD );
            if (you.piety >= 75)
                insert_ability( ABIL_YRED_ANIMATE_DEAD );
            if (you.piety >= 100)
                insert_ability( ABIL_YRED_DRAIN_LIFE );
            if (you.piety >= 120)
                insert_ability( ABIL_YRED_CONTROL_UNDEAD );
            break;
        case GOD_ELYVILON:
            if (you.piety >= 30)
                insert_ability( ABIL_ELYVILON_LESSER_HEALING );
            if (you.piety >= 50)
                insert_ability( ABIL_ELYVILON_PURIFICATION );
            if (you.piety >= 75)
                insert_ability( ABIL_ELYVILON_HEALING );
            if (you.piety >= 100)
                insert_ability( ABIL_ELYVILON_RESTORATION );
            if (you.piety >= 120)
                insert_ability( ABIL_ELYVILON_GREATER_HEALING );
            break;
        case GOD_MAKHLEB:
            if (you.piety >= 50)
                insert_ability( ABIL_MAKHLEB_MINOR_DESTRUCTION );
            if (you.piety >= 75)
                insert_ability( ABIL_MAKHLEB_LESSER_SERVANT_OF_MAKHLEB );
            if (you.piety >= 100)
                insert_ability( ABIL_MAKHLEB_MAJOR_DESTRUCTION );
            if (you.piety >= 120)
                insert_ability( ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB );
            break;
        case GOD_KIKUBAAQUDGHA:
            if (you.piety >= 30)
                insert_ability( ABIL_KIKU_RECALL_UNDEAD_SLAVES );
            if (you.piety >= 75)
                insert_ability( ABIL_KIKU_ENSLAVE_UNDEAD );
            if (you.piety >= 120)
                insert_ability( ABIL_KIKU_INVOKE_DEATH );
            break;
        case GOD_OKAWARU:
            if (you.piety >= 30)
                insert_ability( ABIL_OKAWARU_MIGHT );
            if (you.piety >= 50)
                insert_ability( ABIL_OKAWARU_HEALING );
            if (you.piety >= 120)
                insert_ability( ABIL_OKAWARU_HASTE );
            break;
        case GOD_TROG:
            if (you.piety >= 30)
                insert_ability( ABIL_TROG_BERSERK );
            if (you.piety >= 50)
                insert_ability( ABIL_TROG_MIGHT );
            if (you.piety >= 100)
                insert_ability( ABIL_TROG_HASTE_SELF );
            break;
        case GOD_SIF_MUNA:
            if (you.piety >= 30)
                insert_ability( ABIL_SIF_MUNA_CHANNEL_ENERGY );
            if (you.piety >= 50)
                insert_ability( ABIL_SIF_MUNA_FORGET_SPELL );
            break;
        default:
            break;

[3.4539851]

[3.4543603]

            if ( you.piety >= piety_breakpoint(i) )
            {
                ability_type abil = god_abilities[(int)you.religion][i];
                if ( abil != ABIL_NON_ABILITY )
                    insert_ability(abil);
            }