fiddlerwoaroof/crawl - Change RRNEVUYOK5S4M4QH77N34IXSSNUXVQAIZQLXAQKQCRITMPUKGP6AC

Clean up and consolidate all the smiting routines into the new function

god_smites_you().

This fixes a problem where you could worship Beogh, draw the Wrath card to make him smite you, and have him possibly protect you from his own smiting. The smiting code in beogh_idol_revenge() wouldn't allow this, but the smiting code in beogh_retribution() would.

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

Created by dolorous on November 23, 2007

RRNEVUYOK5S4M4QH77N34IXSSNUXVQAIZQLXAQKQCRITMPUKGP6AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.h at line 18 [5.800304]
[5.800589]
[6.168]
```
#include "ouch.h"
```

Insertion in crawl-ref/source/religion.h at line 48 [5.800304]

[3.214]

[7.1176]

void god_smites_you(god_type god, kill_method_type death_type,
                    const char *message = NULL);

Deletion in crawl-ref/source/religion.cc at line 355 [5.804403]
B:BD[5.806354] → [8.4612:4613]

Replacement in crawl-ref/source/religion.cc at line 2126 [5.804403]

∅:D[9.1063] → [10.401:407]

B:BD[10.401] → [10.401:407]

B:BD[10.407] → [9.1064:1129]

∅:D[9.1129] → [10.982:992]

B:BD[10.982] → [10.982:992]

B:BD[10.992] → [4.172:356]

∅:D[4.356] → [10.1058:1091]

∅:D[9.1286] → [10.1058:1091]

B:BD[10.1058] → [10.1058:1091]

B:BD[10.1091] → [9.1287:1601]

∅:D[9.1601] → [10.1165:1175]

B:BD[10.1165] → [10.1165:1175]

B:BD[10.1175] → [9.1602:1608]

    {
        if (!player_under_penance() && you.piety > random2(400))
        {
            snprintf(info, INFO_SIZE, "Mortal, I have averted the wrath "
                           "of %s... this time.", god_name(god));
            god_speaks(you.religion, info);
        }
        else
        {
            int divine_hurt = 10 + random2(10);            
            for (int i = 0; i < 5; i++)
                divine_hurt += random2( you.experience_level );
            simple_god_message( " smites you!", god );
            ouch( divine_hurt, 0, KILLED_BY_TSO_SMITING );
            dec_penance( god, 1 );
        }
    }

[9.1063]

[9.1608]

        god_smites_you(GOD_SHINING_ONE, KILLED_BY_TSO_SMITING);

Replacement in crawl-ref/source/religion.cc at line 2380 [5.804403]

B:BD[9.9499] → [9.9499:9505]

B:BD[9.9671] → [9.9671:9820]

B:BD[9.9820] → [4.357:423]

∅:D[4.423] → [9.9880:9924]

B:BD[9.9880] → [9.9880:9924]

∅:D[11.3103] → [5.867177:867210]

∅:D[9.9924] → [5.867177:867210]

∅:D[12.192662] → [5.867177:867210]

B:BD[5.867177] → [5.867177:867210]

B:BD[5.867210] → [13.190:344]

∅:D[13.344] → [9.9925:10076]

B:BD[5.867210] → [9.9925:10076]

∅:D[9.10076] → [5.867534:867544]

B:BD[5.867534] → [5.867534:867544]

    {
        if (!player_under_penance() && you.piety > random2(400))
        {
            snprintf(info, INFO_SIZE, "Mortal, I have averted the wrath "
                           "of %s... this time.", god_name(god));
            god_speaks(you.religion, info);
        }
        else
        {
            int divine_hurt = 10 + random2(10);
            for (int i = 0; i < 5; i++)
                divine_hurt += random2( you.experience_level );
            simple_god_message( " smites you!", god );
            ouch( divine_hurt, 0, KILLED_BY_BEOGH_SMITING );
            dec_penance( god, 1 );
        }

[9.9499]

[5.867544]

        god_smites_you(GOD_BEOGH, KILLED_BY_BEOGH_SMITING);

Deletion in crawl-ref/source/religion.cc at line 2382 [5.804403]
B:BD[5.867559] → [9.10077:10083]
```
    }
```

Replacement in crawl-ref/source/religion.cc at line 2785 [5.804403]

B:BD[13.586] → [14.1068:1136]

∅:D[14.1136] → [13.627:692]

B:BD[13.627] → [13.627:692]

        if (you.religion != GOD_BEOGH && you.religion != GOD_XOM &&
            !player_under_penance() && you.piety > random2(400))

[13.586]

[13.692]

        const char* revenge;
        if (you.religion == GOD_BEOGH)

Replacement in crawl-ref/source/religion.cc at line 2789 [5.804403]

B:BD[13.702] → [13.702:895]

             snprintf(info, INFO_SIZE, "Mortal, I have averted the wrath "
                            "of %s... this time.", god_name(GOD_BEOGH));
             god_speaks(you.religion, info);

[13.702]

[13.895]

            const char* messages[3] = {
                "Beogh fumes, \"This is no small sin, orc. Repent!\"",
                "Beogh whispers, \"You will pay for this transgression.\"",
                "Beogh rages, \"An eye for an eye...\""
            };
            revenge = RANDOM_ELEMENT(messages);

Replacement in crawl-ref/source/religion.cc at line 2797 [5.804403]
B:BD[13.905] → [13.905:918]
```
        else
```
[13.905]
[13.918]
```
        else if (you.species == SP_HILL_ORC)
```

Replacement in crawl-ref/source/religion.cc at line 2799 [5.804403]

B:BD[13.928] → [15.270:329]

B:BD[15.329] → [14.1137:1479]

∅:D[14.1479] → [15.849:929]

B:BD[15.849] → [15.849:929]

B:BD[15.929] → [14.1480:1757]

∅:D[14.1757] → [15.1172:1220]

B:BD[15.1172] → [15.1172:1220]

B:BD[15.1220] → [14.1758:2033]

∅:D[14.2033] → [15.1456:1471]

B:BD[15.1456] → [15.1456:1471]

             if (you.religion == GOD_BEOGH)
             {
                 const char* messages[3] = {
                     " fumes, \"This is no small sin, orc. Repent!\"",
                     " whispers, \"You will pay for this transgression.\"",
                     " rages, \"An eye for an eye...\""
                 };
                 simple_god_message(RANDOM_ELEMENT(messages), GOD_BEOGH);
             }
             else if (you.species == SP_HILL_ORC)
             {
                 const char* messages[2] = {
                     "Beogh's voice booms out: \"Heretic, die!\"",
                     "You hear Beogh's thundering voice: \"Suffer, infidel!\""
                 };
                 god_speaks(GOD_BEOGH, RANDOM_ELEMENT(messages));
             }
             else
             {
                 const char* messages[2] = {                
                   " is not amused about the destruction of his idols.",
                   " seems highly displeased."
                 };
                 simple_god_message(RANDOM_ELEMENT(messages), GOD_BEOGH);
             }

[13.928]

[13.1115]

            const char* messages[2] = {
                "Beogh's voice booms out: \"Heretic, die!\"",
                "You hear Beogh's thundering voice: \"Suffer, infidel!\""
            };

Replacement in crawl-ref/source/religion.cc at line 2804 [5.804403]

B:BD[13.1116] → [13.1116:1165]

             int divine_hurt = 10 + random2(10);

[13.1116]

[13.1165]

            revenge = RANDOM_ELEMENT(messages);
        }
        else
        {
            const char* messages[2] = {
                "Beogh is not amused about the destruction of his idols.",
                "Beogh seems highly displeased."
            };

Replacement in crawl-ref/source/religion.cc at line 2813 [5.804403]

B:BD[13.1166] → [13.1166:1272]

             for (int i = 0; i < 5; i++)
                 divine_hurt += random2( you.experience_level );

[13.1166]

[13.1272]

            revenge = RANDOM_ELEMENT(messages);
        }

Replacement in crawl-ref/source/religion.cc at line 2816 [5.804403]

B:BD[13.1273] → [15.1472:1596]

∅:D[15.1596] → [13.1399:1409]

B:BD[13.1399] → [13.1399:1409]

             simple_god_message( " smites you!", GOD_BEOGH );
             ouch( divine_hurt, 0, KILLED_BY_BEOGH_SMITING );
        }

[13.1273]

[14.2034]

        god_smites_you(GOD_BEOGH, KILLED_BY_BEOGH_SMITING, revenge);

Replacement in crawl-ref/source/religion.cc at line 2823 [5.804403]
B:BD[13.1587] → [13.1587:1592]
```
   }
```
[13.1587]
[2.400]
```
    }
```

Insertion in crawl-ref/source/religion.cc at line 3443 [5.804403]

[5.884353]

void god_smites_you(god_type god, kill_method_type death_type,
                    const char *message)
{
    // Your god won't protect you from his own smiting, and Xom is too
    // capricious to protect you from any god's smiting.
    if (you.religion != god && you.religion != GOD_XOM &&
        !player_under_penance() && you.piety > random2(400))
    {
        snprintf(info, INFO_SIZE, "Mortal, I have averted the wrath "
                       "of %s... this time.", god_name(god));
        god_speaks(you.religion, info);
    }
    else
    {
        // If there's a message, display it before smiting.
        if (message)
            god_speaks(god, message);
        int divine_hurt = 10 + random2(10);
        for (int i = 0; i < 5; i++)
            divine_hurt += random2( you.experience_level );
        simple_god_message( " smites you!", god );
        ouch( divine_hurt, 0, death_type );
        dec_penance( god, 1 );
    }
}