fiddlerwoaroof/crawl - Change 6INGHIA3J7XER4L7OZHGU4RR3QTRWISMXHD3AZQK6MQ3VDADBVAAC

Simplify follower blessing code again.

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

Created by dolorous on March 20, 2008

6INGHIA3J7XER4L7OZHGU4RR3QTRWISMXHD3AZQK6MQ3VDADBVAAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 789 [3.804403]
B:BD[2.4090] → [2.4090:4121]
```
    const char *result = NULL;
```
[2.4090]
[2.4121]
```
    const char *result;
```

Replacement in crawl-ref/source/religion.cc at line 791 [3.804403]

B:BD[2.4122] → [2.4122:4148]

    switch (random2(100))

[2.4122]

[4.2900]

    // 5% chance: Turn a monster into a priestly monster, if possible.
    // This is currently only used for Beogh.
    if (god == GOD_BEOGH && one_chance_in(20) && promote_to_priest(mon))
        result = "priesthood";
    // 95% chance: full healing.
    else

Replacement in crawl-ref/source/religion.cc at line 798 [3.804403]

B:BD[4.2906] → [2.4149:4545]

        // 5% chance: Turn a monster into a priestly monster, if
        // possible.  This is currently only used for Beogh.
        case 0:
        case 1:
        case 2:
        case 3:
        case 4:
            if (god == GOD_BEOGH && promote_to_priest(mon))
            {
                result = "priesthood";
                break;
            }
            // Deliberate fall through.

[4.2906]

[4.3083]

        bool healing = false;
        bool vigour = true;

Replacement in crawl-ref/source/religion.cc at line 801 [3.804403]

B:BD[4.3084] → [2.4546:4600]

        // 95% chance: full healing.
        default:

[4.3084]

[4.3120]

        healing = heal_monster(mon, mon->max_hit_points, false);
        if (!healing || coinflip())

Replacement in crawl-ref/source/religion.cc at line 805 [3.804403]

B:BD[4.3130] → [2.4601:4737]

            bool healing = false;
            bool vigour = true;
            healing = heal_monster(mon, mon->max_hit_points, false);

[4.3130]

[4.3243]

            // Full healing, plus one added hit point.
            heal_monster(mon, mon->max_hit_points, true);

Replacement in crawl-ref/source/religion.cc at line 808 [3.804403]

B:BD[4.3244] → [2.4738:4851]

            if (!healing || coinflip())
            {
                // Full healing, plus one added hit point.

[4.3244]

[4.3335]

            if (coinflip())
                // Full healing, plus another added hit point.

Replacement in crawl-ref/source/religion.cc at line 812 [3.804403]

B:BD[4.3398] → [2.4852:5017]

                if (coinflip())
                    // Full healing, plus another added hit point.
                    heal_monster(mon, mon->max_hit_points, true);

[4.3398]

[4.3435]

            vigour = true;
        }

Replacement in crawl-ref/source/religion.cc at line 815 [3.804403]

B:BD[4.3436] → [2.5018:5063]

∅:D[2.5063] → [4.3624:3625]

B:BD[4.3624] → [4.3624:3625]

B:BD[4.3625] → [2.5064:5306]

                vigour = true;
            }
            if (healing && vigour)
                result = "healing and extra vigour";
            else if (healing)
                result = "healing";
            else
                result = "extra vigour";
            break;
        }

[4.3436]

[4.3752]

        if (healing && vigour)
            result = "healing and extra vigour";
        else if (healing)
            result = "healing";
        else
            result = "extra vigour";