fiddlerwoaroof/crawl - Change UPGYG3GFPPKD2SQ6WQDQHNAYD5POE72ND43PV7F7WUNINQVJBS2QC

If a player's beam doesn't damage good neutral monsters, don't annoy

them, for consistency with friendly monsters.

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

Created by dolorous on April 17, 2008

UPGYG3GFPPKD2SQ6WQDQHNAYD5POE72ND43PV7F7WUNINQVJBS2QC

Dependencies

[2] 7YUGK5Q64KG5O7GJGTUBRRLHAHBCJ5YOE23YUPT6UBKUSB67CYAQC
[3] MG6LLF3XYCOEBQRX7TJ4MUTKM3IROYWUMZGCMYVW4TGDG36CJMJQC
[4] MZXKH5NHXRMX5Y5FG4XXNHZQ7HTQZFX3ARQU55DO4RM5NR3GIAIQC
[5] K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC
[6] RPOZZWKG5GLPHVZZ7ZKMKS64ZMV2LDCQSARBJFJ6FZOTOKCQO7FAC
[7] KAOE5HB3THUKVGFZRO5EZESHEB3Q34WUO5DFMLWIKOBF47LZTIYAC

In channels

main

Change contents

Replacement in crawl-ref/source/beam.cc at line 4016 [5.4128068]

∅:D[3.2185] → [4.825:1018]

∅:D[2.15721] → [4.825:1018]

B:BD[6.1249699] → [4.825:1018]

        // Don't annoy friendlies if the player's beam did no damage.
        // Hostiles will still take umbrage.
        if (hurt_final > 0 || !mons_friendly(mon) || !YOU_KILL(beam.thrower))

[2.15721]

[7.18994]

        // Don't annoy friendlies or good neutrals if the player's beam
        // did no damage. Hostiles will still take umbrage.
        if (hurt_final > 0 || !mons_wont_attack(mon) || !YOU_KILL(beam.thrower))