fiddlerwoaroof/crawl - Change A2SAU7YL5ZS4TODRUTKLI4W4RZOMZSSLBEEXOKPKQKP5SEWU7QOQC

Make berserking and non-living monsters stop retreating from Sanctuary as

soon as they leave it, since they're being forced out rather than actually afraid. Also give a "stops retreating" message for them instead of the "regaining courage" one.

Remove faulty logic that was causing monsters to not notice the player as soon as they stopped fleeing Sanctuary.

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

Created by zelgadis on July 1, 2008

A2SAU7YL5ZS4TODRUTKLI4W4RZOMZSSLBEEXOKPKQKP5SEWU7QOQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/monstuff.cc at line 3421 [3.1396662]

B:BD[2.3528] → [2.3528:3760]

∅:D[2.3760] → [3.1450968:1450974]

B:BD[3.1450968] → [3.1450968:1450974]


    if (is_sanctuary(mon->target_x, mon->target_y) && mon->foe != MHITNOT
        && !isFriendly && !mons_is_pacified(mon) && mon->behaviour != BEH_FLEE
        && mon->target_pos() != mon->pos())
    {
        mon->foe = MHITNOT;
    }

Replacement in crawl-ref/source/monstuff.cc at line 3663 [3.1396662]

∅:D[4.457] → [5.4669:4784]

B:BD[5.4669] → [5.4669:4784]

             && monster->target_x == env.sanctuary_pos.x
             && monster->target_y == env.sanctuary_pos.y)

[4.457]

[6.2935]

             && monster->target_pos() == env.sanctuary_pos)

Replacement in crawl-ref/source/monstuff.cc at line 3666 [3.1396662]

∅:D[6.3012] → [7.11639:11667]

B:BD[7.11639] → [7.11639:11667]

        if (random2(5) > 2)

[6.3012]

[7.11667]

        // Nonliving and berserking monsters always stop imediately,
        // since they're only being forced out rather than actually scared.
        if (monster->holiness() == MH_NONLIVING
            || monster->has_ench(ENCH_BERSERK)
            || random2(5) > 2)
        {

Insertion in crawl-ref/source/monstuff.cc at line 3673 [3.1396662]
[7.11709]
[7.11709]
```
        }
```

Replacement in crawl-ref/source/mon-util.cc at line 5220 [3.1699344]

B:BD[8.15362] → [7.14919:15115]

        snprintf( info, INFO_SIZE, " seems to regain %s courage.",
                  mons_pronoun(static_cast<monster_type>(this->type),
                               PRONOUN_NOCAP_POSSESSIVE));

[8.15362]

[9.2689]

        if (holiness() == MH_NONLIVING || has_ench(ENCH_BERSERK))
        {
            // This should only happen because of fleeing Sanctuary
            strcpy( info, " stops retreating.");
        }
        else
        {
            snprintf( info, INFO_SIZE, " seems to regain %s courage.",
                      mons_pronoun(static_cast<monster_type>(this->type),
                                   PRONOUN_NOCAP_POSSESSIVE));
        }