fiddlerwoaroof/crawl - Change KDPJ5HMPM3G2ZE6SV3P24QRRQMZ5NCR5ERT5X3QQZAWN6JVIRUFAC

Consolidate the confused undead checks, and unbreak the killer index

sanioty checks for anonymous friendly monsters (oops).

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

Created by dolorous on May 31, 2009

KDPJ5HMPM3G2ZE6SV3P24QRRQMZ5NCR5ERT5X3QQZAWN6JVIRUFAC

Dependencies

In channels

main

Change contents

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

B:BD[2.2884] → [2.2884:2941]

                && !invalid_monster_index(killer_index))

[2.2884]

[3.1413520]

                && (anon || !invalid_monster_index(killer_index)))

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

B:BD[4.414008] → [2.2942:3000]

∅:D[2.3000] → [5.4033:4085]

B:BD[4.414008] → [5.4033:4085]

B:BD[5.4085] → [2.3001:3066]

                monsters *attacker = &menv[killer_index];
                const mon_holy_type attacker_holy =
                    anon ? MH_NATURAL : mons_holiness(attacker);

[4.414008]

[3.1413592]

                monsters *killer_mon = &menv[killer_index];
                const mon_holy_type killer_holy =
                    anon ? MH_NATURAL : mons_holiness(killer_mon);

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

B:BD[6.3015] → [2.3067:3127]

                    || !anon && mons_is_god_gift(attacker))

[6.3015]

[3.1413655]

                    || !anon && mons_is_god_gift(killer_mon))

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

B:BD[3.1413673] → [7.3756:3808]

                    if (attacker_holy == MH_UNDEAD)

[3.1413673]

[8.13860]

                    if (killer_holy == MH_UNDEAD)

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

B:BD[8.13882] → [2.3128:3200]

                        const bool confused = !mons_friendly(attacker);

[8.13882]

[7.3920]

                        const bool confused =
                            anon ? true : !mons_friendly(killer_mon);

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

B:BD[4.416236] → [9.6794:6846]

                    if (attacker_holy == MH_UNDEAD)

[4.416236]

[9.6846]

                    if (killer_holy == MH_UNDEAD)

Insertion in crawl-ref/source/monstuff.cc at line 1529 [3.1396662]

[9.6868]

[6.5193]

                        const bool confused =
                            anon ? true : !mons_friendly(killer_mon);

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

B:BD[6.5589] → [2.3201:3254]

∅:D[2.3254] → [9.7303:7329]

B:BD[9.7303] → [9.7303:7329]

B:BD[9.7329] → [6.5590:5782]

∅:D[6.5782] → [9.7516:7597]

B:BD[9.7516] → [9.7516:7597]

B:BD[9.7597] → [6.5783:5970]

∅:D[6.5970] → [9.7779:7805]

B:BD[9.7779] → [9.7779:7805]

                        if (mons_friendly(attacker))
                        {
                            notice |= did_god_conduct(
                                          DID_HOLY_KILLED_BY_UNDEAD_SLAVE,
                                          monster->hit_dice);
                        }
                        else
                        {
                            notice |= did_god_conduct(
                                          DID_HOLY_KILLED_BY_SERVANT,
                                          monster->hit_dice);
                        }

[6.5589]

[9.7805]

                        notice |= did_god_conduct(
                                      !confused ? DID_HOLY_KILLED_BY_UNDEAD_SLAVE :
                                                  DID_HOLY_KILLED_BY_SERVANT,
                                      monster->hit_dice);

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

B:BD[10.4743] → [2.3255:3321]

                    && random2(you.piety) >= piety_breakpoint(0))

[10.4743]

[11.5066]

                    && random2(you.piety) >= piety_breakpoint(0)
                    && !invalid_monster_index(killer_index))

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

B:BD[12.2657] → [2.3322:3438]

                    if (!one_chance_in(3) && attacker->alive()
                        && bless_follower(attacker))

[12.2657]

[13.5446]

                    if (!one_chance_in(3) && killer_mon->alive()
                        && bless_follower(killer_mon))

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

B:BD[14.3171] → [2.3439:3557]

                    if (attacker->alive()
                        && attacker->hit_points < attacker->max_hit_points)

[14.3171]

[11.5193]

                    if (killer_mon->alive()
                        && killer_mon->hit_points < killer_mon->max_hit_points)

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

B:BD[11.5215] → [2.3558:3686]

                        simple_monster_message(attacker, " looks invigorated.");
                        heal_monster(attacker,

[11.5215]

[2.3686]

                        simple_monster_message(killer_mon,
                                               " looks invigorated.");
                        heal_monster(killer_mon,

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

B:BD[10.5033] → [2.3768:3810]

                    && !one_chance_in(3))

[10.5033]

[15.3664]

                    && !one_chance_in(3)
                    && !invalid_monster_index(killer_index))

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

B:BD[15.3682] → [2.3811:3857]

                    bless_follower(attacker);

[15.3682]

[11.5525]

                    bless_follower(killer_mon);