fiddlerwoaroof/crawl - Change 3NFVCXRVGHN2CHLLWFZES5RBS4R2BCDS4EEQNSDCFYIFQWQK7MUQC

[1644522] Sif Muna now does gifts on piety gain, not only when praying. Sif

Munites need not pray at all now.

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

Created by dshaligram on March 10, 2007

3NFVCXRVGHN2CHLLWFZES5RBS4R2BCDS4EEQNSDCFYIFQWQK7MUQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 370 [5.804403]
∅:D[4.1408] → [5.807508:807524]
B:BD[5.807508] → [5.807508:807524]
```
void pray(void)
```
[4.1408]
[5.807524]
```
static void do_god_gift()
```

Deletion in crawl-ref/source/religion.cc at line 372 [5.804403]

B:BD[5.807560] → [5.807560:807802]

B:BD[5.807802] → [6.172622:172651]

∅:D[6.172651] → [5.807828:807864]

B:BD[5.807828] → [5.807828:807864]

B:BD[5.807864] → [3.66:136]

∅:D[3.136] → [5.807928:807964]

B:BD[5.807928] → [5.807928:807964]

B:BD[5.807964] → [3.137:207]

∅:D[3.207] → [5.808063:808219]

B:BD[5.808063] → [5.808063:808219]

B:BD[5.808219] → [3.208:272]

∅:D[3.272] → [5.808271:808502]

B:BD[5.808271] → [5.808271:808502]

B:BD[5.808502] → [6.172652:172683]

B:BD[6.172683] → [2.45:119]

∅:D[2.119] → [5.808521:809415]

∅:D[6.172683] → [5.808521:809415]

B:BD[5.808521] → [5.808521:809415]

B:BD[5.809415] → [6.172684:172711]

∅:D[6.172711] → [5.809430:810219]

B:BD[5.809430] → [5.809430:810219]

B:BD[5.810219] → [6.172712:172759]

∅:D[6.172759] → [5.810259:810538]

B:BD[5.810259] → [5.810259:810538]

    unsigned char  was_praying = you.duration[DUR_PRAYER];
    bool           success = false;
    if (silenced(you.x_pos, you.y_pos))
    {
        mpr("You are unable to make a sound!");
        return;
    }
    // all prayers take time
    you.turn_is_over = true;
    if (you.religion != GOD_NO_GOD
        && grid_altar_god(grd[you.x_pos][you.y_pos]) == you.religion)
    {
        altar_prayer();
    }
    else if (grid_altar_god(grd[you.x_pos][you.y_pos]) != GOD_NO_GOD)
    {
        if (you.species == SP_DEMIGOD)
        {
            mpr("Sorry, a being of your status cannot worship here.");
            return;
        }
        god_pitch( grid_altar_god(grd[you.x_pos][you.y_pos]) );
        return;
    }
    if (you.religion == GOD_NO_GOD)
    {
        strcpy(info, "You spend a moment contemplating the meaning of ");
        if (you.is_undead)
            strcat(info, "un");
        strcat(info, "life.");
        mpr(info, MSGCH_PRAY);
        // Zen meditation is timeless.
        you.turn_is_over = false;
        return;
    }
    else if (you.religion == GOD_XOM)
    {
        if (one_chance_in(100))
        {
            // Every now and then, Xom listens
            // This is for flavour, not effect, so praying should not be
            // encouraged.
            // Xom is nicer to experienced players
            bool nice = (27 <= random2( 27 + you.experience_level ));
            // and he's not very nice even then
            int sever = (nice) ? random2( random2( you.experience_level ) )
                               : you.experience_level;
            // bad results are enforced, good are not
            bool force = !nice;
            Xom_acts( nice, 1 + sever, force );
        }
        else
            mpr("Xom ignores you.");
        return;
    }
    strcpy( info, "You offer a prayer to " );
    strcat( info, god_name( you.religion ) );
    strcat( info, "." );
    mpr(info, MSGCH_PRAY);
    you.duration[DUR_PRAYER] = 9 + (random2(you.piety) / 20)
                                            + (random2(you.piety) / 20);
    if (player_under_penance())
        simple_god_message(" demands penance!");
    else
    {
        strcpy(info, god_name(you.religion));
        strcat(info, " is ");
        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 );
        if (you.piety > 130)
            you.duration[DUR_PRAYER] *= 3;
        else if (you.piety > 70)
            you.duration[DUR_PRAYER] *= 2;
    }
#if DEBUG_DIAGNOSTICS
    snprintf( info, INFO_SIZE, "piety: %d", you.piety );
    mpr( info, MSGCH_DIAGNOSTICS );
#endif

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

B:BD[5.810639] → [5.810639:810712]

    if (!you.penance[you.religion] && !you.gift_timeout && !was_praying)

[5.810639]

[5.810712]

    if (!you.penance[you.religion] && !you.gift_timeout)

Insertion in crawl-ref/source/religion.cc at line 376 [5.804403]
[5.810718]
[5.810718]
```
        bool success = false;
        
```

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

[5.818105]

}
void pray(void)
{
    unsigned char  was_praying = you.duration[DUR_PRAYER];
    if (silenced(you.x_pos, you.y_pos))
    {
        mpr("You are unable to make a sound!");
        return;
    }
    // all prayers take time
    you.turn_is_over = true;
    if (you.religion != GOD_NO_GOD
        && grid_altar_god(grd[you.x_pos][you.y_pos]) == you.religion)
    {
        altar_prayer();
    }
    else if (grid_altar_god(grd[you.x_pos][you.y_pos]) != GOD_NO_GOD)
    {
        if (you.species == SP_DEMIGOD)
        {
            mpr("Sorry, a being of your status cannot worship here.");
            return;
        }
        god_pitch( grid_altar_god(grd[you.x_pos][you.y_pos]) );
        return;
    }
    if (you.religion == GOD_NO_GOD)
    {
        strcpy(info, "You spend a moment contemplating the meaning of ");
        if (you.is_undead)
            strcat(info, "un");
        strcat(info, "life.");
        mpr(info, MSGCH_PRAY);
        // Zen meditation is timeless.
        you.turn_is_over = false;
        return;
    }
    else if (you.religion == GOD_XOM)
    {
        if (one_chance_in(100))
        {
            // Every now and then, Xom listens
            // This is for flavour, not effect, so praying should not be
            // encouraged.
            // Xom is nicer to experienced players
            bool nice = (27 <= random2( 27 + you.experience_level ));
            // and he's not very nice even then
            int sever = (nice) ? random2( random2( you.experience_level ) )
                               : you.experience_level;
            // bad results are enforced, good are not
            bool force = !nice;
            Xom_acts( nice, 1 + sever, force );
        }
        else
            mpr("Xom ignores you.");
        return;
    }
    strcpy( info, "You offer a prayer to " );
    strcat( info, god_name( you.religion ) );
    strcat( info, "." );
    mpr(info, MSGCH_PRAY);
    you.duration[DUR_PRAYER] = 9 + (random2(you.piety) / 20)
                                            + (random2(you.piety) / 20);
    if (player_under_penance())
        simple_god_message(" demands penance!");
    else
    {
        strcpy(info, god_name(you.religion));
        strcat(info, " is ");
        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 );
        if (you.piety > 130)
            you.duration[DUR_PRAYER] *= 3;
        else if (you.piety > 70)
            you.duration[DUR_PRAYER] *= 2;
    }
#if DEBUG_DIAGNOSTICS
    snprintf( info, INFO_SIZE, "piety: %d", you.piety );
    mpr( info, MSGCH_DIAGNOSTICS );
#endif
    if (!was_praying)
        do_god_gift();

Insertion in crawl-ref/source/religion.cc at line 1668 [5.804403]
[6.191649]
[7.5267]
```
    if (you.religion == GOD_SIF_MUNA)
        do_god_gift();
```