fiddlerwoaroof/crawl - Change QLPGRCREJNAFOO4BZL55ERZALMWNGE4UUF2GBIWDVP33YN56IIAQC

Fix [2748638]: Try to pacify monsters before healing them instead of

afterward. Also, do the pacification check only once and use the result both times instead of doing the pacification check twice, as it has a random factor.

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

Created by dolorous on April 18, 2009

QLPGRCREJNAFOO4BZL55ERZALMWNGE4UUF2GBIWDVP33YN56IIAQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells1.cc at line 732 [4.616635]
[4.626752]
[5.177]
```
    const bool can_pacify = _can_pacify_monster(monster, healed);
```
Replacement in crawl-ref/source/spells1.cc at line 738 [4.616635]
B:BD[6.943] → [6.943:993]
```
        && !_can_pacify_monster(monster, healed))
```
[6.943]
[7.2227]
```
        && !can_pacify)
```
Deletion in crawl-ref/source/spells1.cc at line 745 [4.616635]
∅:D[6.1047] → [4.626780:626832]
∅:D[7.2333] → [4.626780:626832]
B:BD[4.626780] → [4.626780:626832]
B:BD[4.626832] → [6.1048:1078]
∅:D[6.1078] → [8.1206:1275]
B:BD[4.626832] → [8.1206:1275]
∅:D[8.1275] → [4.626973:627034]
∅:D[9.1363] → [4.626973:627034]
∅:D[10.7584] → [4.626973:627034]
B:BD[4.626973] → [4.626973:627034]
B:BD[4.627034] → [11.245:316]
∅:D[11.316] → [4.627107:627120]
B:BD[4.627107] → [4.627107:627120]
B:BD[4.627120] → [12.788:823]
∅:D[12.823] → [5.179:180]
B:BD[7.2344] → [5.179:180]
B:BD[5.180] → [3.279:348]
∅:D[3.348] → [7.2422:2432]
∅:D[13.390] → [7.2422:2432]
B:BD[7.2422] → [7.2422:2432]
B:BD[7.2432] → [13.391:508]
∅:D[13.508] → [7.2514:2579]
∅:D[6.1195] → [7.2514:2579]
B:BD[7.2514] → [7.2514:2579]
∅:D[14.405] → [15.655:665]
∅:D[7.2601] → [15.655:665]
B:BD[15.655] → [15.655:665]
∅:D[15.665] → [4.627155:627161]
∅:D[7.2635] → [4.627155:627161]
B:BD[4.627155] → [4.627155:627161]
```
    if (heal_monster(monster, healed, false))
    {
        did_something = true;
        mprf("You heal %s.", monster->name(DESC_NOCAP_THE).c_str());
        if (monster->hit_points == monster->max_hit_points)
            simple_monster_message(monster, " is completely healed.");
        else
            print_wounds(monster);
        if (you.religion == GOD_ELYVILON && !_mons_hostile(monster))
        {
            simple_god_message(" appreciates your healing of a fellow "
                               "creature.");
            if (one_chance_in(8))
                gain_piety(1);
        }
    }
```
Replacement in crawl-ref/source/spells1.cc at line 747 [4.616635]
B:BD[3.386] → [3.386:434]
```
        && _can_pacify_monster(monster, healed)
```
[3.386]
[13.572]
```
        && can_pacify
```
Insertion in crawl-ref/source/spells1.cc at line 758 [4.616635]
[2.343]
[14.408]

Insertion in crawl-ref/source/spells1.cc at line 765 [4.616635]

[2.426]

[16.761]

        }
    }
    if (heal_monster(monster, healed, false))
    {
        did_something = true;
        mprf("You heal %s.", monster->name(DESC_NOCAP_THE).c_str());
        if (monster->hit_points == monster->max_hit_points)
            simple_monster_message(monster, " is completely healed.");
        else
            print_wounds(monster);
        if (you.religion == GOD_ELYVILON && !_mons_hostile(monster))
        {
            simple_god_message(" appreciates your healing of a fellow "
                               "creature.");
            if (one_chance_in(8))
                gain_piety(1);

Fix [2748638]: Try to pacify monsters before healing them instead of

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spells1.cc at line 732 [4.616635]

Replacement in crawl-ref/source/spells1.cc at line 738 [4.616635]

Deletion in crawl-ref/source/spells1.cc at line 745 [4.616635]

Replacement in crawl-ref/source/spells1.cc at line 747 [4.616635]

Insertion in crawl-ref/source/spells1.cc at line 758 [4.616635]

Insertion in crawl-ref/source/spells1.cc at line 765 [4.616635]