fiddlerwoaroof/crawl - Change I5J2WSDHDEWS7AXIHJLJTOHGEBFHKM4NUONNYCROYY6BLNYZYU5QC

Fix [2792504]: Fix inverted logic causing penalties for necromancy to be

disabled along with penalties for attacking hostile holy beings.

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

Created by dolorous on May 15, 2009

I5J2WSDHDEWS7AXIHJLJTOHGEBFHKM4NUONNYCROYY6BLNYZYU5QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 2458 [4.804403]
[3.4263]
[2.2606]

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

B:BD[2.2656] → [2.2656:2853]

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

[2.2656]

[3.4417]

                    && (victim->attitude == ATT_HOSTILE
                        && !testbits(victim->flags, MF_CREATED_FRIENDLY)
                        && !testbits(victim->flags, MF_WAS_NEUTRAL)))

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

B:BD[3.4435] → [2.2854:2897]

∅:D[2.2897] → [3.4435:4591]

B:BD[3.4435] → [3.4435:4591]

                    piety_change = -level;
                    penance = level * ((you.religion == GOD_SHINING_ONE) ? 2
                                                                         : 1);

[3.4435]

[3.4591]

                    break;

Insertion in crawl-ref/source/religion.cc at line 2466 [4.804403]

[3.4609]


                piety_change = -level;
                penance = level * ((you.religion == GOD_SHINING_ONE) ? 2
                                                                     : 1);