fiddlerwoaroof/crawl - Change BSAKBTGIAD3JFZPNLMEI6SOJ2XPT4EJNETZYBW2555ASJTZ2GEGQC

Simplify handling of monsters angered by the player, and expand it to

not allow Trog worshippers to have magic-using followers.

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

Created by dolorous on May 6, 2008

BSAKBTGIAD3JFZPNLMEI6SOJ2XPT4EJNETZYBW2555ASJTZ2GEGQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells4.cc at line 721 [8.436250]

B:BD[7.238] → [7.238:325]

        || (is_good_god(you.religion)
            && mons_is_evil_or_unholy(monster)))

[7.238]

[7.325]

        || player_angers_monster(monster, false))

Insertion in crawl-ref/source/spells2.cc at line 1410 [8.569242]

[5.261]

            // XXX: There should be a better way to do this, using
            // player_angers_monster().

Replacement in crawl-ref/source/monplace.h at line 263 [8.1638277]
∅:D[9.4906] → [10.155:198]
B:BD[8.1640285] → [10.155:198]
```
bool player_angers_monster(monsters *mon);
```
[9.4906]
[8.1640285]
```
bool player_angers_monster(monsters *mon, bool actual = true);
```
Replacement in crawl-ref/source/monplace.cc at line 1902 [8.1641732]
B:BD[10.203] → [10.203:250]
```
bool player_angers_monster(monsters *creation)
```
[10.203]
[10.250]
```
bool player_angers_monster(monsters *mon, bool actual)
```

Insertion in crawl-ref/source/monplace.cc at line 1904 [8.1641732]

[10.252]

    const bool holy = (is_good_god(you.religion) && mons_is_evil_or_unholy(mon));
    const bool antimagical = (you.religion == GOD_TROG && mons_is_magic_user(mon));

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

B:BD[10.298] → [10.298:333]

B:BD[10.333] → [3.2548:2619]

    // (to prevent demon-scumming)
    if (is_good_god(you.religion) && mons_is_evil_or_unholy(creation))

[10.298]

[10.494]

    // (to prevent e.g. demon-scumming)
    if (holy || antimagical)

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

B:BD[10.500] → [10.500:549]

        if ( creation->attitude != ATT_HOSTILE )

[10.500]

[10.549]

        if (actual && mon->attitude != ATT_HOSTILE)

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

B:BD[10.559] → [10.559:605]

B:BD[10.605] → [6.2572:2630]

∅:D[6.2630] → [10.605:712]

B:BD[10.605] → [10.605:712]

            creation->attitude = ATT_HOSTILE;
            behaviour_event(creation, ME_ALERT, MHITYOU);
            if ( see_grid(creation->x, creation->y)
                 && player_monster_visible(creation) )

[10.559]

[10.712]

            mon->attitude = ATT_HOSTILE;
            behaviour_event(mon, ME_ALERT, MHITYOU);
            if (see_grid(mon->x, mon->y) && player_monster_visible(mon))

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

B:BD[10.726] → [10.726:783]

B:BD[10.783] → [2.194:254]

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

[10.726]

[10.840]

                std::string aura;
                if (holy && antimagical)
                    aura = "holy, anti-magical";
                else if (holy)
                    aura = "holy";
                else if (antimagical)
                    aura = "anti-magical";
                mprf("%s is enraged by your %s aura!",
                     mon->name(DESC_CAP_THE).c_str(), aura.c_str());

Replacement in crawl-ref/source/decks.cc at line 2442 [8.3987460]

B:BD[4.61573] → [4.61573:61646]

                || (is_good_god(you.religion) && mons_is_evil(monster)))

[4.61573]

[11.2802]

                || player_angers_monster(monster, false))

Replacement in crawl-ref/source/beam.cc at line 2134 [8.4128068]

B:BD[8.4194778] → [12.2873:2947]

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

[8.4194778]

[13.6567]

        if (player_angers_monster(monster, false))

Replacement in crawl-ref/source/beam.cc at line 4302 [8.4128068]
B:BD[14.1251672] → [12.2948:2987]
```
        if (is_good_god(you.religion))
```
[14.1251672]
[13.6728]
```
        if (player_angers_monster(mon, false))
```
Replacement in crawl-ref/source/beam.cc at line 4334 [8.4128068]
B:BD[13.6931] → [12.3034:3073]
```
        if (is_good_god(you.religion))
```
[13.6931]
[13.6976]
```
        if (player_angers_monster(mon, false))
```