fiddlerwoaroof/crawl - Change ICLEUOOWAGTF2ZAQRZLXVW5MLTG7PH6YTU47MWHARHHBWGZKZCLAC

Don't give the player the DID_KILL_HOLY conduct in

melee_attack::player_monattk_hit_effects() if the hit kills a holy monster, as monster_die() will be called afterwards, resulting in its being given twice.

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

Created by dolorous on May 16, 2008

ICLEUOOWAGTF2ZAQRZLXVW5MLTG7PH6YTU47MWHARHHBWGZKZCLAC

Dependencies

[2] 2WVP47RBNL5OVYMAZH7TKRYD7F2TGSZ5X74PWVGAYCQP26G3JUHQC
[3] ILADK4YNPQVYLZYDMGGBYN2EBBCIPCDNUCWZH27DQTKOMVUDLVMAC
[4] K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC
[5] FZY4HSWWVXB4KNVLUVCBDKU4Z5IIP6V6WIJ3QVPQDWACNVH5DT6QC

In channels

main

Change contents

Replacement in crawl-ref/source/fight.cc at line 1705 [4.3140790]

B:BD[3.1042] → [3.1042:1081]

B:BD[3.1081] → [2.8497:8578]

    if (mons_holiness(def) == MH_HOLY)
        did_god_conduct(mondied? DID_KILL_HOLY : DID_ATTACK_HOLY, 1, true, def);

[3.1042]

[5.397]

    if (!mondied && mons_holiness(def) == MH_HOLY)
        did_god_conduct(DID_ATTACK_HOLY, 1, true, def);