fiddlerwoaroof/crawl - Change Q43MQU7TM5O6KH73LBF4BRM6NVOKJC224DLOPVK54QVU46LAD5WQC

Preserve a monster's god and god gift status when applicable, and

discard them otherwise (when the form the monster is polymorphed into angers its god, or when the monster is a Beoghite orc and is polymorphed into a non-orc).

Note that Beoghite orcs polymorphed into non-orcs will still remain friendly if they were friendly before and the force_beh parameter in monster_polymorph() isn't set, but they will no longer count as gifts of Beogh, meaning that Beogh will no longer accept their kills.

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

Created by dolorous on May 6, 2009

Q43MQU7TM5O6KH73LBF4BRM6NVOKJC224DLOPVK54QVU46LAD5WQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1970 [3.1396662]

B:BD[3.1426313] → [4.2775:2848]

                return (simple_monster_message( monster, " shudders."));

[3.1426313]

[3.1426387]

                return (simple_monster_message(monster, " shudders."));

Replacement in crawl-ref/source/monstuff.cc at line 1978 [3.1396662]

∅:D[4.2950] → [5.204:285]

∅:D[6.4735] → [5.204:285]

B:BD[7.623] → [5.204:285]

        return simple_monster_message(monster, " looks momentarily different.");

[4.2950]

[2.2896]

    {
        return (simple_monster_message(monster,
                                       " looks momentarily different."));
    }

Insertion in crawl-ref/source/monstuff.cc at line 2041 [3.1396662]

[8.4542]

    god_type god =
        (player_will_anger_monster(targetc)
            || (you.religion == GOD_BEOGH
                && mons_species(targetc) != MONS_ORC)) ? GOD_NO_GOD
                                                       : monster->god;
    if (god == GOD_NO_GOD)
        flags &= ~MF_GOD_GIFT;

Replacement in crawl-ref/source/monstuff.cc at line 2077 [3.1396662]

∅:D[8.5150] → [9.5167:5269]

B:BD[3.1427436] → [9.5167:5269]

∅:D[10.2694] → [11.2894:2951]

∅:D[9.5269] → [11.2894:2951]

B:BD[11.2894] → [11.2894:2951]

    const int  old_hp     = monster->hit_points;
    const int  old_hp_max = monster->max_hit_points;
    const bool old_mon_caught = mons_is_caught(monster);

[8.5150]

[11.2951]

    const int  old_hp             = monster->hit_points;
    const int  old_hp_max         = monster->max_hit_points;
    const bool old_mon_caught     = mons_is_caught(monster);

Replacement in crawl-ref/source/monstuff.cc at line 2095 [3.1396662]

∅:D[8.5292] → [11.3299:3415]

B:BD[12.2784] → [11.3299:3415]

    // Note: define_monster() will clear out all enchantments! -- bwr
    define_monster( monster_index(monster) );

[8.5292]

[3.1427805]

    // Note: define_monster() will clear out all enchantments! - bwr
    define_monster(monster_index(monster));

Insertion in crawl-ref/source/monstuff.cc at line 2099 [3.1396662]
[8.5321]
[8.5321]
```
    monster->god   = god;
```