fiddlerwoaroof/crawl - Change SA36K3OJ75PNVR2F4QAPNU2LUGFTVHNIAZVSXCBXBT2NLW2RTUPAC

Reenable gods' revenge for atheists and Xom worshippers (oops).

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

Created by dolorous on November 3, 2008

SA36K3OJ75PNVR2F4QAPNU2LUGFTVHNIAZVSXCBXBT2NLW2RTUPAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 2266 [18.804403]

B:BD[18.836720] → [19.2891:2978]

    if (you.religion == GOD_NO_GOD || you.religion == GOD_XOM)
        return (false);

[18.836720]

[19.2978]

    bool retval = false;

Replacement in crawl-ref/source/religion.cc at line 2268 [18.804403]

∅:D[19.2979] → [20.181816:181885]

B:BD[18.836720] → [20.181816:181885]

    bool ret = false;
    int piety_change = 0;
    int penance = 0;

[19.2979]

[20.181885]

    if (you.religion != GOD_NO_GOD && you.religion != GOD_XOM)
    {
        int piety_change = 0;
        int penance = 0;

Replacement in crawl-ref/source/religion.cc at line 2273 [18.804403]
B:BD[18.836773] → [21.809:831]
```
    god_acting gdact;
```
[20.181886]
[22.4244]
```
        god_acting gdact;
```
Replacement in crawl-ref/source/religion.cc at line 2275 [18.804403]
∅:D[22.4245] → [18.836773:836803]
B:BD[18.836773] → [18.836773:836803]
B:BD[18.836803] → [23.3422:3478]
```
    switch (thing_done)
    {
    case DID_DRINK_BLOOD:
        switch (you.religion)
```
[22.4245]
[23.3478]
```
        switch (thing_done)
```

Replacement in crawl-ref/source/religion.cc at line 2277 [18.804403]

B:BD[23.3488] → [24.523:577]

        case GOD_SHINING_ONE:
            if (!known)

[23.3488]

[24.577]

        case DID_DRINK_BLOOD:
            switch (you.religion)

Replacement in crawl-ref/source/religion.cc at line 2280 [18.804403]

B:BD[24.591] → [12.2428:2564]

                simple_god_message(" forgives your inadvertent "
                                   "blood-drinking, just this once.");

[24.591]

[24.656]

            case GOD_SHINING_ONE:
                if (!known)
                {
                    simple_god_message(" forgives your inadvertent "
                                       "blood-drinking, just this once.");
                    break;
                }
                penance = level;
                // deliberate fall-through
            case GOD_ZIN:
            case GOD_ELYVILON:
                if (!known)
                {
                    simple_god_message(" forgives your inadvertent "
                                       "blood-drinking, just this once.");
                    break;
                }
                piety_change = -2*level;
                retval = true;

Replacement in crawl-ref/source/religion.cc at line 2300 [18.804403]

B:BD[24.679] → [24.679:761]

∅:D[24.761] → [23.3488:3510]

B:BD[23.3488] → [23.3488:3510]

B:BD[23.3510] → [24.762:827]

B:BD[24.827] → [12.2565:2701]

            }
            penance = level;
            // deliberate fall-through
        case GOD_ZIN:
        case GOD_ELYVILON:
            if (!known)
            {
                simple_god_message(" forgives your inadvertent "
                                   "blood-drinking, just this once.");

[24.679]

[24.892]

            default:

Deletion in crawl-ref/source/religion.cc at line 2303 [18.804403]

B:BD[24.929] → [24.929:1026]

            piety_change = -2*level;
            ret = true;
            break;
        default:

Deletion in crawl-ref/source/religion.cc at line 2304 [18.804403]
B:BD[24.1045] → [24.1045:1070]
```
        }
        break;
```

Replacement in crawl-ref/source/religion.cc at line 2305 [18.804403]

B:BD[24.1071] → [24.1071:1159]

∅:D[24.1159] → [23.3510:3567]

B:BD[23.3510] → [23.3510:3567]

B:BD[23.3567] → [24.1160:1224]

∅:D[24.1224] → [23.3662:3722]

B:BD[23.3662] → [23.3662:3722]

    case DID_CANNIBALISM:
        switch (you.religion)
        {
        case GOD_ZIN:
        case GOD_SHINING_ONE:
        case GOD_ELYVILON:
            piety_change = -level;
            penance = level;
            ret = true;
            break;
        default:

[24.1071]

[23.3722]

        case DID_CANNIBALISM:
            switch (you.religion)
            {
            case GOD_ZIN:
            case GOD_SHINING_ONE:
            case GOD_ELYVILON:
                piety_change = -level;
                penance = level;
                retval = true;
                break;
            default:
                break;
            }

Deletion in crawl-ref/source/religion.cc at line 2319 [18.804403]
B:BD[23.3741] → [23.3741:3766]
```
        }
        break;
```

Replacement in crawl-ref/source/religion.cc at line 2320 [18.804403]

B:BD[23.3767] → [24.1225:1298]

∅:D[24.1298] → [25.237:308]

B:BD[25.237] → [25.237:308]

∅:D[25.308] → [20.181974:182165]

∅:D[23.3767] → [20.181974:182165]

B:BD[18.836803] → [20.181974:182165]

B:BD[20.182165] → [26.172:229]

    // If you make some god like these acts, modify did_god_conduct call
    // in beam.cc with god_likes_necromancy check or something similar
    case DID_NECROMANCY:
    case DID_UNHOLY:
    case DID_ATTACK_HOLY:
        switch (you.religion)
        {
        case GOD_ZIN:
        case GOD_SHINING_ONE:
        case GOD_ELYVILON:
            if (!known && thing_done != DID_ATTACK_HOLY)

[23.3767]

[24.1323]

        case DID_NECROMANCY:
        case DID_UNHOLY:
        case DID_ATTACK_HOLY:
            switch (you.religion)

Replacement in crawl-ref/source/religion.cc at line 2325 [18.804403]

B:BD[24.1337] → [12.2702:2834]

                simple_god_message(" forgives your inadvertent unholy act, "
                                   "just this once.");

[24.1337]

[24.1402]

            case GOD_ZIN:
            case GOD_SHINING_ONE:
            case GOD_ELYVILON:
                if (!known && thing_done != DID_ATTACK_HOLY)
                {
                    simple_god_message(" forgives your inadvertent unholy act, "
                                       "just this once.");
                    break;
                }
                piety_change = -level;
                if (known || thing_done == DID_ATTACK_HOLY
                    && victim->attitude != ATT_HOSTILE)
                {
                    penance = level * ((you.religion == GOD_SHINING_ONE) ? 2
                                                                         : 1);
                }
                retval = true;
                break;
            default:

Replacement in crawl-ref/source/religion.cc at line 2346 [18.804403]

∅:D[24.1439] → [20.182165:182200]

B:BD[20.182165] → [20.182165:182200]

B:BD[20.182200] → [10.2428:2535]

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

[24.1439]

[10.2535]

            break;
        case DID_HOLY:
            if (you.religion == GOD_YREDELEMNUL)

Replacement in crawl-ref/source/religion.cc at line 2351 [18.804403]

∅:D[10.2549] → [26.253:332]

∅:D[27.2783] → [26.253:332]

B:BD[26.253] → [26.253:332]

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

[10.2549]

[10.2550]

                if (!known)
                {
                    simple_god_message(" forgives your inadvertent holy act, "
                                       "just this once.");
                    break;
                }
                retval = true;
                piety_change = -level;
                penance = level * 2;

Deletion in crawl-ref/source/religion.cc at line 2361 [18.804403]
∅:D[26.332] → [20.182267:182310]
∅:D[24.1515] → [20.182267:182310]
∅:D[10.2564] → [20.182267:182310]
B:BD[20.182267] → [20.182267:182310]
B:BD[20.182310] → [28.491:508]
```
            ret = true;
            break;
        default:
```
Deletion in crawl-ref/source/religion.cc at line 2362 [18.804403]
B:BD[28.527] → [29.2756:2781]
```
        }
        break;
```

Replacement in crawl-ref/source/religion.cc at line 2363 [18.804403]

B:BD[29.2782] → [29.2782:2880]

    case DID_HOLY:
        if (you.religion == GOD_YREDELEMNUL)
        {
            if (!known)

[29.2782]

[29.2880]

        case DID_UNCHIVALRIC_ATTACK:
        case DID_POISON:
            if (you.religion == GOD_SHINING_ONE)

Replacement in crawl-ref/source/religion.cc at line 2367 [18.804403]

B:BD[29.2894] → [12.2835:2965]

∅:D[30.2927] → [29.2959:2982]

∅:D[12.2965] → [29.2959:2982]

B:BD[29.2959] → [29.2959:2982]

                simple_god_message(" forgives your inadvertent holy act, "
                                   "just this once.");
                break;

[29.2894]

[29.2982]

                if (thing_done == DID_UNCHIVALRIC_ATTACK)
                {
                    if (tso_unchivalric_attack_safe_monster(victim))
                        break;
                    if (!known)
                    {
                        simple_god_message(" forgives your inadvertent "
                                           "dishonourable attack, just this "
                                           "once.");
                        break;
                    }
                }
                retval = true;
                piety_change = -level;
                penance = level * 2;

Replacement in crawl-ref/source/religion.cc at line 2384 [18.804403]
B:BD[29.2996] → [29.2996:3088]
∅:D[28.527] → [20.182310:182335]
∅:D[29.3088] → [20.182310:182335]
B:BD[20.182310] → [20.182310:182335]
```
            ret = true;
            piety_change = -level;
            penance = level * 2;
        }
        break;
```
[29.2996]
[20.182335]
```
            break;
```
Replacement in crawl-ref/source/religion.cc at line 2386 [18.804403]
B:BD[20.182336] → [31.2589:2622]
∅:D[31.2622] → [20.182359:182380]
B:BD[20.182359] → [20.182359:182380]
B:BD[20.182380] → [32.2528:2573]
∅:D[32.2573] → [20.182425:182435]
∅:D[33.2690] → [20.182425:182435]
B:BD[20.182425] → [20.182425:182435]
B:BD[20.182435] → [34.2528:2582]
```
    case DID_UNCHIVALRIC_ATTACK:
    case DID_POISON:
        if (you.religion == GOD_SHINING_ONE)
        {
            if (thing_done == DID_UNCHIVALRIC_ATTACK)
```
[20.182336]
[32.2691]
```
        case DID_ATTACK_NEUTRAL:
            switch (you.religion)
```

Replacement in crawl-ref/source/religion.cc at line 2389 [18.804403]

B:BD[32.2705] → [34.2583:2648]

                if (tso_unchivalric_attack_safe_monster(victim))

[32.2705]

[34.2648]

            case GOD_SHINING_ONE:
            case GOD_ELYVILON:
                if (!known)
                {
                    simple_god_message(" forgives your inadvertent attack on a "
                                       "neutral, just this once.");

Replacement in crawl-ref/source/religion.cc at line 2396 [18.804403]

B:BD[34.2675] → [34.2675:2676]

[34.2675]

[34.2676]

                }
                penance = level/2 + 1;
                // deliberate fall through
            case GOD_ZIN:

Replacement in crawl-ref/source/religion.cc at line 2402 [18.804403]

B:BD[34.2722] → [12.2966:3116]

                    simple_god_message(" forgives your inadvertent "
                                       "dishonourable attack, just this once.");

[34.2722]

[34.2791]

                    simple_god_message(" forgives your inadvertent attack on a "
                                       "neutral, just this once.");

Replacement in crawl-ref/source/religion.cc at line 2406 [18.804403]

∅:D[34.2836] → [32.2728:2742]

B:BD[32.2728] → [32.2728:2742]

∅:D[32.2743] → [20.182435:182527]

B:BD[20.182435] → [20.182435:182527]

B:BD[20.182527] → [35.2907:2932]

            }
            ret = true;
            piety_change = -level;
            penance = level * 2;
        }
        break;

[34.2836]

[35.2932]

                piety_change = -(level/2 + 1);
                retval = true;
                break;

Replacement in crawl-ref/source/religion.cc at line 2410 [18.804403]

B:BD[35.2933] → [35.2933:3002]

B:BD[35.3002] → [36.2523:2553]

∅:D[36.2553] → [35.3002:3029]

B:BD[35.3002] → [35.3002:3029]

B:BD[35.3029] → [36.2554:2592]

B:BD[36.2592] → [12.3117:3258]

    case DID_ATTACK_NEUTRAL:
        switch (you.religion)
        {
        case GOD_SHINING_ONE:
        case GOD_ELYVILON:
            if (!known)
            {
                simple_god_message(" forgives your inadvertent attack on a "
                                   "neutral, just this once.");

[35.2933]

[36.2657]

            default:

Replacement in crawl-ref/source/religion.cc at line 2413 [18.804403]

B:BD[36.2694] → [4.2523:2558]

∅:D[4.2558] → [36.2736:2821]

B:BD[36.2736] → [36.2736:2821]

            penance = level/2 + 1;
            // deliberate fall through
        case GOD_ZIN:
            if (!known)

[36.2694]

[36.2821]

            break;
        case DID_ATTACK_FRIEND:
            if (god_hates_attacking_friend(you.religion, victim))

Replacement in crawl-ref/source/religion.cc at line 2418 [18.804403]

B:BD[36.2835] → [12.3259:3400]

∅:D[30.3336] → [36.2900:2923]

∅:D[12.3400] → [36.2900:2923]

B:BD[36.2900] → [36.2900:2923]

                simple_god_message(" forgives your inadvertent attack on a "
                                   "neutral, just this once.");
                break;

[36.2835]

[36.2923]

                if (!known)
                {
                    simple_god_message(" forgives your inadvertent attack on "
                                       "an ally, just this once.");
                    break;
                }
                piety_change = -level;
                if (known)
                    penance = level * 3;
                retval = true;

Deletion in crawl-ref/source/religion.cc at line 2430 [18.804403]
∅:D[36.2937] → [37.2523:2566]
B:BD[35.3090] → [37.2523:2566]
∅:D[37.2635] → [35.3090:3114]
B:BD[35.3090] → [35.3090:3114]
```
            piety_change = -(level/2 + 1);
            ret = true;
```

Replacement in crawl-ref/source/religion.cc at line 2432 [18.804403]

B:BD[35.3219] → [35.3219:3236]

        default:

[35.3219]

[35.3236]

        case DID_FRIEND_DIED:
            switch (you.religion)
            {
            case GOD_ELYVILON: // healer god cares more about this
                if (you.penance[GOD_ELYVILON])
                    penance = 1;  // if already under penance smaller bonus
                else
                    penance = level;
                // fall through
            case GOD_ZIN: // in contrast to TSO, who doesn't mind martyrs
            case GOD_OKAWARU:
                piety_change = -level;
                retval = true;
                break;
            default:
                break;
            }

Deletion in crawl-ref/source/religion.cc at line 2450 [18.804403]
∅:D[35.3255] → [20.182527:182552]
B:BD[20.182527] → [20.182527:182552]
```
        }
        break;
```

Replacement in crawl-ref/source/religion.cc at line 2451 [18.804403]

B:BD[20.182553] → [20.182553:182581]

B:BD[20.182581] → [38.881:943]

∅:D[38.943] → [20.182611:182621]

B:BD[20.182611] → [20.182611:182621]

B:BD[20.182621] → [30.3337:3361]

    case DID_ATTACK_FRIEND:
        if (god_hates_attacking_friend(you.religion, victim))
        {
            if (!known)

[20.182553]

[30.3361]

        case DID_DEDICATED_BUTCHERY:  // a.k.a. field sacrifice
            switch (you.religion)

Replacement in crawl-ref/source/religion.cc at line 2454 [18.804403]

B:BD[30.3375] → [12.3401:3540]

                simple_god_message(" forgives your inadvertent attack on an "
                                   "ally, just this once.");

[30.3375]

[12.3540]

            case GOD_ELYVILON:
                simple_god_message(" does not appreciate your butchering the "
                                   "dead during prayer!");
                retval = true;
                piety_change = -10;
                penance = 10;

Deletion in crawl-ref/source/religion.cc at line 2461 [18.804403]
∅:D[12.3563] → [30.3506:3520]
B:BD[30.3506] → [30.3506:3520]
```
            }
```

Replacement in crawl-ref/source/religion.cc at line 2462 [18.804403]

∅:D[30.3521] → [38.944:1063]

B:BD[20.182621] → [38.944:1063]

∅:D[28.564] → [20.182837:182862]

∅:D[38.1063] → [20.182837:182862]

B:BD[20.182837] → [20.182837:182862]

            piety_change = -level;
            if (known)
                penance = level * 3;
            ret = true;
        }
        break;

[30.3521]

[20.182862]

            case GOD_OKAWARU:
            case GOD_MAKHLEB:
            case GOD_TROG:
            case GOD_BEOGH:
            case GOD_LUGONU:
                simple_god_message(" accepts your offering.");
                retval = true;
                if (random2(level + 10) > 5)
                    piety_change = 1;
                break;

Replacement in crawl-ref/source/religion.cc at line 2473 [18.804403]

B:BD[20.182863] → [7.2574:2600]

∅:D[7.2600] → [20.182889:182929]

B:BD[20.182889] → [20.182889:182929]

B:BD[20.182929] → [39.3280:3508]

∅:D[39.3508] → [20.183024:183052]

B:BD[20.183024] → [20.183024:183052]

B:BD[20.183052] → [40.2719:2789]

∅:D[40.2789] → [20.183104:183189]

B:BD[20.183104] → [20.183104:183189]

B:BD[20.183189] → [28.565:601]

    case DID_FRIEND_DIED:
        switch (you.religion)
        {
        case GOD_ELYVILON: // healer god cares more about this
            if (you.penance[GOD_ELYVILON])
                penance = 1;  // if already under penance smaller bonus
            else
                penance = level;
            // fall through
        case GOD_ZIN: // in contrast to TSO, who doesn't mind martyrs
        case GOD_OKAWARU:
            piety_change = -level;
            ret = true;
            break;
        default:

[20.182863]

[20.183189]

            default:
                break;
            }

Deletion in crawl-ref/source/religion.cc at line 2477 [18.804403]
B:BD[20.183208] → [20.183208:183233]
```
        }
        break;
```

Replacement in crawl-ref/source/religion.cc at line 2478 [18.804403]

B:BD[20.183234] → [41.2523:2583]

∅:D[41.2583] → [18.836832:836899]

∅:D[20.183291] → [18.836832:836899]

B:BD[18.836832] → [18.836832:836899]

B:BD[18.836899] → [12.3564:3694]

∅:D[30.3652] → [20.183292:183374]

∅:D[12.3694] → [20.183292:183374]

B:BD[18.836960] → [20.183292:183374]

∅:D[20.183374] → [18.837002:837021]

B:BD[18.837002] → [18.837002:837021]

    case DID_DEDICATED_BUTCHERY:  // a.k.a. field sacrifice
        switch (you.religion)
        {
        case GOD_ELYVILON:
            simple_god_message(" does not appreciate your butchering the dead "
                               "during prayer!");
            ret = true;
            piety_change = -10;
            penance = 10;
            break;

[20.183234]

[20.183375]

        case DID_KILL_LIVING:
            switch (you.religion)
            {
            case GOD_ELYVILON:
                // killing only disapproved during prayer
                if (you.duration[DUR_PRAYER])
                {
                    simple_god_message(" does not appreciate your shedding "
                                       "blood during prayer!");
                    retval = true;
                    piety_change = -level;
                    penance = level * 2;
                }
                break;

Replacement in crawl-ref/source/religion.cc at line 2493 [18.804403]

∅:D[20.183376] → [18.837109:837184]

B:BD[18.837109] → [18.837109:837184]

B:BD[18.837184] → [42.5806:5830]

∅:D[42.5830] → [43.295:320]

B:BD[18.837184] → [43.295:320]

∅:D[43.320] → [20.183377:183535]

∅:D[44.1290] → [20.183377:183535]

B:BD[18.837184] → [20.183377:183535]

B:BD[45.2751] → [45.2751:2770]

        case GOD_OKAWARU:
        case GOD_MAKHLEB:
        case GOD_TROG:
        case GOD_BEOGH:
        case GOD_LUGONU:
            simple_god_message(" accepts your offering.");
            ret = true;
            if (random2(level + 10) > 5)
                piety_change = 1;
            break;

[20.183376]

[45.2770]

            case GOD_KIKUBAAQUDGHA:
            case GOD_YREDELEMNUL:
            case GOD_OKAWARU:
            case GOD_VEHUMET:
            case GOD_MAKHLEB:
            case GOD_TROG:
            case GOD_BEOGH:
            case GOD_LUGONU:
                if (god_hates_attacking_friend(you.religion, victim))
                    break;

Replacement in crawl-ref/source/religion.cc at line 2504 [18.804403]

B:BD[45.2771] → [45.2771:2807]

∅:D[45.2807] → [46.6221:6246]

B:BD[46.6221] → [46.6221:6246]

        default:
            break;
        }
        break;

[45.2771]

[45.2808]

                simple_god_message(" accepts your kill.");
                retval = true;
                if (random2(level + 18 - you.experience_level / 2) > 5)
                    piety_change = 1;
                break;

Replacement in crawl-ref/source/religion.cc at line 2510 [18.804403]

∅:D[45.2809] → [47.258:284]

∅:D[46.6259] → [47.258:284]

B:BD[18.837356] → [47.258:284]

∅:D[47.284] → [18.837385:837425]

∅:D[20.183572] → [18.837385:837425]

B:BD[18.837385] → [18.837385:837425]

B:BD[18.837425] → [20.183573:183600]

B:BD[20.183600] → [47.285:381]

B:BD[47.381] → [48.2524:2538]

B:BD[48.2538] → [12.3695:3828]

∅:D[30.3786] → [47.461:565]

∅:D[12.3828] → [47.461:565]

B:BD[47.461] → [47.461:565]

    case DID_KILL_LIVING:
        switch (you.religion)
        {
        case GOD_ELYVILON:
            // killing only disapproved during prayer
            if (you.duration[DUR_PRAYER])
            {
                simple_god_message(" does not appreciate your shedding blood "
                                   "during prayer!");
                ret = true;
                piety_change = -level;
                penance = level * 2;

[45.2809]

[47.565]

            default:
                break;

Replacement in crawl-ref/source/religion.cc at line 2515 [18.804403]

B:BD[20.183773] → [20.183773:183861]

∅:D[20.183861] → [18.837477:837529]

B:BD[18.837477] → [18.837477:837529]

B:BD[18.837529] → [20.183862:183885]

B:BD[20.183885] → [42.5831:5855]

∅:D[42.5855] → [43.321:346]

B:BD[20.183885] → [43.321:346]

B:BD[43.346] → [38.1064:1130]

        case GOD_KIKUBAAQUDGHA:
        case GOD_YREDELEMNUL:
        case GOD_OKAWARU:
        case GOD_VEHUMET:
        case GOD_MAKHLEB:
        case GOD_TROG:
        case GOD_BEOGH:
        case GOD_LUGONU:
            if (god_hates_attacking_friend(you.religion, victim))

[20.183773]

[38.1130]

        case DID_KILL_UNDEAD:
            switch (you.religion)
            {
            case GOD_SHINING_ONE:
            case GOD_OKAWARU:
            case GOD_VEHUMET:
            case GOD_MAKHLEB:
            case GOD_LUGONU:
                if (god_hates_attacking_friend(you.religion, victim))
                    break;
                simple_god_message(" accepts your kill.");
                retval = true;
                // Holy gods are easier to please this way
                if (random2(level + 18 - (is_good_god(you.religion) ? 0 :
                                          you.experience_level / 2)) > 4)
                    piety_change = 1;

Replacement in crawl-ref/source/religion.cc at line 2534 [18.804403]
∅:D[43.346] → [18.837555:837610]
∅:D[38.1166] → [18.837555:837610]
∅:D[44.1314] → [18.837555:837610]
∅:D[48.2540] → [18.837555:837610]
∅:D[20.183885] → [18.837555:837610]
B:BD[18.837555] → [18.837555:837610]
B:BD[18.837610] → [20.183886:183910]
B:BD[20.183910] → [49.186:254]
∅:D[49.254] → [20.183951:183985]
B:BD[20.183951] → [20.183951:183985]
```
            simple_god_message(" accepts your kill.");
            ret = true;
            if (random2(level + 18 - you.experience_level / 2) > 5)
                piety_change = 1;
```
[48.2540]
[28.652]
```
            default:
                break;
            }
```

Replacement in crawl-ref/source/religion.cc at line 2539 [18.804403]

B:BD[28.672] → [28.672:689]

∅:D[28.689] → [18.837682:837726]

∅:D[20.183985] → [18.837682:837726]

B:BD[18.837682] → [18.837682:837726]

        default:
            break;
        }
        break;

[28.672]

[18.837726]

        case DID_KILL_DEMON:
            switch (you.religion)
            {
            case GOD_SHINING_ONE:
            case GOD_OKAWARU:
            case GOD_MAKHLEB:
            case GOD_TROG:
                if (god_hates_attacking_friend(you.religion, victim))
                    break;

Replacement in crawl-ref/source/religion.cc at line 2549 [18.804403]

B:BD[18.837727] → [47.580:606]

∅:D[47.606] → [18.837755:837795]

∅:D[20.184022] → [18.837755:837795]

B:BD[18.837755] → [18.837755:837795]

B:BD[18.837817] → [18.837817:837847]

B:BD[18.837847] → [20.184023:184049]

∅:D[20.184049] → [18.837847:837873]

B:BD[18.837847] → [18.837847:837873]

B:BD[18.837873] → [50.170:196]

∅:D[50.196] → [43.347:372]

B:BD[18.837899] → [43.347:372]

B:BD[43.372] → [38.1167:1233]

    case DID_KILL_UNDEAD:
        switch (you.religion)
        {
        case GOD_SHINING_ONE:
        case GOD_OKAWARU:
        case GOD_VEHUMET:
        case GOD_MAKHLEB:
        case GOD_LUGONU:
            if (god_hates_attacking_friend(you.religion, victim))

[18.837727]

[38.1233]

                simple_god_message(" accepts your kill.");
                retval = true;
                // Holy gods are easier to please this way
                if (random2(level + 18 - (is_good_god(you.religion) ? 0 :
                                          you.experience_level / 2)) > 3)
                    piety_change = 1;

Replacement in crawl-ref/source/religion.cc at line 2557 [18.804403]

∅:D[43.372] → [18.837925:837980]

∅:D[38.1269] → [18.837925:837980]

∅:D[44.1338] → [18.837925:837980]

∅:D[48.2542] → [18.837925:837980]

B:BD[18.837925] → [18.837925:837980]

B:BD[18.837980] → [20.184050:184074]

B:BD[20.184074] → [49.255:450]

∅:D[49.450] → [20.184115:184149]

B:BD[20.184115] → [20.184115:184149]

            simple_god_message(" accepts your kill.");
            ret = true;
            // Holy gods are easier to please this way
            if (random2(level + 18 - (is_good_god(you.religion) ? 0 :
                                      you.experience_level / 2)) > 4)
                piety_change = 1;

[48.2542]

[28.690]

            default:
                break;
            }

Replacement in crawl-ref/source/religion.cc at line 2562 [18.804403]

B:BD[28.710] → [28.710:727]

        default:

[28.710]

[18.838052]

        case DID_KILL_NATURAL_EVIL:
            if (you.religion == GOD_SHINING_ONE
                && !god_hates_attacking_friend(you.religion, victim))
            {
                simple_god_message(" accepts your kill.");
                retval = true;
                if (random2(level + 18) > 3)
                    piety_change = 1;
            }

Deletion in crawl-ref/source/religion.cc at line 2572 [18.804403]
B:BD[18.838071] → [18.838071:838096]
```
        }
        break;
```

Replacement in crawl-ref/source/religion.cc at line 2573 [18.804403]

B:BD[18.838097] → [51.2627:2652]

∅:D[47.634] → [18.838158:838198]

∅:D[51.2652] → [18.838158:838198]

∅:D[20.184187] → [18.838158:838198]

B:BD[18.838158] → [18.838158:838198]

B:BD[18.838220] → [18.838220:838250]

B:BD[18.838250] → [20.184188:184214]

B:BD[20.184214] → [50.197:223]

B:BD[50.223] → [13.2533:2556]

∅:D[13.2556] → [38.1270:1359]

B:BD[50.223] → [38.1270:1359]

    case DID_KILL_DEMON:
        switch (you.religion)
        {
        case GOD_SHINING_ONE:
        case GOD_OKAWARU:
        case GOD_MAKHLEB:
        case GOD_TROG:
            if (god_hates_attacking_friend(you.religion, victim))
                break;

[18.838097]

[48.2543]

        case DID_KILL_CHAOTIC:
            if (you.religion == GOD_ZIN
                && !god_hates_attacking_friend(you.religion, victim))
            {
                simple_god_message(" appreciates your killing of a spawn of "
                                   "chaos.");
                retval = true;
                if (random2(level + 18) > 3)
                    piety_change = 1;
            }
            break;

Replacement in crawl-ref/source/religion.cc at line 2585 [18.804403]

∅:D[50.223] → [20.184214:184293]

∅:D[38.1372] → [20.184214:184293]

∅:D[48.2544] → [20.184214:184293]

B:BD[20.184214] → [20.184214:184293]

B:BD[20.184293] → [49.451:646]

∅:D[49.646] → [20.184334:184368]

B:BD[20.184334] → [20.184334:184368]

            simple_god_message(" accepts your kill.");
            ret = true;
            // Holy gods are easier to please this way
            if (random2(level + 18 - (is_good_god(you.religion) ? 0 :
                                      you.experience_level / 2)) > 3)
                piety_change = 1;

[48.2544]

[18.838408]

        case DID_KILL_PRIEST:
            if (you.religion == GOD_BEOGH
                && !god_hates_attacking_friend(you.religion, victim))
            {
                simple_god_message(" appreciates your killing of a heretic "
                                   "priest.");
                retval = true;
                if (random2(level + 10) > 5)
                    piety_change = 1;
            }

Replacement in crawl-ref/source/religion.cc at line 2597 [18.804403]

B:BD[28.729] → [28.729:746]

        default:

[28.729]

[28.746]

        case DID_KILL_WIZARD:
            if (you.religion == GOD_TROG
                && !god_hates_attacking_friend(you.religion, victim))
            {
                simple_god_message(" appreciates your killing of a magic "
                                   "user.");
                retval = true;
                if (random2(level + 10) > 5)
                    piety_change = 1;
            }

Replacement in crawl-ref/source/religion.cc at line 2608 [18.804403]

∅:D[28.765] → [18.838427:838452]

B:BD[18.838427] → [18.838427:838452]

        }
        break;

[28.765]

[52.2529]


        // Note that holy deaths are special, they are always noticed...
        // If you or any friendly kills one, you'll get the credit or
        // the blame.
        case DID_KILL_HOLY:
        case DID_HOLY_KILLED_BY_SERVANT:
            switch (you.religion)
            {
            case GOD_ZIN:
            case GOD_SHINING_ONE:
            case GOD_ELYVILON:
                if (testbits(victim->flags, MF_CREATED_FRIENDLY)
                    || testbits(victim->flags, MF_WAS_NEUTRAL))
                {
                    level *= 3;
                    penance = level;
                }
                piety_change = -level;
                retval = true;
                break;

Replacement in crawl-ref/source/religion.cc at line 2629 [18.804403]

B:BD[52.2530] → [52.2530:2562]

B:BD[52.2562] → [9.2428:2538]

∅:D[9.2538] → [52.2607:2617]

B:BD[52.2607] → [52.2607:2617]

B:BD[18.838453] → [52.2707:2886]

    case DID_KILL_NATURAL_EVIL:
        if (you.religion == GOD_SHINING_ONE
            && !god_hates_attacking_friend(you.religion, victim))
        {
            simple_god_message(" accepts your kill.");
            ret = true;
            if (random2(level + 18) > 3)
                piety_change = 1;
        }
        break;

[52.2530]

[52.2886]

            case GOD_KIKUBAAQUDGHA:
            case GOD_YREDELEMNUL:
            case GOD_MAKHLEB:
            case GOD_LUGONU:
                if (god_hates_attacking_friend(you.religion, victim))
                    break;

Replacement in crawl-ref/source/religion.cc at line 2636 [18.804403]

B:BD[52.2887] → [53.2652:2679]

B:BD[53.2679] → [9.2539:2641]

∅:D[9.2641] → [52.2961:2971]

B:BD[52.2961] → [52.2961:2971]

B:BD[52.3061] → [3.2529:2645]

∅:D[3.2645] → [52.3142:3266]

B:BD[52.3142] → [52.3142:3266]

    case DID_KILL_CHAOTIC:
        if (you.religion == GOD_ZIN
            && !god_hates_attacking_friend(you.religion, victim))
        {
            simple_god_message(" appreciates your killing of a "
                               "spawn of chaos.");
            ret = true;
            if (random2(level + 18) > 3)
                piety_change = 1;
        }
        break;

[52.2887]

[52.3266]

                if (thing_done == DID_KILL_HOLY)
                    simple_god_message(" accepts your kill.");
                else
                    simple_god_message(" accepts your collateral kill.");
                retval = true;
                if (random2(level + 18) > 2)
                    piety_change = 1;

Replacement in crawl-ref/source/religion.cc at line 2644 [18.804403]

∅:D[52.3267] → [47.635:661]

B:BD[18.838453] → [47.635:661]

B:BD[47.661] → [38.1373:1477]

∅:D[38.1477] → [42.5931:5941]

B:BD[42.5931] → [42.5931:5941]

B:BD[42.5941] → [2.162:278]

∅:D[2.278] → [42.6023:6147]

B:BD[42.6023] → [42.6023:6147]

    case DID_KILL_PRIEST:
        if (you.religion == GOD_BEOGH
            && !god_hates_attacking_friend(you.religion, victim))
        {
            simple_god_message(" appreciates your killing of a "
                               "heretic priest.");
            ret = true;
            if (random2(level + 10) > 5)
                piety_change = 1;
        }
        break;

[52.3267]

[48.2545]

                if (you.religion == GOD_YREDELEMNUL
                    && thing_done == DID_KILL_HOLY)
                {
                    simple_god_message(" appreciates your killing of a holy "
                                       "being.");
                    retval = true;
                    if (random2(level + 10) > 5)
                        piety_change = 1;
                }
                break;

Replacement in crawl-ref/source/religion.cc at line 2655 [18.804403]

∅:D[48.2546] → [47.662:688]

B:BD[42.6156] → [47.662:688]

B:BD[47.688] → [38.1478:1581]

∅:D[38.1581] → [18.838612:838622]

B:BD[18.838612] → [18.838612:838622]

B:BD[20.184505] → [20.184505:184682]

∅:D[20.184682] → [18.838776:838801]

B:BD[18.838776] → [18.838776:838801]

    case DID_KILL_WIZARD:
        if (you.religion == GOD_TROG
            && !god_hates_attacking_friend(you.religion, victim))
        {
            simple_god_message(" appreciates your killing of a magic user.");
            ret = true;
            if (random2(level + 10) > 5)
                piety_change = 1;
        }
        break;

[48.2546]

[18.838801]

            default:
                break;
            }
            break;

Replacement in crawl-ref/source/religion.cc at line 2660 [18.804403]

B:BD[18.838802] → [54.2674:2743]

B:BD[54.2743] → [55.2524:2608]

B:BD[54.2781] → [54.2781:2805]

B:BD[54.2805] → [56.2431:2468]

∅:D[56.2468] → [18.838880:838920]

∅:D[57.2576] → [18.838880:838920]

∅:D[54.2805] → [18.838880:838920]

∅:D[20.184893] → [18.838880:838920]

B:BD[18.838880] → [18.838880:838920]

B:BD[18.838920] → [20.184894:184973]

B:BD[20.184973] → [27.2784:2905]

    // Note that holy deaths are special, they are always noticed...
    // If you or any friendly kills one, you'll get the credit or the
    // blame.
    case DID_KILL_HOLY:
    case DID_HOLY_KILLED_BY_SERVANT:
        switch (you.religion)
        {
        case GOD_ZIN:
        case GOD_SHINING_ONE:
        case GOD_ELYVILON:
            if (testbits(victim->flags, MF_CREATED_FRIENDLY)
                || testbits(victim->flags, MF_WAS_NEUTRAL))

[18.838802]

[27.2905]

        // Undead slave is any friendly undead monster.  Kiku and Yred pay
        // attention to the undead, and both like the death of living
        // things.
        case DID_LIVING_KILLED_BY_UNDEAD_SLAVE:
            switch (you.religion)

Replacement in crawl-ref/source/religion.cc at line 2666 [18.804403]

B:BD[27.2919] → [27.2919:2947]

B:BD[27.2947] → [15.2431:2464]

                level *= 3;
                penance = level;

[27.2919]

[27.3018]

            case GOD_KIKUBAAQUDGHA:
            case GOD_YREDELEMNUL:
            case GOD_VEHUMET:
            case GOD_MAKHLEB:
            case GOD_LUGONU:
                simple_god_message(" accepts your slave's kill.");
                retval = true;
                if (random2(level + 10 - you.experience_level/3) > 5)
                    piety_change = 1;
                break;
            default:
                break;

Deletion in crawl-ref/source/religion.cc at line 2679 [18.804403]
∅:D[27.3032] → [20.184997:185032]
B:BD[20.184997] → [20.184997:185032]
B:BD[20.185099] → [20.185099:185123]
```
            piety_change = -level;
            ret = true;
```

Replacement in crawl-ref/source/religion.cc at line 2681 [18.804403]

B:BD[18.839181] → [20.185124:185212]

B:BD[20.185212] → [43.373:398]

B:BD[43.398] → [58.2428:2494]

        case GOD_KIKUBAAQUDGHA:
        case GOD_YREDELEMNUL:
        case GOD_MAKHLEB:
        case GOD_LUGONU:
            if (god_hates_attacking_friend(you.religion, victim))

[18.839181]

[58.2494]

        // Servants are currently any friendly or charmed monster, excluding
        // undead, which are handled above.
        case DID_LIVING_KILLED_BY_SERVANT:
            switch (you.religion)
            {
            case GOD_KIKUBAAQUDGHA: // note: reapers aren't undead
            case GOD_VEHUMET:
            case GOD_MAKHLEB:
            case GOD_TROG:
            case GOD_BEOGH:
            case GOD_LUGONU:
                simple_god_message(" accepts your collateral kill.");
                retval = true;
                if (random2(level + 10 - you.experience_level/3) > 5)
                    piety_change = 1;

Replacement in crawl-ref/source/religion.cc at line 2697 [18.804403]

B:BD[58.2517] → [58.2517:2518]

∅:D[58.2518] → [59.2673:2759]

B:BD[43.398] → [59.2673:2759]

B:BD[59.2759] → [60.2621:2700]

B:BD[60.2700] → [58.2519:2559]

B:BD[18.839328] → [20.185395:185494]


            simple_god_message(
                make_stringf(" accepts your %skill.",
                             thing_done == DID_KILL_HOLY ? "" : "collateral ")
                             .c_str());
            ret = true;
            if (random2(level + 18) > 2)
                piety_change = 1;

[58.2517]

[61.2516]

            default:
                break;
            }
            break;

Replacement in crawl-ref/source/religion.cc at line 2702 [18.804403]

B:BD[61.2517] → [61.2517:2597]

            if (you.religion == GOD_YREDELEMNUL && thing_done == DID_KILL_HOLY)

[61.2517]

[61.2597]

        case DID_UNDEAD_KILLED_BY_SERVANT:
            switch (you.religion)

Replacement in crawl-ref/source/religion.cc at line 2705 [18.804403]

B:BD[61.2611] → [61.2611:2804]

                simple_god_message(" appreciates your killing of a "
                                   "holy being.");
                ret = true;
                if (random2(level + 10) > 5)

[61.2611]

[61.2804]

            case GOD_SHINING_ONE:
            case GOD_VEHUMET:
            case GOD_MAKHLEB:
            case GOD_LUGONU:
                simple_god_message(" accepts your collateral kill.");
                retval = true;
                if (random2(level + 10 - (is_good_god(you.religion) ? 0 :
                                          you.experience_level/3)) > 5)
                {

Insertion in crawl-ref/source/religion.cc at line 2715 [18.804403]

[61.2842]

                }
                break;
            default:
                break;

Replacement in crawl-ref/source/religion.cc at line 2722 [18.804403]

B:BD[28.767] → [28.767:784]

        default:

[28.767]

[28.784]

        case DID_DEMON_KILLED_BY_SERVANT:
            switch (you.religion)
            {
            case GOD_SHINING_ONE:
            case GOD_MAKHLEB:
            case GOD_TROG:
                simple_god_message(" accepts your collateral kill.");
                retval = true;
                if (random2(level + 10 - (is_good_god(you.religion) ? 0 :
                                          you.experience_level/3)) > 5)
                {
                    piety_change = 1;
                }
                break;
            default:
                break;
            }

Deletion in crawl-ref/source/religion.cc at line 2740 [18.804403]
∅:D[28.803] → [18.839388:839398]
B:BD[18.839388] → [18.839388:839398]
B:BD[18.839528] → [18.839528:839543]
```
        }
        break;
```

Replacement in crawl-ref/source/religion.cc at line 2741 [18.804403]

B:BD[18.839544] → [6.2528:2680]

∅:D[6.2680] → [20.185633:185677]

B:BD[20.185633] → [20.185633:185677]

∅:D[20.185677] → [18.839578:839680]

B:BD[18.839578] → [18.839578:839680]

B:BD[18.839680] → [62.2428:2454]

∅:D[62.2454] → [63.269:320]

B:BD[63.269] → [63.269:320]

B:BD[63.320] → [11.2428:2491]

∅:D[11.2491] → [64.2428:2571]

∅:D[62.2796] → [64.2428:2571]

B:BD[18.839769] → [64.2428:2571]

∅:D[65.2449] → [28.823:840]

B:BD[28.823] → [28.823:840]

∅:D[28.840] → [18.839842:839886]

∅:D[20.185777] → [18.839842:839886]

B:BD[18.839842] → [18.839842:839886]

    // Undead slave is any friendly undead monster.  Kiku and Yred pay
    // attention to the undead, and both like the death of living
    // things.
    case DID_LIVING_KILLED_BY_UNDEAD_SLAVE:
        switch (you.religion)
        {
        case GOD_KIKUBAAQUDGHA:
        case GOD_YREDELEMNUL:
        case GOD_VEHUMET:
        case GOD_MAKHLEB:
        case GOD_LUGONU:
            simple_god_message(" accepts your slave's kill.");
            ret = true;
            if (random2(level + 10 - you.experience_level/3) > 5)
                piety_change = 1;
            break;
        default:
            break;
        }
        break;

[18.839544]

[18.839886]

        case DID_NATURAL_EVIL_KILLED_BY_SERVANT:
            if (you.religion == GOD_SHINING_ONE)
            {
                simple_god_message(" accepts your collateral kill.");
                retval = true;

Replacement in crawl-ref/source/religion.cc at line 2747 [18.804403]

B:BD[18.839887] → [6.2681:2794]

∅:D[6.2794] → [20.185941:185980]

B:BD[20.185941] → [20.185941:185980]

∅:D[20.185980] → [18.839916:839956]

B:BD[18.839916] → [18.839916:839956]

B:BD[18.839956] → [20.185981:186044]

∅:D[20.186044] → [18.839956:840008]

B:BD[18.839956] → [18.839956:840008]

B:BD[18.840008] → [5.2528:2551]

∅:D[5.2551] → [42.6157:6181]

B:BD[18.840008] → [42.6157:6181]

∅:D[42.6181] → [43.399:424]

B:BD[18.840008] → [43.399:424]

∅:D[43.424] → [18.840008:840074]

∅:D[44.1386] → [18.840008:840074]

B:BD[18.840008] → [18.840008:840074]

B:BD[18.840074] → [20.186045:186069]

B:BD[20.186069] → [49.714:780]

∅:D[49.780] → [20.186110:186163]

B:BD[20.186110] → [20.186110:186163]

B:BD[20.186163] → [28.841:858]

    // Servants are currently any friendly or charmed monster, excluding
    // undead, which are handled above.
    case DID_LIVING_KILLED_BY_SERVANT:
        switch (you.religion)
        {
        case GOD_KIKUBAAQUDGHA: // note: reapers aren't undead
        case GOD_VEHUMET:
        case GOD_MAKHLEB:
        case GOD_TROG:
        case GOD_BEOGH:
        case GOD_LUGONU:
            simple_god_message(" accepts your collateral kill.");
            ret = true;
            if (random2(level + 10 - you.experience_level/3) > 5)
                piety_change = 1;
            break;
        default:

[18.839887]

[28.858]

                if (random2(level + 10) > 5)
                    piety_change = 1;
            }

Deletion in crawl-ref/source/religion.cc at line 2751 [18.804403]
∅:D[28.877] → [20.186163:186188]
B:BD[20.186163] → [20.186163:186188]
```
        }
        break;
```

Replacement in crawl-ref/source/religion.cc at line 2752 [18.804403]

B:BD[18.840075] → [20.186189:186268]

B:BD[20.186290] → [20.186290:186372]

B:BD[20.186372] → [43.425:450]

∅:D[43.450] → [20.186372:186462]

∅:D[44.1410] → [20.186372:186462]

B:BD[20.186372] → [20.186372:186462]

B:BD[20.186462] → [49.781:919]

    case DID_UNDEAD_KILLED_BY_SERVANT:
        switch (you.religion)
        {
        case GOD_SHINING_ONE:
        case GOD_VEHUMET:
        case GOD_MAKHLEB:
        case GOD_LUGONU:
            simple_god_message(" accepts your collateral kill.");
            ret = true;
            if (random2(level + 10 - (is_good_god(you.religion) ? 0 :
                                      you.experience_level/3)) > 5)

[18.840075]

[58.2560]

        case DID_SPELL_MEMORISE:
            if (you.religion == GOD_TROG)

Replacement in crawl-ref/source/religion.cc at line 2755 [18.804403]

∅:D[49.919] → [20.186503:186537]

∅:D[58.2574] → [20.186503:186537]

B:BD[20.186503] → [20.186503:186537]

                piety_change = 1;

[58.2574]

[58.2575]

                penance = level * 10;
                piety_change = -penance;
                retval = true;

Deletion in crawl-ref/source/religion.cc at line 2760 [18.804403]
B:BD[28.897] → [28.897:914]
∅:D[28.914] → [18.840147:840191]
∅:D[20.186537] → [18.840147:840191]
B:BD[18.840147] → [18.840147:840191]
```
        default:
            break;
        }
        break;
```

Replacement in crawl-ref/source/religion.cc at line 2761 [18.804403]

B:BD[18.840192] → [48.2746:2784]

∅:D[48.2784] → [18.840213:840253]

∅:D[20.186577] → [18.840213:840253]

B:BD[18.840213] → [18.840213:840253]

B:BD[20.186600] → [20.186600:186630]

B:BD[66.2454] → [66.2454:2480]

B:BD[66.2480] → [13.2557:2580]

∅:D[66.2480] → [20.186630:186720]

∅:D[13.2580] → [20.186630:186720]

B:BD[20.186630] → [20.186630:186720]

B:BD[20.186720] → [66.2481:2619]

    case DID_DEMON_KILLED_BY_SERVANT:
        switch (you.religion)
        {
        case GOD_SHINING_ONE:
        case GOD_MAKHLEB:
        case GOD_TROG:
            simple_god_message(" accepts your collateral kill.");
            ret = true;
            if (random2(level + 10 - (is_good_god(you.religion) ? 0 :
                                      you.experience_level/3)) > 5)

[18.840192]

[66.2619]

        case DID_SPELL_CASTING:
            if (you.religion == GOD_TROG)

Replacement in crawl-ref/source/religion.cc at line 2764 [18.804403]

∅:D[66.2633] → [20.186761:186795]

B:BD[20.186761] → [20.186761:186795]

                piety_change = 1;

[66.2633]

[66.2634]

                piety_change = -level;
                penance = level * 5;
                retval = true;

Deletion in crawl-ref/source/religion.cc at line 2768 [18.804403]
∅:D[66.2648] → [28.915:951]
B:BD[20.186795] → [28.915:951]
```
            break;
        default:
```

Deletion in crawl-ref/source/religion.cc at line 2769 [18.804403]

B:BD[18.840335] → [52.3268:3484]

B:BD[52.3484] → [48.2785:2786]

∅:D[48.2786] → [52.3497:3572]

B:BD[52.3497] → [52.3497:3572]

∅:D[52.3572] → [18.840335:840360]

B:BD[18.840335] → [18.840335:840360]

B:BD[18.840360] → [20.186796:187188]

        }
        break;
    case DID_NATURAL_EVIL_KILLED_BY_SERVANT:
        if (you.religion == GOD_SHINING_ONE)
        {
            simple_god_message(" accepts your collateral kill.");
            ret = true;
            if (random2(level + 10) > 5)
                piety_change = 1;
        }
        break;
    case DID_SPELL_MEMORISE:
        if (you.religion == GOD_TROG)
        {
            penance = level * 10;
            piety_change = -penance;
            ret = true;
        }
        break;
    case DID_SPELL_CASTING:
        if (you.religion == GOD_TROG)
        {
            piety_change = -level;
            penance = level * 5;
            ret = true;
        }
        break;

Replacement in crawl-ref/source/religion.cc at line 2770 [18.804403]

B:BD[20.187189] → [48.2787:2816]

∅:D[48.2816] → [20.187222:187271]

B:BD[20.187222] → [20.187222:187271]

B:BD[20.187271] → [48.2817:2894]

∅:D[48.2894] → [20.187349:187528]

B:BD[20.187349] → [20.187349:187528]

B:BD[20.187528] → [48.2895:3041]

∅:D[48.3041] → [20.187676:188090]

B:BD[20.187676] → [20.187676:188090]

    case DID_SPELL_PRACTISE:
        // Like CAST, but for skill advancement.
        // Level is number of skill points gained... typically 10 * exerise,
        // but may be more/less if the skill is at 0 (INT adjustment), or
        // if the PC's pool is low and makes change.
        if (you.religion == GOD_SIF_MUNA)
        {
            // Old curve: random2(12) <= spell-level, this is similar,
            // but faster at low levels (to help ease things for low level
            // Power averages about (level * 20 / 3) + 10 / 3 now.  Also
            // note that spell skill practise comes just after XP gain, so
            // magical kills tend to do both at the same time (unlike melee).
            // This means high level spells probably work pretty much like
            // they used to (use spell, get piety).
            piety_change = div_rand_round( level + 10, 80 );

[20.187189]

[20.188090]

        case DID_SPELL_PRACTISE:
            // Like CAST, but for skill advancement.
            // Level is number of skill points gained...
            // typically 10 * exercise, but may be more/less if the
            // skill is at 0 (INT adjustment), or if the PC's pool is
            // low and makes change.
            if (you.religion == GOD_SIF_MUNA)
            {
                // Old curve: random2(12) <= spell-level, this is
                // similar, but faster at low levels (to help ease
                // things for low level spells).  Power averages about
                // (level * 20 / 3) + 10 / 3 now.  Also note that spell
                // skill practise comes just after XP gain, so magical
                // kills tend to do both at the same time (unlike
                // melee).  This means high level spells probably work
                // pretty much like they used to (use spell, get piety).
                piety_change = div_rand_round(level + 10, 80);

Replacement in crawl-ref/source/religion.cc at line 2788 [18.804403]

B:BD[20.188115] → [20.188115:188234]

            mprf(MSGCH_DIAGNOSTICS, "Spell practise, level: %d, dpiety: %d",
                    level, piety_change);

[20.188115]

[20.188234]

                mprf(MSGCH_DIAGNOSTICS, "Spell practise, level: %d, dpiety: %d",
                        level, piety_change);

Replacement in crawl-ref/source/religion.cc at line 2791 [18.804403]

B:BD[20.188241] → [20.188241:188426]

            ret = true;
        }
        break;
    case DID_CARDS:
        if (you.religion == GOD_NEMELEX_XOBEH)
        {
            piety_change = level;
            ret = true;

[20.188241]

[67.3919]

                retval = true;
            }
            break;

Replacement in crawl-ref/source/religion.cc at line 2795 [18.804403]

B:BD[67.3920] → [8.2637:2895]

∅:D[8.2895] → [67.4293:4321]

B:BD[67.4293] → [67.4293:4321]

B:BD[67.4321] → [68.5070:5097]

            // level == 0: stacked, deck not used up
            // level == 1: used up or nonstacked
            // level == 2: used up and nonstacked
            // and there's a 1/3 chance of an additional bonus point
            // for nonstacked cards.
            int chance = 0;
            switch (level)

[67.3920]

[67.4347]

        case DID_CARDS:
            if (you.religion == GOD_NEMELEX_XOBEH)

Replacement in crawl-ref/source/religion.cc at line 2798 [18.804403]

B:BD[67.4361] → [67.4361:4560]

            case 0: chance = 0;   break;
            case 1: chance = 40;  break;
            case 2: chance = 70;  break;
            default:
            case 3: chance = 100; break;
            }

[67.4361]

[67.4560]

                piety_change = level;
                retval = true;
                // level == 0: stacked, deck not used up
                // level == 1: used up or nonstacked
                // level == 2: used up and nonstacked
                // and there's a 1/3 chance of an additional bonus point
                // for nonstacked cards.
                int chance = 0;
                switch (level)
                {
                case 0: chance = 0;   break;
                case 1: chance = 40;  break;
                case 2: chance = 70;  break;
                default:
                case 3: chance = 100; break;
                }

Replacement in crawl-ref/source/religion.cc at line 2816 [18.804403]

B:BD[67.4561] → [68.5098:5196]

∅:D[68.5196] → [67.4638:4706]

B:BD[67.4638] → [67.4638:4706]

            if (x_chance_in_y(chance, 100)
                && you.attribute[ATTR_CARD_COUNTDOWN])
            {
                you.attribute[ATTR_CARD_COUNTDOWN]--;

[67.4561]

[67.4706]

                if (x_chance_in_y(chance, 100)
                    && you.attribute[ATTR_CARD_COUNTDOWN])
                {
                    you.attribute[ATTR_CARD_COUNTDOWN]--;

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

B:BD[67.4758] → [67.4758:4880]

                mprf(MSGCH_DIAGNOSTICS, "Countdown down to %d",
                     you.attribute[ATTR_CARD_COUNTDOWN]);

[67.4758]

[67.4880]

                    mprf(MSGCH_DIAGNOSTICS, "Countdown down to %d",
                         you.attribute[ATTR_CARD_COUNTDOWN]);

Insertion in crawl-ref/source/religion.cc at line 2824 [18.804403]
[67.4887]
[67.4887]
```
                }
```
Replacement in crawl-ref/source/religion.cc at line 2826 [18.804403]
∅:D[67.4901] → [20.188426:188451]
B:BD[20.188426] → [20.188426:188451]
```
        }
        break;
```
[67.4901]
[20.188451]
```
            break;
```

Replacement in crawl-ref/source/religion.cc at line 2828 [18.804403]

B:BD[20.188452] → [69.2697:2725]

∅:D[69.2725] → [70.5814:5895]

B:BD[20.188452] → [70.5814:5895]

B:BD[70.5895] → [12.3829:3888]

    case DID_CAUSE_GLOWING:
    case DID_DELIBERATE_MUTATING:
        if (you.religion == GOD_ZIN)
        {
            if (!known && thing_done != DID_CAUSE_GLOWING)

[20.188452]

[30.3811]

        case DID_CAUSE_GLOWING:
        case DID_DELIBERATE_MUTATING:
            if (you.religion == GOD_ZIN)

Replacement in crawl-ref/source/religion.cc at line 2832 [18.804403]

B:BD[30.3825] → [12.3889:4022]

∅:D[12.4022] → [30.3956:3979]

B:BD[30.3956] → [30.3956:3979]

                simple_god_message(" forgives your inadvertent chaotic act, "
                                   "just this once.");
                break;

[30.3825]

[30.3979]

                if (!known && thing_done != DID_CAUSE_GLOWING)
                {
                    simple_god_message(" forgives your inadvertent chaotic "
                                       "act, just this once.");
                    break;
                }
                else
                {
                    static long last_glowing_lecture = -1L;
                    if (last_glowing_lecture != you.num_turns)
                    {
                        simple_god_message(" does not appreciate the mutagenic "
                                           "glow surrounding you!");
                        last_glowing_lecture = you.num_turns;
                    }
                }
                piety_change = -level;
                retval = true;

Replacement in crawl-ref/source/religion.cc at line 2851 [18.804403]

B:BD[30.3993] → [12.4023:4040]

            else

[30.3993]

[69.2775]

            break;
        // level depends on intelligence: normal -> 1, high -> 2
        // cannibalism is still worse
        case DID_EAT_SOULED_BEING:
            if (you.religion == GOD_ZIN)

Replacement in crawl-ref/source/religion.cc at line 2858 [18.804403]

B:BD[69.2789] → [69.2789:2922]

B:BD[69.2922] → [30.4048:4190]

∅:D[30.4190] → [69.3064:3140]

B:BD[69.3064] → [69.3064:3140]

                static long last_glowing_lecture = -1L;
                if (last_glowing_lecture != you.num_turns)
                {
                    simple_god_message(" does not appreciate the mutagenic "
                                       "glow surrounding you!");
                    last_glowing_lecture = you.num_turns;
                }

[69.2789]

[70.6021]

                piety_change = -level * 5;
                if (level > 1)
                    penance = 5;
                retval = true;

Replacement in crawl-ref/source/religion.cc at line 2863 [18.804403]

B:BD[70.6035] → [70.6035:6119]

            piety_change = -level;
            ret = true;
        }
        break;

[70.6035]

[70.6119]

            break;

Replacement in crawl-ref/source/religion.cc at line 2865 [18.804403]

B:BD[70.6120] → [69.3239:3334]

∅:D[69.3334] → [70.6120:6198]

B:BD[70.6120] → [70.6120:6198]

B:BD[70.6198] → [69.3335:3430]

∅:D[69.3430] → [70.6266:6315]

B:BD[70.6266] → [70.6266:6315]

    // level depends on intelligence: normal -> 1, high -> 2
    // cannibalism is still worse
    case DID_EAT_SOULED_BEING:
        if (you.religion == GOD_ZIN)
        {
            piety_change = -level * 5;
            if (level > 1)
                penance = 5;
            ret = true;
        }
        break;

[70.6120]

[57.2577]

        case DID_DESTROY_ORCISH_IDOL:
            if (you.religion == GOD_BEOGH)
            {
                piety_change = -level;
                penance = level * 3;
                retval = true;
            }
            break;

Replacement in crawl-ref/source/religion.cc at line 2874 [18.804403]

B:BD[57.2578] → [57.2578:2612]

B:BD[70.6316] → [57.2643:2692]

B:BD[57.2692] → [17.2547:2615]

∅:D[17.2615] → [57.2764:2788]

B:BD[57.2764] → [57.2764:2788]

    case DID_DESTROY_ORCISH_IDOL:
        if (you.religion == GOD_BEOGH)
        {
            piety_change = -level;
            penance = level * 3;
            ret = true;

[57.2578]

[57.2788]

        case DID_STABBING:                          // unused
        case DID_STIMULANTS:                        // unused
        case DID_EAT_MEAT:                          // unused
        case DID_CREATE_LIFE:                       // unused
        case DID_SPELL_NONUTILITY:                  // unused
        case NUM_CONDUCTS:
            break;

Deletion in crawl-ref/source/religion.cc at line 2882 [18.804403]
B:BD[57.2798] → [57.2798:2813]
```
        break;
```

Replacement in crawl-ref/source/religion.cc at line 2883 [18.804403]

∅:D[57.2814] → [71.2528:2586]

B:BD[70.6316] → [71.2528:2586]

∅:D[71.2586] → [20.188452:188568]

∅:D[27.3091] → [20.188452:188568]

∅:D[70.6316] → [20.188452:188568]

B:BD[20.188452] → [20.188452:188568]

B:BD[20.188568] → [72.2431:2489]

∅:D[72.2489] → [20.188742:188800]

B:BD[20.188742] → [20.188742:188800]

B:BD[20.188800] → [73.283:306]

∅:D[73.306] → [20.188813:188828]

B:BD[20.188813] → [20.188813:188828]

    case DID_STABBING:                          // unused
    case DID_STIMULANTS:                        // unused
    case DID_EAT_MEAT:                          // unused
    case DID_CREATE_LIFE:                       // unused
    case DID_SPELL_NONUTILITY:                  // unused
    case NUM_CONDUCTS:
        break;

[57.2814]

[18.840418]

        if (piety_change > 0)
            gain_piety(piety_change);
        else
            _dock_piety(-piety_change, penance);

Deletion in crawl-ref/source/religion.cc at line 2889 [18.804403]
B:BD[20.188830] → [20.188830:188856]
B:BD[20.188856] → [14.2431:2465]
∅:D[14.2465] → [41.2584:2593]
B:BD[20.188892] → [41.2584:2593]
B:BD[41.2593] → [16.2486:2531]
∅:D[38.1626] → [20.189321:189322]
∅:D[16.2531] → [20.189321:189322]
∅:D[74.3151] → [20.189321:189322]
∅:D[75.6864] → [20.189321:189322]
B:BD[20.189321] → [20.189321:189322]
```
    if (piety_change > 0)
        gain_piety(piety_change);
    else
        _dock_piety(-piety_change, penance);
```
Replacement in crawl-ref/source/religion.cc at line 2890 [18.804403]
B:BD[20.189644] → [20.189644:189657]
```
    if (ret)
```
[20.189644]
[20.189657]
```
    if (retval)
```
Replacement in crawl-ref/source/religion.cc at line 2920 [18.804403]
∅:D[22.4281] → [20.190552:190570]
B:BD[20.190552] → [20.190552:190570]
```
    return (ret);
```
[76.2519]
[77.2670]
```
    return (retval);
```

Replacement in crawl-ref/source/religion.cc at line 3033 [18.804403]

B:BD[78.29976] → [79.218:281]

    if (you.religion == GOD_XOM || you.religion == GOD_NO_GOD)

[78.29976]

[78.30009]

    if (you.religion == GOD_NO_GOD || you.religion == GOD_XOM)