fiddlerwoaroof/crawl - Change ONKB2ZZ2MWY7UGPBHW6EE4N3EEPJONPRRALEFZZR2YTZHNEIGV5AC

Some more code refactoring in god messages.

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

Created by haranp on April 4, 2007

ONKB2ZZ2MWY7UGPBHW6EE4N3EEPJONPRRALEFZZR2YTZHNEIGV5AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.h at line 31 [3.800304]
B:BD[3.803822] → [3.803822:803839]
```
void pray(void);
```
[3.803615]
[3.804048]
```
std::string god_prayer_reaction();
void pray();
```

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

[2.174]


std::string god_prayer_reaction()
{
    std::string result;
    result += god_name(you.religion);
    result += " is ";
    result +=
        (you.piety > 130) ? "exalted by your worship" :
        (you.piety > 100) ? "extremely pleased with you" :
        (you.piety >  70) ? "greatly pleased with you" :
        (you.piety >  40) ? "most pleased with you" :
        (you.piety >  20) ? "pleased with you" :
        (you.piety >   5) ? "noncommittal"
        : "displeased";

Replacement in crawl-ref/source/religion.cc at line 621 [3.804403]
B:BD[2.175] → [2.175:191]
```
void pray(void)
```
[2.175]
[2.191]
```
    result += ".";
    return result;
}
void pray()
```

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

B:BD[2.2349] → [2.2349:2425]

        strcpy(info, god_name(you.religion));
        strcat(info, " is ");

[2.2349]

[2.2425]

        mpr( god_prayer_reaction().c_str(), MSGCH_PRAY, you.religion );

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

B:BD[2.2426] → [2.2426:2954]

        strcat(info, (you.piety > 130) ? "exalted by your worship" :
                     (you.piety > 100) ? "extremely pleased with you" :
                     (you.piety >  70) ? "greatly pleased with you" :
                     (you.piety >  40) ? "most pleased with you" :
                     (you.piety >  20) ? "pleased with you" :
                     (you.piety >   5) ? "noncommittal"
                                       : "displeased");
        strcat(info, ".");
        mpr( info, MSGCH_PRAY, you.religion );

Replacement in crawl-ref/source/chardump.cc at line 552 [3.4100336]

B:BD[3.4110280] → [3.4110280:4110945]

            if (you.religion != GOD_XOM)
            {                   // Xom doesn't care
                text += god_name(you.religion);
                text += " is ";
                text += ((you.piety <= 5) ? "displeased" :
                         (you.piety <= 20) ? "noncommittal" :
                         (you.piety <= 40) ? "pleased with you" :
                         (you.piety <= 70) ? "most pleased with you" :
                         (you.piety <= 100) ? "greatly pleased with you" :
                         (you.piety <= 130) ? "extremely pleased with you"
                         : "exalted by your worship");
                text += ".";

[3.4110280]

[4.1215449]

            if (you.religion != GOD_XOM) // Xom doesn't care
            {
                text += god_prayer_reaction();