fiddlerwoaroof/crawl - Change QB63BJ2J32GBEF7N7YWHQIBTBODWVUZIRMNH42PCQWTRGU6JG2EQC

Fix [2701428]: TSO will no longer give piety loss and penance for

attacking and killing hostile holy beings (not counting holy beings that weren't hostile until you attacked them, of course). The warning prompt now takes this into account, as well.

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

Created by dolorous on March 22, 2009

QB63BJ2J32GBEF7N7YWHQIBTBODWVUZIRMNH42PCQWTRGU6JG2EQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 2449 [4.804403]

B:BD[3.4263] → [3.4263:4417]

                piety_change = -level;
                if (known || thing_done == DID_ATTACK_HOLY
                    && victim->attitude != ATT_HOSTILE)

[3.4263]

[3.4417]

                if (thing_done == DID_ATTACK_HOLY
                    && (victim->attitude != ATT_HOSTILE
                        || testbits(victim->flags, MF_CREATED_FRIENDLY)
                        || testbits(victim->flags, MF_WAS_NEUTRAL)))

Insertion in crawl-ref/source/religion.cc at line 2454 [4.804403]
[3.4435]
[3.4435]
```
                    piety_change = -level;
```

Replacement in crawl-ref/source/religion.cc at line 2736 [4.804403]

B:BD[3.13001] → [3.13001:13066]

                if (testbits(victim->flags, MF_CREATED_FRIENDLY)

[3.13001]

[3.13066]

                if (victim->attitude != ATT_HOSTILE
                    || testbits(victim->flags, MF_CREATED_FRIENDLY)

Replacement in crawl-ref/source/religion.cc at line 2740 [4.804403]

B:BD[3.13148] → [3.13148:13217]

                    level *= 3;
                    penance = level;

[3.13148]

[3.13217]

                    penance = level * 3;
                    piety_change = -level * 3;

Deletion in crawl-ref/source/religion.cc at line 2743 [4.804403]
B:BD[3.13235] → [3.13235:13274]
```
                piety_change = -level;
```

Replacement in crawl-ref/source/religion.cc at line 2805 [4.804403]

B:BD[5.4473] → [5.4473:4542]

                    level *= 3;
                    penance = level;

[5.4473]

[5.4542]

                    penance = level * 3;
                    piety_change = -level * 3;

Deletion in crawl-ref/source/religion.cc at line 2808 [4.804403]
B:BD[5.4560] → [5.4560:4599]
```
                piety_change = -level;
```

Replacement in crawl-ref/source/misc.cc at line 3016 [4.1933596]

∅:D[2.3552] → [6.5774:5824]

B:BD[6.5774] → [6.5774:5824]

    const bool isHoly        = mons_is_holy(mon);

[2.3552]

[6.5824]

    const bool isHoly        = mons_is_holy(mon)
                                   && (mon->attitude != ATT_HOSTILE
                                       || testbits(mon->flags, MF_CREATED_FRIENDLY)
                                       || testbits(mon->flags, MF_WAS_NEUTRAL));

Deletion in crawl-ref/source/misc.cc at line 3039 [4.1933596]

B:BD[6.6472] → [6.6472:6613]

        // "Really fire through the helpless neutral holy Daeva?"
        // was: "Really fire through this helpless neutral holy creature?"