fiddlerwoaroof/crawl - Change BWHU47MJ7KAVKMKMRBVYLOHUCASSNVCGPC3SPMNBAC7DLI6XX2YQC

Abandoning Beogh will now make all your orcish followers on all levels

desert you, as opposed to just the ones around you.

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

Created by dolorous on January 8, 2008

BWHU47MJ7KAVKMKMRBVYLOHUCASSNVCGPC3SPMNBAC7DLI6XX2YQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 45 [5.804403]
[5.805435]
[5.805435]
```
#include "files.h"
```
Replacement in crawl-ref/source/religion.cc at line 363 [5.804403]
B:BD[5.806513] → [6.162:212]
```
static bool followers_abandon_you(void); // Beogh
```
[5.806513]
[3.827]
```
static bool beogh_followers_abandon_you(void);
```

Replacement in crawl-ref/source/religion.cc at line 2421 [5.804403]

B:BD[7.12857] → [8.286:352]

        if (you.religion == GOD_BEOGH && followers_abandon_you())

[7.12857]

[7.12895]

        if (you.religion == GOD_BEOGH && beogh_followers_abandon_you())

Replacement in crawl-ref/source/religion.cc at line 2670 [5.804403]

B:BD[9.14820] → [9.14820:14895]

B:BD[9.14895] → [6.1566:1595]

// upon excommunication, (now ex) Beogh adepts lose their orcish followers
bool followers_abandon_you()

[9.14820]

[9.14923]

static void orcish_followers_on_level_abandon_you()

Replacement in crawl-ref/source/religion.cc at line 2672 [5.804403]

B:BD[9.14925] → [6.1596:1844]

    int ystart = you.y_pos - 9, xstart = you.x_pos - 9;
    int yend = you.y_pos + 9, xend = you.x_pos + 9;
    if ( xstart < 0 ) xstart = 0;
    if ( ystart < 0 ) ystart = 0;
    if ( xend >= GXM ) xend = GXM;
    if ( ystart >= GYM ) yend = GYM;

[9.14925]

[4.2505]

    for ( int i = 0; i < MAX_MONSTERS; ++i )
    {
        monsters *monster = &menv[i];
        if (monster->type != -1
            && mons_species(monster->type) == MONS_ORC
            && monster->attitude == ATT_FRIENDLY
            && (monster->flags & MF_CONVERT_ATTEMPT))
        {
#ifdef DEBUG_DIAGNOSTICS
            mprf(MSGCH_DIAGNOSTICS, "Abandoning: %s on level %d, branch %d",
                 monster->name(DESC_PLAIN).c_str(),
                 static_cast<int>(you.your_level),
                 static_cast<int>(you.where_are_you));
#endif
            monster->attitude = ATT_HOSTILE;
            monster->behaviour = BEH_HOSTILE;
            // for now CREATED_FRIENDLY stays
        }
    }
}

Insertion in crawl-ref/source/religion.cc at line 2694 [5.804403]

[4.2506]

[6.1845]

// Upon excommunication, ex-Beoghites lose all their orcish followers.
// When under penance, Beoghites can lose all orcish followers in sight,
// subject to a few limitations.
static bool beogh_followers_abandon_you()
{

Replacement in crawl-ref/source/religion.cc at line 2703 [5.804403]

B:BD[6.1968] → [6.1968:2031]

    // monster check
    for ( int y = ystart; y < yend; ++y )

[5.877147]

[6.2031]

    if (you.religion != GOD_BEOGH)
        apply_to_all_dungeons(orcish_followers_on_level_abandon_you);
    else

Replacement in crawl-ref/source/religion.cc at line 2707 [5.804403]

B:BD[6.2037] → [6.2037:2083]

        for ( int x = xstart; x < xend; ++x )

[6.2037]

[6.2083]

        int ystart = you.y_pos - 9, xstart = you.x_pos - 9;
        int yend = you.y_pos + 9, xend = you.x_pos + 9;
        if ( xstart < 0 ) xstart = 0;
        if ( ystart < 0 ) ystart = 0;
        if ( xend >= GXM ) xend = GXM;
        if ( ystart >= GYM ) yend = GYM;
        // monster check
        for ( int y = ystart; y < yend; ++y )

Replacement in crawl-ref/source/religion.cc at line 2717 [5.804403]

B:BD[6.2093] → [10.330:388]

∅:D[10.388] → [6.2150:2195]

B:BD[6.2150] → [6.2150:2195]

            const unsigned short targ_monst = mgrd[x][y];
            if ( targ_monst != NON_MONSTER )

[6.2093]

[6.2195]

            for ( int x = xstart; x < xend; ++x )

Replacement in crawl-ref/source/religion.cc at line 2719 [5.804403]

B:BD[6.2209] → [6.2209:2446]

                monsters *monster = &menv[targ_monst];
                if ( mons_species(monster->type) == MONS_ORC
                     && monster->attitude == ATT_FRIENDLY
                     && (monster->flags & MF_CONVERT_ATTEMPT))

[6.2209]

[6.2446]

                const unsigned short targ_monst = mgrd[x][y];
                if ( targ_monst != NON_MONSTER )

Replacement in crawl-ref/source/religion.cc at line 2722 [5.804403]

B:BD[6.2464] → [6.2464:2501]

B:BD[6.2501] → [4.2507:2508]

∅:D[4.2508] → [6.2502:2665]

B:BD[11.813] → [6.2502:2665]

                    num_followers++;
                    if (mons_player_visible(monster)
                        && !mons_is_confused(monster)
                        && !mons_is_paralysed(monster))

[6.2464]

[6.2665]

                    monsters *monster = &menv[targ_monst];
                    if (mons_species(monster->type) == MONS_ORC
                        && monster->attitude == ATT_FRIENDLY
                        && (monster->flags & MF_CONVERT_ATTEMPT))

Replacement in crawl-ref/source/religion.cc at line 2727 [5.804403]

B:BD[6.2687] → [8.353:411]

                        const int hd = monster->hit_dice;

[6.2687]

[8.411]

                        num_followers++;

Replacement in crawl-ref/source/religion.cc at line 2729 [5.804403]

B:BD[8.412] → [8.412:483]

B:BD[8.483] → [2.172:306]

∅:D[2.306] → [8.560:689]

B:BD[8.560] → [8.560:689]

                        // during penance followers get a saving throw
                        if (you.religion == GOD_BEOGH &&
                            random2((you.piety-you.penance[GOD_BEOGH])/18) +
                            random2(you.skills[SK_INVOCATIONS]-6)
                              > random2(hd) + hd + random2(5))

[8.412]

[8.689]

                        if (mons_player_visible(monster)
                            && !mons_is_confused(monster)
                            && !mons_is_paralysed(monster)
                            && !mons_is_caught(monster))

Replacement in crawl-ref/source/religion.cc at line 2734 [5.804403]

B:BD[8.715] → [8.715:778]

                           continue;
                        }

[8.715]

[8.778]

                            const int hd = monster->hit_dice;
                            // during penance followers get a saving throw
                            if (random2((you.piety-you.penance[GOD_BEOGH])/18) +
                                random2(you.skills[SK_INVOCATIONS]-6)
                                  > random2(hd) + hd + random2(5))
                            {
                                continue;
                            }
                            monster->attitude = ATT_HOSTILE;
                            monster->behaviour = BEH_HOSTILE;
                            // for now CREATED_FRIENDLY stays

Replacement in crawl-ref/source/religion.cc at line 2748 [5.804403]

∅:D[8.779] → [9.15991:16164]

∅:D[6.2687] → [9.15991:16164]

B:BD[9.15991] → [9.15991:16164]

                        monster->attitude = ATT_HOSTILE;
                        monster->behaviour = BEH_HOSTILE;
                        // for now CREATED_FRIENDLY stays

[8.779]

[9.16164]

                            if (player_monster_visible(monster))
                                num_reconvert++; // only visible ones

Replacement in crawl-ref/source/religion.cc at line 2751 [5.804403]

B:BD[9.16165] → [9.16165:16252]

B:BD[9.16252] → [6.2688:2754]

                        if (player_monster_visible(monster))
                        {
                            num_reconvert++; // only visible ones

[9.16165]

[9.16317]

                            reconvert = true;

Deletion in crawl-ref/source/religion.cc at line 2753 [5.804403]
B:BD[9.16343] → [9.16343:16385]
```
                        reconvert = true;
```
Insertion in crawl-ref/source/religion.cc at line 2763 [5.804403]
[12.546]
[9.16677]
```
        std::ostream& chan = msg::streams(MSGCH_MONSTER_ENCHANT);
```

Replacement in crawl-ref/source/religion.cc at line 2766 [5.804403]

B:BD[9.16678] → [9.16678:16709]

        if (num_reconvert > 0)

[9.16678]

[9.16709]

        if (you.religion != GOD_BEOGH)
            chan << "All of your followers decide to abandon you.";
        else if (num_reconvert > 0)

Deletion in crawl-ref/source/religion.cc at line 2770 [5.804403]
B:BD[9.16719] → [6.3037:3107]
```
            std::ostream& chan = msg::streams(MSGCH_MONSTER_ENCHANT);
```
Insertion in crawl-ref/source/religion.cc at line 2780 [5.804403]
[6.3496]
[6.3496]
```
        }
```
Replacement in crawl-ref/source/religion.cc at line 2782 [5.804403]
B:BD[6.3497] → [6.3497:3528]
```
            chan << std::endl;
```
[6.3497]
[4.2509]
```
        chan << std::endl;
```
Replacement in crawl-ref/source/religion.cc at line 2784 [5.804403]
∅:D[4.2510] → [6.3541:3566]
B:BD[6.3541] → [6.3541:3566]
∅:D[6.3566] → [9.16947:16957]
B:BD[9.16947] → [9.16947:16957]
```
            return true;
        }
```
[4.2510]
[6.3567]
```
        return true;
```
Insertion in crawl-ref/source/religion.cc at line 2786 [5.804403]
[6.3573]
[6.3573]

Replacement in crawl-ref/source/religion.cc at line 2790 [5.804403]

B:BD[13.348] → [14.911:978]

// Destroying orcish idols (a.k.a. idols of Beogh) may anger Beogh

[13.348]

[13.418]

// Destroying orcish idols (a.k.a. idols of Beogh) may anger Beogh.

Replacement in crawl-ref/source/religion.cc at line 3008 [5.804403]

B:BD[9.17077] → [9.17077:17154]

        followers_abandon_you(); // check if friendly orcs around -> hostile

[9.17077]

[15.866]

        beogh_followers_abandon_you(); // friendly orcs around turn hostile