fiddlerwoaroof/crawl - Change NNQPJEMQAJC6V45OOHEX7OA54DE5IEQI73SJTS5O6PPU3KMHF4WQC

Add various god gift-related cleanups.

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

Created by dolorous on June 18, 2008

NNQPJEMQAJC6V45OOHEX7OA54DE5IEQI73SJTS5O6PPU3KMHF4WQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.h at line 113 [6.800304]

[4.2593]

[5.2528]

void mons_make_god_gift(monsters *mon, god_type god = you.religion);
bool mons_is_god_gift(const monsters *mon, god_type god = you.religion);

Insertion in crawl-ref/source/religion.cc at line 1070 [6.804403]

[7.3164]

[8.2722]

}
void mons_make_god_gift(monsters *mon, god_type god)
{
    mon->god = god;
}
bool mons_is_god_gift(const monsters *mon, god_type god)
{
    return (mon->god == god);

Replacement in crawl-ref/source/religion.cc at line 1333 [6.804403]
B:BD[9.2698] → [10.11545:11577]
```
    mon->god = GOD_SHINING_ONE;
```
[9.2698]
[11.2631]
```
    mons_make_god_gift(mon, GOD_SHINING_ONE);
```

Insertion in crawl-ref/source/religion.cc at line 2163 [6.804403]

[6.836720]

[12.181816]

    if (you.religion == GOD_NO_GOD || you.religion == GOD_XOM)
        return (false);

Deletion in crawl-ref/source/religion.cc at line 2170 [6.804403]
B:BD[12.181886] → [12.181886:181973]
∅:D[12.181973] → [6.836772:836773]
B:BD[6.836772] → [6.836772:836773]
```
    if (you.religion == GOD_NO_GOD || you.religion == GOD_XOM)
        return (false);
```
Replacement in crawl-ref/source/religion.cc at line 4672 [6.804403]
B:BD[10.12685] → [10.12685:12711]
```
    orc->god = GOD_BEOGH;
```
[10.12685]
[13.2511]
```
    mons_make_god_gift(orc, GOD_BEOGH);
```
Replacement in crawl-ref/source/monplace.cc at line 1887 [6.1641732]
B:BD[6.1674021] → [10.13838:13866]
```
    creation->god = mg.god;
```
[6.1674021]
[14.5499]
```
    mons_make_god_gift(creation, mg.god);
```
Deletion in crawl-ref/source/mon-util.h at line 650 [6.1682293]
∅:D[3.5316] → [15.3662:3735]
B:BD[16.6082] → [15.3662:3735]
```
bool mons_is_god_gift(const monsters *mon, god_type god = you.religion);
```
Deletion in crawl-ref/source/mon-util.cc at line 500 [6.1699344]
B:BD[12.470176] → [15.3737:3794]
∅:D[15.3794] → [10.13957:13959]
B:BD[10.13957] → [10.13957:13959]
B:BD[10.13959] → [15.3795:3877]
∅:D[15.3877] → [10.13996:13999]
B:BD[10.13996] → [10.13996:13999]
```
bool mons_is_god_gift(const monsters *mon, god_type god)
{
    if (god == GOD_NO_GOD)
        return (false);
    return (mon->god == god);
}
```

Replacement in crawl-ref/source/mon-util.cc at line 5276 [6.1699344]

B:BD[17.2819] → [18.9663:9692]

B:BD[18.9692] → [10.14000:14068]

        // Just for flavour.
        if (mons_is_god_gift(this) && this->has_ench(ENCH_BERSERK))

[17.2819]

[19.1629]

        if (this->has_ench(ENCH_BERSERK))

Replacement in crawl-ref/source/mon-util.cc at line 5279 [6.1699344]

B:BD[20.345] → [10.14069:14138]

        monster_die( this, quiet ? KILL_DISMISSED : KILL_RESET, 0 );

[20.345]

[21.17033]

        monster_die(this, quiet ? KILL_DISMISSED : KILL_RESET, 0);

Replacement in crawl-ref/source/decks.cc at line 2490 [6.3987460]

B:BD[22.1337] → [22.1337:1396]

            if ( monster->hit_dice * 35 < random2(power) )

[22.1337]

[22.1396]

            if (monster->hit_dice * 35 < random2(power))

Replacement in crawl-ref/source/decks.cc at line 2492 [6.3987460]

B:BD[22.1410] → [2.2685:2725]

                bool converted = false;

[22.1410]

[2.2725]

                simple_monster_message(monster, " is converted.");

Replacement in crawl-ref/source/decks.cc at line 2494 [6.3987460]
∅:D[2.2726] → [22.1477:1531]
B:BD[22.1477] → [22.1477:1531]
```
                if ( one_chance_in(5 - power_level) )
```
[2.2726]
[23.2660]
```
                if (one_chance_in(5 - power_level))
```

Replacement in crawl-ref/source/decks.cc at line 2496 [6.3987460]

B:BD[23.2678] → [23.2678:2924]

                    if (you.religion == GOD_BEOGH &&
                        mons_species(monster->type) == MONS_ORC)
                    {
                        beogh_convert_orc(monster, false);
                    }
                    else

[23.2678]

[2.2727]

                    monster->attitude = ATT_FRIENDLY;
                    // If you worship a god that lets you recruit
                    // permanent followers, count this as a recruitment.
                    if (you.religion == GOD_SHINING_ONE
                        || you.religion == GOD_BEOGH
                            && mons_species(monster->type) == MONS_ORC)

Replacement in crawl-ref/source/decks.cc at line 2504 [6.3987460]

∅:D[2.2749] → [23.2924:2982]

B:BD[23.2924] → [23.2924:2982]

B:BD[23.2982] → [2.2750:2792]

                        monster->attitude = ATT_FRIENDLY;
                        converted = true;

[2.2749]

[2.2792]

                        mons_make_god_gift(monster);

Deletion in crawl-ref/source/decks.cc at line 2508 [6.3987460]
B:BD[22.1606] → [2.2815:2833]
```
                {
```

Deletion in crawl-ref/source/decks.cc at line 2509 [6.3987460]

B:BD[22.1657] → [2.2834:2993]

                    converted = true;
                }
                if (converted)
                    simple_monster_message(monster, " is converted.");

Add various god gift-related cleanups.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/religion.h at line 113 [6.800304]

Insertion in crawl-ref/source/religion.cc at line 1070 [6.804403]

Replacement in crawl-ref/source/religion.cc at line 1333 [6.804403]

Insertion in crawl-ref/source/religion.cc at line 2163 [6.804403]

Deletion in crawl-ref/source/religion.cc at line 2170 [6.804403]

Replacement in crawl-ref/source/religion.cc at line 4672 [6.804403]

Replacement in crawl-ref/source/monplace.cc at line 1887 [6.1641732]

Deletion in crawl-ref/source/mon-util.h at line 650 [6.1682293]

Deletion in crawl-ref/source/mon-util.cc at line 500 [6.1699344]