fiddlerwoaroof/crawl - Change LQL6F3NIIER36EKJ5XE2LVIH56R75ENH6L2UJDD3RKXYUBYMJRCAC

Per jpeg's suggestion, add a "desecrate orcish remains" conduct for

Beogh. This will cause a small piety hit, but no penance, for butchering orc corpses, or for using non-area necromantic spells on orcish remains which can (a) destroy them without creating zombified orcs, or (b) turn them non-orcish (Fulsome Distillation, Sublimation of Blood, Bone Shards, and Twisted Resurrection).

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

Created by dolorous on March 15, 2009

LQL6F3NIIER36EKJ5XE2LVIH56R75ENH6L2UJDD3RKXYUBYMJRCAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells4.cc at line 1326 [8.436250]
[8.496257]
[8.496257]
```
    const bool was_orc = (mons_species(mitm[corpse].plus) == MONS_ORC);
```

Insertion in crawl-ref/source/spells4.cc at line 1345 [8.436250]

[6.1077]

[8.501322]


    if (was_orc)
        did_god_conduct(DID_DESECRATE_ORCISH_REMAINS, 2);

Insertion in crawl-ref/source/spells3.cc at line 293 [8.531613]
[8.538890]
[8.538936]
```
    const bool was_orc = (mons_species(you.weapon()->plus) == MONS_ORC);
```

Insertion in crawl-ref/source/spells3.cc at line 301 [8.531613]

[6.1392]


        if (was_orc)
            did_god_conduct(DID_DESECRATE_ORCISH_REMAINS, 2);

Insertion in crawl-ref/source/spells3.cc at line 319 [8.531613]

[6.1507]

[8.539614]

        if (was_orc)
            did_god_conduct(DID_DESECRATE_ORCISH_REMAINS, 2);

Insertion in crawl-ref/source/spells3.cc at line 348 [8.531613]

[9.798]

[10.752]


            if (mons_species(you.inv[wielded].plus) == MONS_ORC)
                did_god_conduct(DID_DESECRATE_ORCISH_REMAINS, 2);

Insertion in crawl-ref/source/spells3.cc at line 1053 [8.531613]
[11.596]
[11.596]
```
    int how_many_orcs = 0;
```

Insertion in crawl-ref/source/spells3.cc at line 1063 [8.531613]

[11.911]

[12.359]

            if (mons_species(si->plus) == MONS_ORC)
                how_many_orcs++;

Insertion in crawl-ref/source/spells3.cc at line 1097 [8.531613]

[11.1900]


        if (how_many_orcs > 0)
            did_god_conduct(DID_DESECRATE_ORCISH_REMAINS, 2 * how_many_orcs);

Insertion in crawl-ref/source/spells3.cc at line 1123 [8.531613]

[11.2625]


        if (how_many_orcs > 0)
            did_god_conduct(DID_DESECRATE_ORCISH_REMAINS, 2 * how_many_orcs);

Insertion in crawl-ref/source/spells3.cc at line 1135 [8.531613]

[11.2898]

    if (how_many_orcs > 0)
        did_god_conduct(DID_DESECRATE_ORCISH_REMAINS, 2 * how_many_orcs);

Replacement in crawl-ref/source/religion.cc at line 533 [8.804403]

B:BD[13.2656] → [3.2597:2686]

                 verbose ? " (by standing over their corpses and <w>p</w>raying)" : "");

[13.2656]

[14.2940]

                 verbose ? " (by standing over their remains and <w>p</w>raying)" : "");

Insertion in crawl-ref/source/religion.cc at line 787 [8.804403]
[2.2467]
[2.2467]
```
        dislikes.push_back("you desecrate orcish remains");
```

Insertion in crawl-ref/source/religion.cc at line 3075 [8.804403]

[15.11486]

[16.6021]

            }
            break;
        case DID_DESECRATE_ORCISH_REMAINS:
            if (you.religion == GOD_BEOGH)
            {
                piety_change = -level;
                retval = true;

Replacement in crawl-ref/source/religion.cc at line 3128 [8.804403]

∅:D[15.11585] → [17.3343:3396]

B:BD[17.3343] → [17.3343:3396]

                "Destroy Orcish Idol", "Create Life"

[15.11585]

[17.3396]

                "Desecrate Orcish Remains", "Destroy Orcish Idol",
                "Create Life"

Deletion in crawl-ref/source/religion.cc at line 6243 [8.804403]
B:BD[14.4432] → [3.2687:2738]
```
                   && item.sub_type == CORPSE_BODY
```

Replacement in crawl-ref/source/religion.cc at line 6298 [8.804403]

B:BD[18.4142] → [5.2601:2841]

        if ((item_orig == MONS_SAINT_ROKA && !one_chance_in(5))
            || (item_orig == MONS_ORC_HIGH_PRIEST && x_chance_in_y(3, 5))
            || (item_orig == MONS_ORC_PRIEST && x_chance_in_y(2, 5))
            || one_chance_in(5))

[18.4142]

[14.4809]

        int chance = 4;
        if (item_orig == MONS_SAINT_ROKA)
            chance += 12;
        else if (item_orig == MONS_ORC_HIGH_PRIEST)
            chance += 8;
        else if (item_orig == MONS_ORC_PRIEST)
            chance += 4;
        if (food_is_rotten(item))
            chance--;
        else if (item.sub_type == CORPSE_SKELETON)
            chance -= 2;
        if (x_chance_in_y(chance, 20))

Replacement in crawl-ref/source/religion.cc at line 6548 [8.804403]

B:BD[14.5236] → [4.2597:2663]

            simple_god_message(" only cares about orc corpses!");

[14.5236]

[14.5304]

            simple_god_message(" only cares about orcish remains!");

Insertion in crawl-ref/source/enum.h at line 722 [8.3287960]
[6.4283]
[6.4283]
```
    DID_DESECRATE_ORCISH_REMAINS,       // Beogh
```
Insertion in crawl-ref/source/delay.cc at line 1103 [8.3963459]
[7.3153]
[19.3534]
```
        const bool was_orc = (mons_species(item.plus) == MONS_ORC);
```

Insertion in crawl-ref/source/delay.cc at line 1117 [8.3963459]

[20.16464]

[20.16639]


        if (was_orc)
            did_god_conduct(DID_DESECRATE_ORCISH_REMAINS, 2);

Insertion in crawl-ref/source/delay.cc at line 1198 [8.3963459]

[21.9601]

[22.3053]


                const bool was_orc = (mons_species(item.plus) == MONS_ORC);

Insertion in crawl-ref/source/delay.cc at line 1205 [8.3963459]

[6.4586]

[10.16526]


                if (was_orc)
                    did_god_conduct(DID_DESECRATE_ORCISH_REMAINS, 2);

Insertion in crawl-ref/source/delay.cc at line 1239 [8.3963459]

[10.17513]

[19.3842]


                const bool was_orc = (mons_species(item.plus) == MONS_ORC);

Insertion in crawl-ref/source/delay.cc at line 1253 [8.3963459]

[10.17819]

[21.10209]


                if (was_orc)
                    did_god_conduct(DID_DESECRATE_ORCISH_REMAINS, 2);