fiddlerwoaroof/crawl - Change FEKJYPRNH6AA7UO5L6QYRMKSZDC7NZZDTVDO7E7D3DHT7LP6IX5QC

Fix 2022451: Cleansing Flame hurting distracted monsters and angering

         TSO. As suggested by David, I added no prompts but instead
         made sure that fleeing&#x2f;distracted&#x2f;caught&#x2f;... monsters are 
         simply not harmed (hurt = 0), meaning players don&#x27;t have to
         worry about accidentally angering TSO *and* they can&#x27;t ever
         use his power to hurt helpless creatures, even willingly.

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

Created by j-p-e-g on July 28, 2008

FEKJYPRNH6AA7UO5L6QYRMKSZDC7NZZDTVDO7E7D3DHT7LP6IX5QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 129 [4.962854]
∅:D[2.18050] → [3.2718:2748]
B:BD[3.2718] → [3.2718:2748]
```
    if (cloud != EMPTY_CLOUD)
```
[2.18050]
[3.2748]
```
    if (cloud != EMPTY_CLOUD && !you.duration[DUR_CONF])
```

Insertion in crawl-ref/source/beam.cc at line 2257 [4.4128068]

[4.4183880]

[5.3204]

        // Cleansing flame doesn't hurt holy monsters or monsters your
        // god wouldn't like to be hurt.

Replacement in crawl-ref/source/beam.cc at line 2260 [4.4128068]

B:BD[5.3238] → [5.3238:3349]

            || (is_good_god(you.religion)
                && (is_follower(monster) || mons_neutral(monster))))

[5.3238]

[6.2857]

            || you.religion == GOD_SHINING_ONE
               && is_unchivalric_attack(&you, monster, monster)
            || is_good_god(you.religion)
               && (is_follower(monster) || mons_neutral(monster)))