fiddlerwoaroof/crawl - Change 7O3C7BZXXFHJQQMLE636R26QJPETYRADNLVJWQDJYGWLQFEG2ISAC

Add still more miscellaneous minor fixes.

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

Created by dolorous on September 26, 2008

7O3C7BZXXFHJQQMLE636R26QJPETYRADNLVJWQDJYGWLQFEG2ISAC

Dependencies

In channels

main

Change contents

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

B:BD[5.815343] → [6.176543:176612]

                success = acquirement( OBJ_MISSILES, you.religion );

[5.815343]

[6.176612]

                success = acquirement(OBJ_MISSILES, you.religion);

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

B:BD[6.176659] → [6.176659:176729]

                    simple_god_message( " has granted you a gift!" );

[6.176659]

[6.176729]

                    simple_god_message(" has granted you a gift!");

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

B:BD[5.815813] → [7.6132:6193]

∅:D[7.6193] → [6.176818:176871]

B:BD[6.176818] → [6.176818:176871]

                    _inc_gift_timeout( 4 + roll_dice(2,4) );
                    you.num_gifts[ you.religion ]++;

[5.815813]

[6.176871]

                    _inc_gift_timeout(4 + roll_dice(2, 4));
                    you.num_gifts[you.religion]++;

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

B:BD[6.177095] → [3.4548:4614]

                int how_many = _random_servants(GOD_YREDELEMNUL);

[6.177095]

[8.397]

                int how_many = _random_servants(you.religion);

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

B:BD[9.4252] → [9.4252:4324]

                        you.pos(), 0, 0, true, GOD_SHINING_ONE)) != -1)

[9.4252]

[10.2594]

                        you.pos(), 0, 0, true, god)) != -1)

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

B:BD[9.4383] → [9.4383:4451]

                            you.pos(), 0, 0, true, GOD_ZIN)) != -1)

[9.4383]

[11.2952]

                            you.pos(), 0, 0, true, god)) != -1)

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

B:BD[12.4671] → [13.11841:11902]

                                             GOD_ZIN, true);

[12.4671]

[4.2864]

                                             god, true);

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

B:BD[14.3538] → [14.3538:3592]

            confuse_player( 3 + random2(10), false );

[14.3538]

[14.3592]

            confuse_player(3 + random2(10), false);

Replacement in crawl-ref/source/religion.cc at line 3565 [5.804403]
B:BD[14.3694] → [14.3694:3739]
```
            you.paralyse( 3 + random2(10) );
```
[14.3694]
[14.3739]
```
            you.paralyse(3 + random2(10));
```
Replacement in crawl-ref/source/religion.cc at line 3667 [5.804403]
B:BD[15.4466] → [15.4466:4516]
```
        confuse_player( 3 + random2(10), false );
```
[15.4466]
[15.4516]
```
        confuse_player(3 + random2(10), false);
```

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

B:BD[16.4626] → [9.4503:4579]

                               you.pos(), 0, 0, true, GOD_MAKHLEB)) != -1);

[16.4626]

[17.10409]

                               you.pos(), 0, 0, true, god)) != -1);

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

B:BD[17.10410] → [18.3284:3495]

        simple_god_message(success ?
                           " sends a greater servant after you!" :
                           "'s greater servant is unavoidably detained.",
                           god);

[17.10410]

[19.3297]

        simple_god_message(success ? " sends a greater servant after you!"
                                   : "'s greater servant is unavoidably "
                                     "detained.", god);

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

B:BD[20.15291] → [20.15291:15359]

                        you.pos(), 0, 0, true, GOD_MAKHLEB)) != -1)

[20.15291]

[17.10997]

                        you.pos(), 0, 0, true, god)) != -1)

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

B:BD[17.11134] → [17.11134:11283]

                           count > 0 ? " sends a minion to punish you." :
                                       "'s minions fail to arrive.", god);

[17.11134]

[21.1737]

                           count > 0 ? " sends a minion to punish you."
                                     : "'s minions fail to arrive.", god);

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

B:BD[9.4746] → [9.4746:4820]

                        you.pos(), 0, 0, true, GOD_KIKUBAAQUDGHA)) != -1)

[9.4746]

[17.11455]

                        you.pos(), 0, 0, true, god)) != -1)

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

B:BD[3.4908] → [3.4908:4970]

            count += _random_servants(GOD_YREDELEMNUL, true);

[3.4908]

[5.862988]

            count += _random_servants(god, true);

Replacement in crawl-ref/source/religion.cc at line 3795 [5.804403]
B:BD[19.6267] → [19.6267:6289]
```
    if ( coinflip() )
```
[5.865074]
[19.6289]
```
    if (coinflip())
```

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

B:BD[22.2602] → [22.2602:2645]

∅:D[22.2645] → [23.211:212]

B:BD[23.211] → [23.211:212]

B:BD[23.212] → [22.2646:2716]

                int cost = random2(8) + 3;
                if (cost > points)
                    cost = points;

[22.2602]

[19.6576]

                int cost = std::min(random2(8) + 3, points);

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

B:BD[23.411] → [13.12172:12237]

                if (summon_berserker(cost * 20, GOD_TROG, true))

[23.411]

[22.3007]

                if (summon_berserker(cost * 20, god, true))

Replacement in crawl-ref/source/religion.cc at line 3826 [5.804403]
B:BD[19.7653] → [19.7653:7687]
```
    else if ( !one_chance_in(3) )
```
[19.7653]
[19.7687]
```
    else if (!one_chance_in(3))
```

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

B:BD[19.7693] → [19.7693:7769]

        simple_god_message("'s voice booms out, \"Feel my wrath!\"", god );

[19.7693]

[19.7769]

        simple_god_message("'s voice booms out, \"Feel my wrath!\"", god);

Replacement in crawl-ref/source/religion.cc at line 3837 [5.804403]
B:BD[19.8083] → [19.8083:8128]
```
            potion_effect( POT_DECAY, 100 );
```
[19.8083]
[19.8128]
```
            potion_effect(POT_DECAY, 100);
```
Replacement in crawl-ref/source/religion.cc at line 3862 [5.804403]
B:BD[19.8765] → [19.8765:8801]
```
                slow_player( 100 );
```
[19.8765]
[19.8801]
```
                slow_player(100);
```

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

B:BD[19.9104] → [19.9104:9171]

B:BD[19.9171] → [24.67808:67951]

        mpr( "You feel Trog's fiery rage upon you!", MSGCH_WARN );
        MiscastEffect( &you, -god, SPTYP_FIRE, 8 + you.experience_level,
                       random2avg(98, 3), "the fiery rage of Trog" );

[19.9104]

[19.9310]

        mpr("You feel Trog's fiery rage upon you!", MSGCH_WARN);
        MiscastEffect(&you, -god, SPTYP_FIRE, 8 + you.experience_level,
                      random2avg(98, 3), "the fiery rage of Trog");

Replacement in crawl-ref/source/religion.cc at line 3927 [5.804403]
∅:D[25.2649] → [26.903:958]
∅:D[27.7354] → [26.903:958]
B:BD[26.903] → [26.903:958]
```
            set_ident_flags( item, ISFLAG_KNOW_TYPE );
```
[27.7354]
[5.868588]
```
            set_ident_flags(item, ISFLAG_KNOW_TYPE);
```

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

B:BD[9.5009] → [9.5009:5069]

                        you.pos(), 0, 0, true, GOD_BEOGH));

[9.5009]

[28.3237]

                        you.pos(), 0, 0, true, god));

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

B:BD[19.12857] → [7.7848:7921]

        if (you.religion == GOD_BEOGH && _beogh_followers_abandon_you())

[19.12857]

[19.12895]

        if (you.religion == god && _beogh_followers_abandon_you())

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

B:BD[9.5125] → [9.5125:5202]

                           you.pos(), 0, MG_PERMIT_BANDS, true, GOD_BEOGH));

[9.5125]

[5.869564]

                           you.pos(), 0, MG_PERMIT_BANDS, true, god));

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

B:BD[3.5079] → [3.5079:5133]

        count += _random_servants(GOD_OKAWARU, true);

[3.5079]

[5.870960]

        count += _random_servants(god, true);

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

B:BD[19.15557] → [29.3115:3188]

        lose_stat(STAT_INTELLIGENCE, 1 + random2( you.intel / 5 ), true,

[19.15557]

[29.3188]

        lose_stat(STAT_INTELLIGENCE, 1 + random2(you.intel / 5), true,

Replacement in crawl-ref/source/religion.cc at line 4039 [5.804403]
B:BD[19.15683] → [19.15683:15733]
```
        confuse_player( 3 + random2(10), false );
```
[19.15683]
[19.15733]
```
        confuse_player(3 + random2(10), false);
```
Replacement in crawl-ref/source/religion.cc at line 4050 [5.804403]
B:BD[19.15876] → [19.15876:15906]
```
        if (you.magic_points)
```
[19.15876]
[30.6687]
```
        if (you.magic_points > 0)
```

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

B:BD[30.6697] → [19.15907:16038]

            dec_mp( 100 );  // this should zero it.
            mpr( "You suddenly feel drained of magical energy!", MSGCH_WARN );

[30.6697]

[19.16038]

            dec_mp(100);  // This should zero it.
            mpr("You suddenly feel drained of magical energy!", MSGCH_WARN);

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

B:BD[19.16262] → [19.16262:16324]

        mpr( "You sense a dampening of magic.", MSGCH_WARN );

[19.16262]

[19.16324]

        mpr("You sense a dampening of magic.", MSGCH_WARN);

Deletion in crawl-ref/source/religion.cc at line 4078 [5.804403]
∅:D[4.3802] → [30.10675:10676]
∅:D[31.4993] → [30.10675:10676]
∅:D[19.16598] → [30.10675:10676]
∅:D[24.68201] → [30.10675:10676]
B:BD[30.10675] → [30.10675:10676]

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

B:BD[16.5303] → [9.5367:5442]

                               you.pos(), 0, 0, true, GOD_LUGONU)) != -1);

[16.5303]

[32.2583]

                               you.pos(), 0, 0, true, god)) != -1);

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

B:BD[16.5553] → [9.5486:5552]

                       you.pos(), 0, 0, true, GOD_LUGONU)) != -1)

[16.5553]

[5.873686]

                       you.pos(), 0, 0, true, god)) != -1)

Insertion in crawl-ref/source/religion.cc at line 4406 [5.804403]
[33.3894]
[33.3894]
Insertion in crawl-ref/source/religion.cc at line 4452 [5.804403]
[34.3303]
[34.3303]
Insertion in crawl-ref/source/religion.cc at line 4498 [5.804403]
[33.4990]
[33.4990]

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

B:BD[26.2037] → [2.39482:39541]

        for ( radius_iterator ri(you.pos(), 9); ri; ++ri )

[26.2037]

[2.39541]

        for (radius_iterator ri(you.pos(), 9); ri; ++ri)

Replacement in crawl-ref/source/religion.cc at line 4564 [5.804403]
B:BD[2.39551] → [2.39551:39595]
```
            if ( mgrd(*ri) == NON_MONSTER )
```
[2.39551]
[2.39595]
```
            if (mgrd(*ri) == NON_MONSTER)
```

Add still more miscellaneous minor fixes.

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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