fiddlerwoaroof/crawl - Change 62CWUC7WKYRODVOOUFHRPDZXGTBUIU7XPR3EHJWESPG2XVUM7SDAC

Consolidate and clean up some of the blessing code.

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

Created by dolorous on March 28, 2008

62CWUC7WKYRODVOOUFHRPDZXGTBUIU7XPR3EHJWESPG2XVUM7SDAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/religion.h at line 74 [9.800304]

B:BD[7.2593] → [8.2508:2542]

B:BD[8.2542] → [10.2508:2615]

void bless_follower(god_type god,
                    bool (*suitable)(const monsters* mon),
                    monsters* follower = NULL);

Insertion in crawl-ref/source/religion.h at line 76 [9.800304]

[7.2639]

[11.397]

bool is_follower(const monsters* mon);
void bless_follower(monsters* follower = NULL,
                    god_type god = you.religion,
                    bool (*suitable)(const monsters* mon) = is_follower);

Insertion in crawl-ref/source/religion.cc at line 760 [9.804403]

[12.3164]

[13.2898]

}
bool is_tso_follower(const monsters* mon)
{
    // Don't check for evil or unholy allies here, as that's done
    // elsewhere.
    return (mon->alive()
        && (mon->attitude == ATT_FRIENDLY
            || mon->has_ench(ENCH_CHARM)));
}
bool is_orcish_follower(const monsters* mon)
{
    return (mon->alive() && mons_species(mon->type) == MONS_ORC
        && mon->attitude == ATT_FRIENDLY
        && (mon->flags & MF_GOD_GIFT));

Insertion in crawl-ref/source/religion.cc at line 777 [9.804403]
[13.2900]
[14.2606]
```
bool is_follower(const monsters* mon)
{
    bool result = false;
```

Insertion in crawl-ref/source/religion.cc at line 782 [9.804403]

[14.2607]

[15.2510]

    switch (you.religion)
    {
        case GOD_SHINING_ONE:
            result = is_tso_follower(mon);
            break;
        case GOD_BEOGH:
            result = is_orcish_follower(mon);
            break;
        default:
            break;
    }
    return result;
}

Replacement in crawl-ref/source/religion.cc at line 982 [9.804403]

∅:D[10.2665] → [8.2605:2639]

∅:D[16.2754] → [8.2605:2639]

∅:D[17.3117] → [8.2605:2639]

∅:D[5.3268] → [8.2605:2639]

∅:D[14.3944] → [8.2605:2639]

B:BD[8.2605] → [8.2605:2639]

B:BD[8.2639] → [10.2666:2765]

void bless_follower(god_type god,
                    bool (*suitable)(const monsters* mon),
                    monsters* follower)

[5.3268]

[8.2698]

void bless_follower(monsters* follower,
                    god_type god,
                    bool (*suitable)(const monsters* mon))

Deletion in crawl-ref/source/religion.cc at line 3839 [9.804403]

B:BD[11.3290] → [4.2556:2798]

∅:D[4.2798] → [7.2760:2807]

B:BD[11.3290] → [7.2760:2807]

B:BD[7.2807] → [18.2608:2672]

B:BD[18.2672] → [19.2509:2550]

B:BD[19.2550] → [2.2509:2549]

∅:D[2.2549] → [7.2898:2901]

∅:D[19.2594] → [7.2898:2901]

B:BD[7.2898] → [7.2898:2901]

bool is_tso_follower(const monsters* mon)
{
    // Don't check for evil or unholy allies here, as that's done
    // elsewhere.
    return (mon->alive()
        && (mon->attitude == ATT_FRIENDLY
            || mon->has_ench(ENCH_CHARM)));
}
bool is_orcish_follower(const monsters* mon)
{
    return (mon->alive() && mons_species(mon->type) == MONS_ORC
        && mon->attitude == ATT_FRIENDLY
        && (mon->flags & MF_GOD_GIFT));
}

Replacement in crawl-ref/source/monstuff.cc at line 403 [9.1396662]
∅:D[20.2589] → [21.525:591]
B:BD[21.525] → [21.525:591]
```
    monsters *mons = &menv[killer_index];
    if (!mons->alive())
```
[20.2589]
[21.591]
```
    monsters *mon = &menv[killer_index];
    if (!mon->alive())
```

Replacement in crawl-ref/source/monstuff.cc at line 407 [9.1396662]

B:BD[21.608] → [22.331:391]

    if ((!victim_was_born_friendly || !mons_friendly(mons))

[21.608]

[22.391]

    if ((!victim_was_born_friendly || !mons_friendly(mon))

Replacement in crawl-ref/source/monstuff.cc at line 410 [9.1396662]
B:BD[22.460] → [10.3404:3444]
```
        if (mons->gain_exp(experience))
```
[22.460]
[10.3444]
```
        if (mon->gain_exp(experience))
```

Replacement in crawl-ref/source/monstuff.cc at line 413 [9.1396662]

B:BD[23.2785] → [6.2545:2593]

            if (you.religion == GOD_SHINING_ONE

[23.2785]

[6.2593]

            if (((you.religion == GOD_SHINING_ONE
                && random2(you.piety) >= piety_breakpoint(0))
                    || (you.religion == GOD_BEOGH
                        && random2(you.piety) >= piety_breakpoint(2)))

Deletion in crawl-ref/source/monstuff.cc at line 418 [9.1396662]
B:BD[6.2636] → [6.2636:2697]
```
                && random2(you.piety) >= piety_breakpoint(0)
```

Replacement in crawl-ref/source/monstuff.cc at line 420 [9.1396662]

B:BD[6.2749] → [6.2749:2821]

                bless_follower(GOD_SHINING_ONE, is_tso_follower, mons);

[6.2749]

[6.2821]

                bless_follower(mon);

Deletion in crawl-ref/source/monstuff.cc at line 422 [9.1396662]
B:BD[6.2835] → [6.2835:2902]
∅:D[24.2778] → [10.3494:3536]
∅:D[23.2785] → [10.3494:3536]
∅:D[6.2902] → [10.3494:3536]
B:BD[10.3494] → [10.3494:3536]
B:BD[10.3536] → [25.2542:2585]
B:BD[25.2585] → [3.2542:2603]
∅:D[3.2603] → [26.2603:2641]
∅:D[27.2603] → [26.2603:2641]
B:BD[26.2603] → [26.2603:2641]
∅:D[26.2641] → [10.3650:3747]
∅:D[28.2656] → [10.3650:3747]
∅:D[24.2832] → [10.3650:3747]
∅:D[23.2848] → [10.3650:3747]
B:BD[10.3650] → [10.3650:3747]
```
            // Randomly bless the follower who gained experience.
            if (you.religion == GOD_BEOGH
                && !player_under_penance()
                && random2(you.piety) >= piety_breakpoint(2)
                && !one_chance_in(3))
            {
                bless_follower(GOD_BEOGH, is_orcish_follower, mons);
            }
```

Replacement in crawl-ref/source/monstuff.cc at line 890 [9.1396662]

B:BD[23.3184] → [23.3184:3247]

                bless_follower(GOD_BEOGH, is_orcish_follower);

[23.3184]

[9.1412138]

                bless_follower();

Replacement in crawl-ref/source/monstuff.cc at line 1020 [9.1396662]

B:BD[4.3145] → [4.3145:3224]

                        bless_follower(GOD_SHINING_ONE, is_tso_follower, mon);

[4.3145]

[23.3308]

                        bless_follower(mon);

Replacement in crawl-ref/source/monstuff.cc at line 1032 [9.1396662]

B:BD[23.3728] → [23.3728:3800]

                    bless_follower(GOD_BEOGH, is_orcish_follower, mon);

[23.3728]

[29.5525]

                    bless_follower(mon);