fiddlerwoaroof/crawl - Change 67LHB647OBWGRC7XSAVMUJFWRZC5QPY533Y5MT4OYTUSRECK632QC

Remove the reconversion-on-sight routines for holy beings and orcs,

since dumping the good gods or Beogh will reconvert them across all levels anyway.

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

Created by dolorous on May 11, 2008

67LHB647OBWGRC7XSAVMUJFWRZC5QPY533Y5MT4OYTUSRECK632QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 793 [8.16817]

B:BD[7.1353] → [7.1353:1369]

B:BD[7.1369] → [9.42:82]

B:BD[9.82] → [10.62:95]

∅:D[10.95] → [9.82:120]

B:BD[9.82] → [9.82:120]

B:BD[9.120] → [6.7:108]

∅:D[6.108] → [11.161:218]

B:BD[11.161] → [11.161:218]

∅:D[11.218] → [7.1587:1662]

B:BD[7.1587] → [7.1587:1662]

B:BD[7.1662] → [12.79:154]

B:BD[12.154] → [13.52:98]

∅:D[13.98] → [14.52:53]

B:BD[14.52] → [14.52:53]

∅:D[14.53] → [7.1834:1875]

B:BD[7.1834] → [7.1834:1875]

B:BD[7.1875] → [6.109:154]

∅:D[6.154] → [7.1875:1928]

B:BD[7.1875] → [7.1875:1928]

B:BD[7.1928] → [4.8:72]

∅:D[4.72] → [14.54:55]

B:BD[7.1997] → [14.54:55]

∅:D[14.55] → [7.2014:2053]

B:BD[7.2014] → [7.2014:2053]

B:BD[7.2053] → [14.56:115]

∅:D[14.115] → [7.2113:2218]

B:BD[7.2113] → [7.2113:2218]

B:BD[7.2218] → [3.8:49]

∅:D[3.49] → [7.2259:2289]

B:BD[7.2259] → [7.2259:2289]

        }
    }
    else if (!is_good_god(you.religion)
             && monster->alive()
             && mons_is_holy(monster)
             && (monster->attitude != ATT_HOSTILE
                 || monster->has_ench(ENCH_CHARM))
             && (monster->flags & MF_ATT_CHANGE_ATTEMPT)
             && mons_player_visible(monster) && !mons_is_sleeping(monster)
             && !mons_is_confused(monster) && !mons_is_paralysed(monster))
    {      // attitude change if non-good god
        monster->attitude = ATT_HOSTILE;
        monster->del_ench(ENCH_CHARM, true);
        behaviour_event(monster, ME_ALERT, MHITYOU);
        // WAS_NEUTRAL stays -> no piety bonus on killing these
        // give message only sometimes
        if (player_monster_visible(monster) && random2(4))
        {
            msg::streams(MSGCH_MONSTER_ENCHANT)
                << monster->name(DESC_CAP_THE)
                << " turns against you!"
                << std::endl;

Deletion in crawl-ref/source/view.cc at line 832 [8.16817]

∅:D[15.28] → [16.3393:3409]

∅:D[2.35] → [16.3393:3409]

∅:D[17.121] → [16.3393:3409]

∅:D[18.222] → [16.3393:3409]

B:BD[16.3393] → [16.3393:3409]

B:BD[16.3409] → [19.8:47]

B:BD[19.47] → [5.42:79]

∅:D[5.79] → [11.323:380]

∅:D[19.91] → [11.323:380]

B:BD[16.3650] → [11.323:380]

B:BD[16.3751] → [16.3751:3826]

B:BD[16.3826] → [12.226:301]

∅:D[20.124] → [16.3901:3947]

∅:D[12.301] → [16.3901:3947]

B:BD[16.3901] → [16.3901:3947]

B:BD[16.3947] → [14.118:119]

∅:D[14.119] → [16.3964:4005]

B:BD[16.3964] → [16.3964:4005]

B:BD[16.4005] → [17.122:175]

∅:D[17.175] → [16.4047:4116]

B:BD[16.4047] → [16.4047:4116]

B:BD[16.4116] → [14.120:121]

∅:D[14.121] → [16.4133:4172]

B:BD[16.4133] → [16.4133:4172]

B:BD[16.4172] → [14.122:181]

∅:D[14.181] → [16.4232:4402]

B:BD[16.4232] → [16.4232:4402]

        }
    }
    else if (you.religion != GOD_BEOGH
             && is_follower(monster)
             && (monster->flags & MF_ATT_CHANGE_ATTEMPT)
             && mons_player_visible(monster) && !mons_is_sleeping(monster)
             && !mons_is_confused(monster) && !mons_is_paralysed(monster))
    {      // reconversion if no longer Beogh
        monster->attitude = ATT_HOSTILE;
        behaviour_event(monster, ME_ALERT, MHITYOU);
        // CREATED_FRIENDLY stays -> no piety bonus on killing these
        // give message only sometimes
        if (player_monster_visible(monster) && random2(4))
        {
            msg::streams(MSGCH_MONSTER_ENCHANT)
                << monster->name(DESC_CAP_THE)
                << " deserts you."
                << std::endl;