fiddlerwoaroof/crawl - Change NUYXKJP5YXHRDUQW5QW7UC3D5U3VPANIOZAOHFCPWMSRYGMA3GCAC

+ Berserking monsters attack the nearest enemy.

Makhleb gets a different saccing message.
When praying while DUR_PRAYER you can stop praying. Yes, I realize that the question is awkward but I really don't want to force players to lose two turns if all they wanted was to prolong their prayer when they're not busy fighting, especially as it's always worked this way before. By now I think that toggling between prayer/non-prayer probably is the way to go, after all, but first we need to make sure that Vehumet (anyone else this concerns?) has some obvious drawbacks.

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

Created by j-p-e-g on August 7, 2007

NUYXKJP5YXHRDUQW5QW7UC3D5U3VPANIOZAOHFCPWMSRYGMA3GCAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 94 [5.804403]
B:BD[4.212] → [3.631:680]
```
    " & consumed in a roaring column of flame.",
```
[4.212]
[4.213]
```
    " flare% blood-red and disappear%.",
```

Insertion in crawl-ref/source/religion.cc at line 733 [5.804403]

[6.428]


    if (you.duration[DUR_PRAYER])
    {
        if ( yesno("Do you want to stop praying?", true, 'y') )
        {
             mpr( "Your prayer is over.", MSGCH_PRAY, you.religion );
             you.duration[DUR_PRAYER] = 0;
             return;
        }
    }

Insertion in crawl-ref/source/monstuff.cc at line 67 [5.1396662]
[2.458]
[2.458]
```
static void set_nearest_monster_foe(monsters *monster);
```

Insertion in crawl-ref/source/monstuff.cc at line 1479 [5.1396662]

[5.1438558]

        // Berserking monsters don't flee
        if (mon->has_ench(ENCH_BERSERK))
            break;

Insertion in crawl-ref/source/monstuff.cc at line 1589 [5.1396662]
[5.1441604]
[5.1441604]
```
    // berserking allies ignore your commands
```

Insertion in crawl-ref/source/monstuff.cc at line 1596 [5.1396662]

[5.1441759]

    }
    // instead berserkers attack nearest monsters
    if (mon->has_ench(ENCH_BERSERK)
        && (mon->foe == MHITNOT || isFriendly && mon->foe == MHITYOU))
    {
        // intelligent monsters prefer to attack the player,
        // even when berserking
        if (!isFriendly && proxPlayer && mons_intel(mon->type) >= I_NORMAL)
        {
            mon->foe = MHITYOU;
        }
        else
        {
            set_nearest_monster_foe(mon);
        }

Replacement in crawl-ref/source/monstuff.cc at line 1628 [5.1396662]

B:BD[5.1442276] → [5.1442276:1442333]

        && proxPlayer && !one_chance_in(3) && isHealthy)

[5.1442276]

[5.1442333]

        && proxPlayer && !(mon->has_ench(ENCH_BERSERK)) && isHealthy
        && !one_chance_in(3))

Insertion in crawl-ref/source/monstuff.cc at line 1899 [5.1396662]

[5.1451032]


// choose nearest monster as a foe
// (used for berserking monsters)
void set_nearest_monster_foe(monsters *mon)
{
    bool friendly = mons_friendly(mon);

Insertion in crawl-ref/source/monstuff.cc at line 1906 [5.1396662]

[5.1451033]

    int mx = mon->x;
    int my = mon->y;
    for (int k = 1; k <= 8; k++)
       for (int x = mx - k; x <= mx + k; x++)
          for (int y = my - k; y <= my + k; y++)
   {
             if (x != mx-k && x != mx+k && y != my-k && y != my+k)
                 continue;
                 
             if (!friendly && x == you.x_pos && y == you.y_pos
                 && mons_player_visible(mon))
             {
                 mon->foe = MHITYOU;
                 return;
             }
             if (mgrd[x][y] != NON_MONSTER
                 && !(x == mx && y == my))
             {
                 monsters *foe = &menv[mgrd[x][y]];
                 if (mons_monster_visible(mon, foe)
                     && mons_friendly(foe) != friendly)
                 {
                     mon->foe = mgrd[x][y];
                     return;
                 }
             }
   }
}

Insertion in crawl-ref/source/mon-util.cc at line 3802 [5.1699344]

[7.7729]

            
            // this assumes that god gifts outside Trog's are rarely berserked
            if (this->flags & MF_GOD_GIFT && this->flags & MF_HARD_RESET)
                monster_die( this, KILL_RESET, 0 );