fiddlerwoaroof/crawl - Change ZVG6W2UMHJ3GHLF4ZVCUHZOOEUNJMWPURVBN2OQXKVTXYC4Z2LPQC

Clean up monster pacifying a bit: don't allow it to work for stationary

monsters, or for monsters that aren't holy, natural, undead, or demonic.

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

Created by dolorous on June 23, 2008

ZVG6W2UMHJ3GHLF4ZVCUHZOOEUNJMWPURVBN2OQXKVTXYC4Z2LPQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells1.cc at line 623 [6.616635]

[5.873]

    if (mons_is_stationary(mon)) // not able to leave the level
        return false;

Insertion in crawl-ref/source/spells1.cc at line 643 [6.616635]
[2.494]
[7.171]
```
    else if (holiness != MH_NATURAL)
        return false;
```

Deletion in crawl-ref/source/monstuff.cc at line 3301 [6.1396662]

B:BD[4.2876] → [4.2876:3051]

∅:D[4.3051] → [8.4347:4348]

B:BD[9.4615] → [8.4347:4348]

            // If the monster can't move (or at least teleport, as a
            // mimic can), get out.
            if (mons_is_truly_stationary(mon))
                break;

Replacement in crawl-ref/source/mon-util.h at line 483 [6.1682293]

B:BD[6.1692043] → [10.463631:463725]

mon_holy_type mons_class_holiness(int mclass);
mon_holy_type mons_holiness(const monsters *);

[6.1692043]

[6.1692074]

mon_holy_type mons_class_holiness(int mc);
mon_holy_type mons_holiness(const monsters *mon);

Replacement in crawl-ref/source/mon-util.h at line 665 [6.1682293]

∅:D[3.2750] → [11.2796:2838]

B:BD[12.2473] → [11.2796:2838]

∅:D[12.2473] → [10.464559:464645]

∅:D[11.2838] → [10.464559:464645]

B:BD[10.464559] → [10.464559:464645]

B:BD[10.464645] → [11.2839:2891]

bool mons_is_holy( const monsters *mon );
bool mons_is_evil( const monsters *mon );
bool mons_is_unholy( const monsters *mon );
bool mons_is_evil_or_unholy( const monsters *mon );

[12.2473]

[13.264]

bool mons_is_holy(const monsters *mon);
bool mons_is_evil(const monsters *mon);
bool mons_is_unholy(const monsters *mon);
bool mons_is_evil_or_unholy(const monsters *mon);

Replacement in crawl-ref/source/mon-util.h at line 671 [6.1682293]

∅:D[14.149] → [10.464645:464765]

B:BD[10.464645] → [10.464645:464765]

bool mons_has_lifeforce( const monsters *mon );
monster_type mons_genus( int mc );
monster_type mons_species( int mc );

[14.149]

[6.1699230]

bool mons_has_lifeforce(const monsters *mon);
monster_type mons_genus(int mc);
monster_type mons_species(int mc);

Replacement in crawl-ref/source/mon-util.h at line 679 [6.1682293]

B:BD[15.247560] → [10.464922:464988]

bool check_mons_resist_magic( const monsters *monster, int pow );

[15.247560]

[10.464988]

bool check_mons_resist_magic(const monsters *monster, int pow);

Deletion in crawl-ref/source/mon-util.h at line 685 [6.1682293]
B:BD[13.465] → [9.5401:5453]
```
bool mons_is_truly_stationary(const monsters *mon);
```

Replacement in crawl-ref/source/mon-util.cc at line 377 [6.1699344]

B:BD[16.402] → [16.402:497]

    if ( mon->type != MONS_ABOMINATION_SMALL
         && mon->type != MONS_ABOMINATION_LARGE )

[16.402]

[16.497]

    if (mon->type != MONS_ABOMINATION_SMALL
        && mon->type != MONS_ABOMINATION_LARGE)

Replacement in crawl-ref/source/mon-util.cc at line 404 [6.1699344]

B:BD[17.2706] → [18.2574:2625]

B:BD[18.2625] → [19.2632:2689]

            && mons_class_holiness(mc) != MH_PLANT
            && mons_class_holiness(mc) != MH_NONLIVING);

[17.2706]

[20.11332]

            && mons_class_holiness(mc) != MH_NONLIVING
            && mons_class_holiness(mc) != MH_PLANT);

Deletion in crawl-ref/source/mon-util.cc at line 428 [6.1699344]

B:BD[9.5458] → [9.5458:5697]

∅:D[9.5697] → [21.2905:2908]

B:BD[21.2905] → [21.2905:2908]

// Mimics can teleport, so they're not truly stationary.
// XXX: There should be a more generic way to check for this!
bool mons_is_truly_stationary(const monsters *mon)
{
    return (mons_is_stationary(mon) && !mons_is_mimic(mon->type));
}

Replacement in crawl-ref/source/mon-util.cc at line 567 [6.1699344]
∅:D[19.2885] → [6.1704373:1704428]
∅:D[10.470667] → [6.1704373:1704428]
B:BD[6.1704373] → [6.1704373:1704428]
```
        && (isdigit( show_char ) || show_char == '&'))
```
[19.2885]
[6.1704428]
```
        && (isdigit(show_char) || show_char == '&'))
```
Replacement in crawl-ref/source/mon-util.cc at line 1001 [6.1699344]
B:BD[6.1711077] → [10.471971:472015]
```
bool mons_res_asphyx( const monsters *mon )
```
[6.1711077]
[10.472015]
```
bool mons_res_asphyx(const monsters *mon)
```
Replacement in crawl-ref/source/mon-util.cc at line 1003 [6.1699344]
B:BD[10.472017] → [22.4240:4297]
```
    const mon_holy_type holiness = mons_holiness( mon );
```
[10.472017]
[22.4297]
```
    const mon_holy_type holiness = mons_holiness(mon);
```
Replacement in crawl-ref/source/mon-util.cc at line 1176 [6.1699344]
B:BD[6.1715098] → [22.4377:4434]
```
    const mon_holy_type holiness = mons_holiness( mon );
```
[6.1715098]
[6.1715098]
```
    const mon_holy_type holiness = mons_holiness(mon);
```
Replacement in crawl-ref/source/mon-util.cc at line 1219 [6.1699344]
∅:D[3.2853] → [11.2893:2934]
B:BD[10.473056] → [11.2893:2934]
```
bool mons_is_holy( const monsters *mon )
```
[10.473056]
[11.2934]
```
bool mons_is_holy(const monsters *mon)
```
Replacement in crawl-ref/source/mon-util.cc at line 1221 [6.1699344]
B:BD[11.2936] → [11.2936:2982]
```
    return (mons_holiness( mon ) == MH_HOLY);
```
[11.2936]
[11.2982]
```
    return (mons_holiness(mon) == MH_HOLY);
```
Replacement in crawl-ref/source/mon-util.cc at line 1224 [6.1699344]
∅:D[11.2985] → [10.473056:473097]
B:BD[10.473056] → [10.473056:473097]
```
bool mons_is_evil( const monsters *mon )
```
[11.2985]
[10.473097]
```
bool mons_is_evil(const monsters *mon)
```
Replacement in crawl-ref/source/mon-util.cc at line 1226 [6.1699344]
B:BD[10.473099] → [10.473099:473150]
```
    return (mons_class_flag( mon->type, M_EVIL ));
```
[10.473099]
[10.473150]
```
    return (mons_class_flag(mon->type, M_EVIL));
```
Replacement in crawl-ref/source/mon-util.cc at line 1229 [6.1699344]
B:BD[10.473153] → [10.473153:473196]
```
bool mons_is_unholy( const monsters *mon )
```
[10.473153]
[10.473196]
```
bool mons_is_unholy(const monsters *mon)
```
Replacement in crawl-ref/source/mon-util.cc at line 1231 [6.1699344]
B:BD[10.473198] → [22.4532:4589]
```
    const mon_holy_type holiness = mons_holiness( mon );
```
[10.473198]
[22.4589]
```
    const mon_holy_type holiness = mons_holiness(mon);
```
Replacement in crawl-ref/source/mon-util.cc at line 1236 [6.1699344]
B:BD[10.473252] → [11.2986:3037]
```
bool mons_is_evil_or_unholy( const monsters *mon )
```
[10.473252]
[22.4707]
```
bool mons_is_evil_or_unholy(const monsters *mon)
```
Replacement in crawl-ref/source/mon-util.cc at line 1241 [6.1699344]
B:BD[10.473309] → [10.473309:473356]
```
bool mons_has_lifeforce( const monsters *mon )
```
[10.473309]
[10.473356]
```
bool mons_has_lifeforce(const monsters *mon)
```
Replacement in crawl-ref/source/mon-util.cc at line 1243 [6.1699344]
B:BD[10.473358] → [22.4767:4824]
```
    const mon_holy_type holiness = mons_holiness( mon );
```
[10.473358]
[10.473401]
```
    const mon_holy_type holiness = mons_holiness(mon);
```
Replacement in crawl-ref/source/delay.cc at line 60 [6.3963459]
B:BD[23.13651] → [23.13651:13702]
```
// (All results of Recite, plus friendly + stupid;
```
[23.13651]
[23.13702]
```
// (All results of Recite, plus stationary and friendly + stupid;
```
Insertion in crawl-ref/source/delay.cc at line 65 [6.3963459]
[24.2790]
[24.2790]
```
            || mons_is_stationary(mon)
```
Insertion in crawl-ref/source/delay.cc at line 95 [6.3963459]
[11.3267]
[25.3368]

Replacement in crawl-ref/source/delay.cc at line 97 [6.3963459]

B:BD[25.3397] → [25.3397:3515]

    {
        resist = 7 - random2(you.skills[SK_INVOCATIONS]);
        if (resist < 0)
            resist = 0;
    }

[25.3397]

[25.3515]

        resist = std::max(0, 7 - random2(you.skills[SK_INVOCATIONS]));

Deletion in crawl-ref/source/delay.cc at line 102 [6.3963459]
∅:D[11.3269] → [26.2642:2701]
B:BD[25.3581] → [26.2642:2701]
```
        // much lower chances at influencing undead/demons
```

Insertion in crawl-ref/source/delay.cc at line 106 [6.3963459]

[25.3704]

        else if (holiness != MH_NATURAL)
            return (0);

Replacement in crawl-ref/source/delay.cc at line 113 [6.3963459]
B:BD[24.3252] → [24.3252:3285]
```
        pow = random2avg(pow,2);
```
[24.3252]
[7.2779]
```
        pow = random2avg(pow, 2);
```
Replacement in crawl-ref/source/delay.cc at line 117 [6.3963459]
B:BD[27.4100] → [28.3095:3132]
```
        if (one_chance_in(resist+1))
```
[27.4100]
[28.3132]
```
        if (one_chance_in(resist + 1))
```

Clean up monster pacifying a bit: don't allow it to work for stationary

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spells1.cc at line 623 [6.616635]

Insertion in crawl-ref/source/spells1.cc at line 643 [6.616635]

Deletion in crawl-ref/source/monstuff.cc at line 3301 [6.1396662]

Replacement in crawl-ref/source/mon-util.h at line 483 [6.1682293]

Replacement in crawl-ref/source/mon-util.h at line 665 [6.1682293]

Replacement in crawl-ref/source/mon-util.h at line 671 [6.1682293]

Replacement in crawl-ref/source/mon-util.h at line 679 [6.1682293]

Deletion in crawl-ref/source/mon-util.h at line 685 [6.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 377 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 404 [6.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 428 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 567 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1001 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1003 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1176 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1219 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1221 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1224 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1226 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1229 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1231 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1236 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1241 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1243 [6.1699344]

Replacement in crawl-ref/source/delay.cc at line 60 [6.3963459]

Insertion in crawl-ref/source/delay.cc at line 65 [6.3963459]

Insertion in crawl-ref/source/delay.cc at line 95 [6.3963459]

Replacement in crawl-ref/source/delay.cc at line 97 [6.3963459]

Deletion in crawl-ref/source/delay.cc at line 102 [6.3963459]

Insertion in crawl-ref/source/delay.cc at line 106 [6.3963459]

Replacement in crawl-ref/source/delay.cc at line 113 [6.3963459]

Replacement in crawl-ref/source/delay.cc at line 117 [6.3963459]