fiddlerwoaroof/crawl - Change RIIO4BI64ECFXSRLBP3RA24QOPYXJVWMSFHLNTKUZS5YCLISLVJQC

Expand follower blessing code to potentially allow for more than just

healing. Also add a routine to promote ordinary monsters to priests, mostly based on code in monster_polymorph(), and (rarely) use it as a blessing.

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

Created by dolorous on March 20, 2008

RIIO4BI64ECFXSRLBP3RA24QOPYXJVWMSFHLNTKUZS5YCLISLVJQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 756 [4.804403]

[3.4333]

[2.2604]


static bool promote_to_priest(monsters* mon)
{
    monster_type priest_type = MONS_PROGRAM_BUG;
    // Possible promotions.
    if (mon->type == MONS_ORC)
        priest_type = MONS_ORC_PRIEST;

Insertion in crawl-ref/source/religion.cc at line 765 [4.804403]

[2.2605]

    if (priest_type != MONS_PROGRAM_BUG)
    {
        // Turn an ordinary monster into a priestly monster, preserving
        // important characteristics.  Keep this as generic as possible,
        // in case more promotions are added.
        const unsigned long old_flags = mon->flags;
        const int old_hp = mon->hit_points;
        const int old_hp_max = mon->max_hit_points;
        const char old_ench_countdown = mon->ench_countdown;
        mon_enchant abj = mon->get_ench(ENCH_ABJ);
        mon_enchant shifter = mon->get_ench(ENCH_GLOWING_SHAPESHIFTER,
                                            ENCH_SHAPESHIFTER);
        const bool old_mon_caught = mons_is_caught(mon);
        mon->type = priest_type;
        define_monster(monster_index(mon));
        mon->flags = old_flags;
        mon->hit_points = mon->max_hit_points *
            ((old_hp * 100) / old_hp_max) / 100;
        mon->ench_countdown = old_ench_countdown;
        mon->add_ench(abj);
        mon->add_ench(shifter);
        if (old_mon_caught)
            mon->add_ench(ENCH_HELD);
        if (mons_class_flag(mon->type, M_INVIS))
            mon->add_ench(ENCH_INVIS);
        mon->fix_speed();
        return true;
    }
    return false;
}

Replacement in crawl-ref/source/religion.cc at line 807 [4.804403]

B:BD[2.2816] → [2.2816:2886]

    monsters* mon = (monster != NON_MONSTER) ? &menv[monster] : NULL;

[2.2816]

[2.2886]


    if (monster == NON_MONSTER)
        return;

Replacement in crawl-ref/source/religion.cc at line 811 [4.804403]

B:BD[2.2887] → [2.2887:2900]

    if (mon)

[2.2887]

[2.2900]

    monsters* mon = &menv[monster];
    const char *blessed = mon->name(DESC_NOCAP_A).c_str();
    const char *result = NULL;
    switch (random2(100))

Replacement in crawl-ref/source/religion.cc at line 817 [4.804403]

B:BD[2.2906] → [2.2906:2992]

∅:D[2.2992] → [5.1741:1742]

∅:D[3.4333] → [5.1741:1742]

B:BD[5.1741] → [5.1741:1742]

B:BD[5.1742] → [2.2993:3083]

        const char *result;
        bool healing = false;
        bool vigour = true;
        // Full healing.
        healing = heal_monster(mon, mon->max_hit_points, false);

[2.2906]

[2.3083]

        // 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.

Replacement in crawl-ref/source/religion.cc at line 831 [4.804403]

B:BD[2.3084] → [2.3084:3120]

        if (!healing || coinflip())

[2.3084]

[2.3120]

        // 95% chance: full healing.
        default:

Replacement in crawl-ref/source/religion.cc at line 834 [4.804403]

B:BD[2.3130] → [2.3130:3243]

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

[2.3130]

[2.3243]

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

Replacement in crawl-ref/source/religion.cc at line 839 [4.804403]

B:BD[2.3244] → [2.3244:3335]

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

[2.3244]

[2.3335]

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

Replacement in crawl-ref/source/religion.cc at line 844 [4.804403]

B:BD[2.3398] → [2.3398:3435]

            vigour = true;
        }

[2.3398]

[2.3435]

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

Replacement in crawl-ref/source/religion.cc at line 848 [4.804403]

B:BD[2.3436] → [2.3436:3624]

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

[2.3436]

[2.3624]

                vigour = true;
            }

Replacement in crawl-ref/source/religion.cc at line 851 [4.804403]

B:BD[2.3625] → [2.3625:3752]

        mprf(MSGCH_GOD, "%s blesses %s with %s.", god_name(god).c_str(),
            mon->name(DESC_NOCAP_A).c_str(), result);

[2.3625]

[2.3752]

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

Insertion in crawl-ref/source/religion.cc at line 861 [4.804403]

[2.3758]


    mprf(MSGCH_GOD, "%s blesses %s with %s.", god_name(god).c_str(),
        blessed, result);