fiddlerwoaroof/crawl - Change I2ZR5QRPQEDTO5V5ILIJUA5KIEOGJY3BRHRNPXS5BJG7GXTBXJSQC

Clean up handling of holy and evil beings' attitude changes, so that the

proper message is always displayed when they happen.

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

Created by dolorous on April 26, 2008

I2ZR5QRPQEDTO5V5ILIJUA5KIEOGJY3BRHRNPXS5BJG7GXTBXJSQC

Dependencies

In channels

main

Change contents

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

B:BD[3.806355] → [2.2523:2568]

static bool _moral_beings_attitude_change();

[3.806355]

[2.2568]

static bool _holy_beings_attitude_change();
static bool _evil_beings_attitude_change();

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

B:BD[4.5061] → [4.5061:5128]

            // another chance to make hostile holy beings neutral.

[4.5061]

[4.5128]

            // another chance to make hostile holy beings good neutral.

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

B:BD[4.5171] → [2.2881:2930]

                _moral_beings_attitude_change();

[4.5171]

[3.806726]

                _holy_beings_attitude_change();

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

B:BD[4.5285] → [4.5285:5334]

            // make hostile holy beings neutral.

[4.5285]

[4.5334]

            // make hostile holy beings good neutral.

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

B:BD[4.5377] → [2.7213:7262]

                _moral_beings_attitude_change();

[4.5377]

[3.848729]

                _holy_beings_attitude_change();

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

B:BD[5.4571] → [5.4571:4619]

        // to make hostile holy beings neutral.

[5.4571]

[5.4619]

        // to make hostile holy beings good neutral.

Replacement in crawl-ref/source/religion.cc at line 2527 [3.804403]
B:BD[5.4658] → [2.7263:7308]
```
            _moral_beings_attitude_change();
```
[5.4658]
[6.3095]
```
            _holy_beings_attitude_change();
```
Replacement in crawl-ref/source/religion.cc at line 3647 [3.804403]
B:BD[4.5465] → [2.9083:9136]
```
static bool _moral_beings_on_level_attitude_change()
```
[4.5465]
[4.5510]
```
static bool _holy_beings_on_level_attitude_change()
```

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

B:BD[4.5628] → [7.2750:2783]

        if (monster->type != -1)

[4.5628]

[4.5722]

        if (monster->type != -1
            && mons_is_holy(monster))

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

B:BD[4.5757] → [8.3244:3328]

            mprf(MSGCH_DIAGNOSTICS, "Attitude changing: %s on level %d, branch %d",

[4.5757]

[4.5836]

            mprf(MSGCH_DIAGNOSTICS, "Holy attitude changing: %s on level %d, branch %d",

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

B:BD[4.6002] → [9.2509:2577]

            if (mons_is_holy(monster) && is_good_god(you.religion))

[4.6002]

[4.6162]

            if (is_good_god(you.religion))

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

B:BD[7.2965] → [7.2965:3018]

                // make hostile holy beings neutral.

[7.2965]

[10.2565]

                // make hostile holy beings good neutral.

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

B:BD[4.6437] → [7.3019:3246]

B:BD[7.3246] → [9.2578:2680]

∅:D[9.2680] → [7.3364:3472]

B:BD[7.3364] → [7.3364:3472]

            // If you don't worship a good god, you make all
            // non-hostile holy beings hostile.  If you do worship a
            // good god, you make all non-hostile evil and unholy beings
            // hostile.
            else if ((mons_is_holy(monster) &&
                        !is_good_god(you.religion)) ||
                    (mons_is_evil_or_unholy(monster) &&
                        is_good_god(you.religion)))

[4.6437]

[4.6594]

            // If you don't worship a good god, you make all non-hostile
            // holy beings hostile.
            else if (!is_good_god(you.religion))

Replacement in crawl-ref/source/religion.cc at line 3695 [3.804403]
B:BD[11.3130] → [2.9137:9181]
```
static bool _moral_beings_attitude_change()
```
[11.3130]
[12.3716]
```
static bool _holy_beings_attitude_change()
```

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

B:BD[12.3718] → [2.9182:9256]

    return apply_to_all_dungeons(_moral_beings_on_level_attitude_change);

[12.3718]

[12.3790]

    return apply_to_all_dungeons(_holy_beings_on_level_attitude_change);
}
static bool _evil_beings_on_level_attitude_change()
{
    bool success = false;
    for ( int i = 0; i < MAX_MONSTERS; ++i )
    {
        monsters *monster = &menv[i];
        if (monster->type != -1
            && mons_is_evil_or_unholy(monster))
        {
#ifdef DEBUG_DIAGNOSTICS
            mprf(MSGCH_DIAGNOSTICS, "Evil attitude changing: %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
            if (is_good_god(you.religion))
            {
                // If you worship a good god, you make all non-hostile
                // evil and unholy beings hostile.
                if (monster->attitude != ATT_HOSTILE)
                {
                    monster->attitude = ATT_HOSTILE;
                    behaviour_event(monster, ME_ALERT, MHITYOU);
                    // for now CREATED_FRIENDLY/WAS_NEUTRAL stays
                    success = true;
                }
            }
        }
    }
    return success;
}
static bool _evil_beings_attitude_change()
{
    return apply_to_all_dungeons(_evil_beings_on_level_attitude_change);

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

B:BD[13.3013] → [13.3013:3090]

            mprf(MSGCH_DIAGNOSTICS, "Abandoning: %s on level %d, branch %d",

[13.3013]

[13.3090]

            mprf(MSGCH_DIAGNOSTICS, "Orc abandoning: %s on level %d, branch %d",

Replacement in crawl-ref/source/religion.cc at line 4275 [3.804403]
B:BD[14.4476] → [2.11181:11226]
```
        if (_moral_beings_attitude_change())
```
[14.4476]
[14.4519]
```
        if (_holy_beings_attitude_change())
```
Replacement in crawl-ref/source/religion.cc at line 4842 [3.804403]
B:BD[15.5446] → [2.12212:12257]
```
        if (_moral_beings_attitude_change())
```
[15.5446]
[12.3990]
```
        if (_evil_beings_attitude_change())
```