fiddlerwoaroof/crawl - Change 4ORX7M2SWZX3WEZWQ7JSFKKT64PTVWEJD4BP5A5UW67HB3PIXRGQC

Clean up handling of monsters' changing attitudes due to religion, and a

few other related bits.

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

Created by dolorous on June 16, 2008

4ORX7M2SWZX3WEZWQ7JSFKKT64PTVWEJD4BP5A5UW67HB3PIXRGQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 801 [8.16817]

B:BD[6.41] → [7.8:61]

        && !(monster->flags & MF_ATT_CHANGE_ATTEMPT)

[6.41]

[5.7]

        && !testbits(monster->flags, MF_ATT_CHANGE_ATTEMPT)

Replacement in crawl-ref/source/view.cc at line 836 [8.16817]

B:BD[6.172] → [7.96:149]

        && !(monster->flags & MF_ATT_CHANGE_ATTEMPT)

[6.172]

[9.358]

        && !testbits(monster->flags, MF_ATT_CHANGE_ATTEMPT)

Replacement in crawl-ref/source/religion.cc at line 4106 [8.804403]

B:BD[10.6002] → [11.3156:3199]

            if (is_good_god(you.religion))

[10.6002]

[10.6162]

            // If you worship a good god, you get another chance to make
            // neutral and hostile holy beings good neutral.
            if (is_good_god(you.religion) && !mons_wont_attack(monster))

Replacement in crawl-ref/source/religion.cc at line 4110 [8.804403]

B:BD[10.6176] → [12.2893:2965]

B:BD[12.2965] → [11.3200:3258]

∅:D[12.3018] → [13.2565:2683]

∅:D[11.3258] → [13.2565:2683]

B:BD[10.6176] → [13.2565:2683]

                // If you worship a good god, you get another chance to
                // make hostile holy beings good neutral.
                if (monster->attitude == ATT_HOSTILE &&
                    (monster->flags & MF_ATT_CHANGE_ATTEMPT))

[10.6176]

[10.6291]

                if (!testbits(monster->flags, MF_ATT_CHANGE_ATTEMPT)

Replacement in crawl-ref/source/religion.cc at line 4117 [8.804403]

B:BD[10.6437] → [11.3259:3417]

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

[10.6437]

[10.6594]

            // If you don't worship a good god, you make all friendly
            // and good neutral holy beings hostile.
            else if (!is_good_god(you.religion) && mons_wont_attack(monster))

Replacement in crawl-ref/source/religion.cc at line 4121 [8.804403]

B:BD[10.6608] → [14.2528:2635]

∅:D[14.2635] → [10.6719:6790]

∅:D[15.3606] → [10.6719:6790]

B:BD[10.6719] → [10.6719:6790]

B:BD[10.6790] → [14.2636:2693]

∅:D[14.2693] → [16.2509:2574]

B:BD[10.6790] → [16.2509:2574]

B:BD[16.2574] → [2.2523:2589]

                if (monster->attitude != ATT_HOSTILE
                    || monster->has_ench(ENCH_CHARM))
                {
                    monster->attitude = ATT_HOSTILE;
                    monster->del_ench(ENCH_CHARM, true);
                    behaviour_event(monster, ME_ALERT, MHITYOU);
                    // for now CREATED_FRIENDLY/WAS_NEUTRAL stays

[10.6608]

[17.3567]

                monster->attitude = ATT_HOSTILE;
                monster->del_ench(ENCH_CHARM, true);
                behaviour_event(monster, ME_ALERT, MHITYOU);
                // for now CREATED_FRIENDLY/WAS_NEUTRAL stays

Replacement in crawl-ref/source/religion.cc at line 4126 [8.804403]

B:BD[17.3568] → [17.3568:3622]

                    success = true;
                }

[17.3568]

[17.3622]

                success = true;

Replacement in crawl-ref/source/religion.cc at line 4156 [8.804403]

B:BD[11.4078] → [11.4078:4121]

            if (is_good_god(you.religion))

[11.4078]

[11.4121]

            // If you worship a good god, you make all friendly and good
            // neutral evil and unholy beings hostile.
            if (is_good_god(you.religion) && mons_wont_attack(monster))

Replacement in crawl-ref/source/religion.cc at line 4160 [8.804403]

B:BD[11.4135] → [11.4135:4257]

B:BD[11.4257] → [14.2694:2801]

∅:D[14.2801] → [11.4311:4382]

B:BD[11.4311] → [11.4311:4382]

B:BD[11.4382] → [14.2802:2859]

∅:D[14.2859] → [11.4382:4513]

B:BD[11.4382] → [11.4382:4513]

                // If you worship a good god, you make all non-hostile
                // evil and unholy beings hostile.
                if (monster->attitude != ATT_HOSTILE
                    || monster->has_ench(ENCH_CHARM))
                {
                    monster->attitude = ATT_HOSTILE;
                    monster->del_ench(ENCH_CHARM, true);
                    behaviour_event(monster, ME_ALERT, MHITYOU);
                    // for now CREATED_FRIENDLY/WAS_NEUTRAL stays

[11.4135]

[11.4513]

                monster->attitude = ATT_HOSTILE;
                monster->del_ench(ENCH_CHARM, true);
                behaviour_event(monster, ME_ALERT, MHITYOU);
                // for now CREATED_FRIENDLY/WAS_NEUTRAL stays

Replacement in crawl-ref/source/religion.cc at line 4165 [8.804403]

B:BD[11.4514] → [11.4514:4568]

                    success = true;
                }

[11.4514]

[11.4568]

                success = true;

Replacement in crawl-ref/source/religion.cc at line 4197 [8.804403]

B:BD[3.3380] → [3.3380:3425]

            if (is_lawful_god(you.religion))

[3.3380]

[3.3425]

            if (is_lawful_god(you.religion) && mons_wont_attack(monster))

Replacement in crawl-ref/source/religion.cc at line 4199 [8.804403]

B:BD[3.3439] → [3.3439:3805]

                if (monster->attitude != ATT_HOSTILE
                    || monster->has_ench(ENCH_CHARM))
                {
                    monster->attitude = ATT_HOSTILE;
                    monster->del_ench(ENCH_CHARM, true);
                    behaviour_event(monster, ME_ALERT, MHITYOU);
                    // for now CREATED_FRIENDLY/WAS_NEUTRAL stays

[3.3439]

[3.3805]

                monster->attitude = ATT_HOSTILE;
                monster->del_ench(ENCH_CHARM, true);
                behaviour_event(monster, ME_ALERT, MHITYOU);
                // for now CREATED_FRIENDLY/WAS_NEUTRAL stays

Replacement in crawl-ref/source/religion.cc at line 4204 [8.804403]

B:BD[3.3806] → [3.3806:3860]

                    success = true;
                }

[3.3806]

[3.3860]

                success = true;

Replacement in crawl-ref/source/religion.cc at line 4236 [8.804403]

B:BD[18.3170] → [18.3170:3212]

            if (you.religion == GOD_TROG)

[18.3170]

[18.3212]

            if (you.religion == GOD_TROG && mons_wont_attack(monster))

Replacement in crawl-ref/source/religion.cc at line 4238 [8.804403]

B:BD[18.3226] → [18.3226:3592]

                if (monster->attitude != ATT_HOSTILE
                    || monster->has_ench(ENCH_CHARM))
                {
                    monster->attitude = ATT_HOSTILE;
                    monster->del_ench(ENCH_CHARM, true);
                    behaviour_event(monster, ME_ALERT, MHITYOU);
                    // for now CREATED_FRIENDLY/WAS_NEUTRAL stays

[18.3226]

[18.3592]

                monster->attitude = ATT_HOSTILE;
                monster->del_ench(ENCH_CHARM, true);
                behaviour_event(monster, ME_ALERT, MHITYOU);
                // for now CREATED_FRIENDLY/WAS_NEUTRAL stays

Replacement in crawl-ref/source/religion.cc at line 4243 [8.804403]

B:BD[18.3593] → [18.3593:3647]

                    success = true;
                }

[18.3593]

[18.3647]

                success = true;

Replacement in crawl-ref/source/monplace.cc at line 2026 [8.1641732]
B:BD[19.3541] → [20.2572:2597]
```
    const bool is_holy =
```
[19.3541]
[20.2597]
```
    const bool isHoly =
```
Replacement in crawl-ref/source/monplace.cc at line 2028 [8.1641732]
B:BD[20.2665] → [20.2665:2692]
```
    const bool is_unholy =
```
[20.2665]
[20.2692]
```
    const bool isUnholy =
```
Replacement in crawl-ref/source/monplace.cc at line 2030 [8.1641732]
B:BD[20.2750] → [3.5171:5198]
```
    const bool is_lawful =
```
[20.2750]
[3.5198]
```
    const bool isLawful =
```
Replacement in crawl-ref/source/monplace.cc at line 2032 [8.1641732]
∅:D[3.5261] → [20.2750:2782]
B:BD[20.2750] → [20.2750:2782]
```
    const bool is_antimagical =
```
[3.5261]
[20.2782]
```
    const bool isAntimagical =
```
Replacement in crawl-ref/source/monplace.cc at line 2036 [8.1641732]
B:BD[20.2860] → [20.2860:2885]
```
        *holy = is_holy;
```
[20.2860]
[19.3632]
```
        *holy = isHoly;
```
Replacement in crawl-ref/source/monplace.cc at line 2038 [8.1641732]
B:BD[19.3648] → [20.2886:2915]
```
        *unholy = is_unholy;
```
[19.3648]
[3.5262]
```
        *unholy = isUnholy;
```
Replacement in crawl-ref/source/monplace.cc at line 2040 [8.1641732]
B:BD[3.5278] → [3.5278:5307]
```
        *lawful = is_lawful;
```
[3.5278]
[19.3717]
```
        *lawful = isLawful;
```
Replacement in crawl-ref/source/monplace.cc at line 2042 [8.1641732]
B:BD[19.3738] → [20.2916:2955]
```
        *antimagical = is_antimagical;
```
[19.3738]
[19.3816]
```
        *antimagical = isAntimagical;
```

Replacement in crawl-ref/source/monplace.cc at line 2044 [8.1641732]

B:BD[19.3817] → [4.2572:2638]

    return (is_holy || is_unholy || is_lawful || is_antimagical);

[19.3817]

[19.3861]

    return (isHoly || isUnholy || isLawful || isAntimagical);

Replacement in crawl-ref/source/monplace.cc at line 2055 [8.1641732]

B:BD[21.5280] → [3.5326:5405]

    if (player_will_anger_monster(mon, &holy, &unholy, &lawful, &antimagical))

[21.5280]

[22.494]

    if (player_will_anger_monster(mon, &holy, &unholy, &lawful, &antimagical)
        && mons_wont_attack(mon))

Replacement in crawl-ref/source/monplace.cc at line 2058 [8.1641732]

∅:D[23.2621] → [19.4034:4105]

B:BD[22.500] → [19.4034:4105]

∅:D[14.3086] → [22.549:559]

∅:D[24.3141] → [22.549:559]

∅:D[19.4105] → [22.549:559]

B:BD[22.549] → [22.549:559]

B:BD[22.559] → [24.3142:3183]

B:BD[24.3183] → [14.3087:3126]

∅:D[14.3126] → [24.3183:3236]

B:BD[24.3183] → [24.3183:3236]

        if (mon->attitude != ATT_HOSTILE || mon->has_ench(ENCH_CHARM))
        {
            mon->attitude = ATT_HOSTILE;
            mon->del_ench(ENCH_CHARM);
            behaviour_event(mon, ME_ALERT, MHITYOU);

[22.500]

[25.2695]

        mon->attitude = ATT_HOSTILE;
        mon->del_ench(ENCH_CHARM);
        behaviour_event(mon, ME_ALERT, MHITYOU);

Replacement in crawl-ref/source/monplace.cc at line 2062 [8.1641732]

∅:D[25.2696] → [24.3236:3309]

B:BD[24.3236] → [24.3236:3309]

∅:D[24.3309] → [22.712:726]

B:BD[22.712] → [22.712:726]

B:BD[22.726] → [26.2572:2611]

            if (see_grid(mon->x, mon->y) && player_monster_visible(mon))
            {
                std::string aura = "";

[25.2696]

[24.3344]

        if (see_grid(mon.pos()) && player_monster_visible(mon))
        {
            std::string aura = "";

Replacement in crawl-ref/source/monplace.cc at line 2066 [8.1641732]

B:BD[24.3345] → [26.2612:2743]

B:BD[26.2743] → [3.5406:5476]

∅:D[27.2797] → [26.2743:2824]

∅:D[3.5476] → [26.2743:2824]

B:BD[26.2743] → [26.2743:2824]

                if (holy)
                    aura = "holy";
                else if (unholy)
                    aura = "unholy";
                else if (lawful)
                    aura = "lawful";
                else if (antimagical)
                    aura = "anti-magical";

[24.3345]

[24.3582]

            if (holy)
                aura = "holy";
            else if (unholy)
                aura = "unholy";
            else if (lawful)
                aura = "lawful";
            else if (antimagical)
                aura = "anti-magical";

Replacement in crawl-ref/source/monplace.cc at line 2075 [8.1641732]

B:BD[24.3583] → [24.3583:3707]

∅:D[28.254] → [22.840:854]

∅:D[24.3707] → [22.840:854]

∅:D[29.5425] → [22.840:854]

B:BD[22.840] → [22.840:854]

                mprf("%s is enraged by your %s aura!",
                     mon->name(DESC_CAP_THE).c_str(), aura.c_str());
            }

[24.3583]

[22.854]

            mprf("%s is enraged by your %s aura!",
                 mon->name(DESC_CAP_THE).c_str(), aura.c_str());