fiddlerwoaroof/crawl - Change U5BUW5QJQ22SXMUA3JEQ4JXOE5NJF7KDOQJWPWCQ6X7P2OQMNBJQC

Better message when allies are killed. [2009285]

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

Created by haranp on August 1, 2008

U5BUW5QJQ22SXMUA3JEQ4JXOE5NJF7KDOQJWPWCQ6X7P2OQMNBJQC

Dependencies

In channels

main

Change contents

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

B:BD[3.889] → [4.17957:18025]

B:BD[4.18025] → [2.2679:2754]

∅:D[2.2754] → [6.1674:1735]

B:BD[4.18099] → [6.1674:1735]

                mprf(MSGCH_MONSTER_DAMAGE, MDAM_DEAD, "You %s %s!",
                     _wounded_damaged(monster->type) ? "destroy" : "kill",
                     monster->name(DESC_NOCAP_THE).c_str());

[3.889]

[5.1409093]

                bool passive = (killer == KILL_YOU_CONF
                                && (killer_index == ANON_FRIENDLY_MONSTER
                                    || !invalid_monster_index(killer_index)));
                
                if ( passive )
                {
                    mprf(MSGCH_MONSTER_DAMAGE, MDAM_DEAD, "%s is %s!",
                         monster->name(DESC_CAP_THE).c_str(),
                         _wounded_damaged(monster->type) ?
                         "destroyed" : "killed");
                }
                else
                {
                    mprf(MSGCH_MONSTER_DAMAGE, MDAM_DEAD, "You %s %s!",
                         _wounded_damaged(monster->type) ? "destroy" : "kill",
                         monster->name(DESC_NOCAP_THE).c_str());
                }