fiddlerwoaroof/crawl - Change LZBIO6MQQRI4XUUWVSOTFFDZ3UA3M5SAPYEMWP7T7E7U5SJKYJKAC

Make the logic for servants' killing holy beings match that for your

killing holy beings.

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

Created by dolorous on May 15, 2009

LZBIO6MQQRI4XUUWVSOTFFDZ3UA3M5SAPYEMWP7T7E7U5SJKYJKAC

Dependencies

In channels

main

Change contents

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

B:BD[3.13001] → [2.2898:3018]

∅:D[2.3018] → [3.13066:13130]

B:BD[3.13066] → [3.13066:13130]

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

[3.13001]

[3.13130]

                if (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 2754 [4.804403]

B:BD[3.13148] → [2.3019:3107]

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

[3.13148]

[3.13217]

                    break;

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

[3.13235]

[3.13274]


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

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

B:BD[5.4326] → [5.4326:4455]

                if (testbits(victim->flags, MF_CREATED_FRIENDLY)
                    || testbits(victim->flags, MF_WAS_NEUTRAL))

[5.4326]

[5.4455]

                if (!testbits(victim->flags, MF_CREATED_FRIENDLY)
                    && !testbits(victim->flags, MF_WAS_NEUTRAL))

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

B:BD[5.4473] → [2.3108:3196]

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

[5.4473]

[5.4542]

                    break;

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

[5.4560]

[5.4599]


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