fiddlerwoaroof/crawl - Change 264FLET5STFALEWUDOEFCR273Y5CY2WZDHL56WHZUAQ635RUN6MAC

[1709687] Fixed Vehumet and Lugonu not accepting kills by undead slaves.

Fixed Lugonu not accepting butchered corpses.

Fixed Elyvilon not being angered by butchery while praying.

Moved item sacrifice messages to the god channel.

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

Created by dshaligram on June 3, 2007

264FLET5STFALEWUDOEFCR273Y5CY2WZDHL56WHZUAQ635RUN6MAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.h at line 37 [4.800304]

[3.64]

[4.804358]

bool god_likes_butchery(god_type god);
bool god_hates_butchery(god_type god);

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

[4.839680]

[4.839706]

        case GOD_VEHUMET:
        case GOD_MAKHLEB:
        case GOD_LUGONU:

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

B:BD[4.880247] → [5.2442:2503]

            mprf("%s%s", mitm[i].name(DESC_CAP_THE).c_str(),

[4.880247]

[2.1290]

            mprf(MSGCH_GOD, "%s%s", mitm[i].name(DESC_CAP_THE).c_str(),

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

B:BD[4.880679] → [5.2551:2612]

            mprf("%s%s", mitm[i].name(DESC_CAP_THE).c_str(),

[4.880679]

[2.1359]

            mprf(MSGCH_GOD, "%s%s", mitm[i].name(DESC_CAP_THE).c_str(),

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

B:BD[4.881095] → [5.2660:2721]

            mprf("%s%s", mitm[i].name(DESC_CAP_THE).c_str(),

[4.881095]

[2.1428]

            mprf(MSGCH_GOD, "%s%s", mitm[i].name(DESC_CAP_THE).c_str(),

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

B:BD[4.881516] → [5.2769:2830]

            mprf("%s%s", mitm[i].name(DESC_CAP_THE).c_str(),

[4.881516]

[2.1497]

            mprf(MSGCH_GOD, "%s%s", mitm[i].name(DESC_CAP_THE).c_str(),

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

[4.884352]


bool god_likes_butchery(god_type god)
{
    return (you.religion == GOD_OKAWARU || you.religion == GOD_MAKHLEB ||
            you.religion == GOD_TROG || you.religion == GOD_LUGONU);
}
bool god_hates_butchery(god_type god)
{
    return (god == GOD_ELYVILON);
}

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

B:BD[4.884385] → [5.2878:2936]

    mprf("%s%s", mitm[corpse].name(DESC_CAP_THE).c_str(),

[4.884385]

[2.1566]

    mprf(MSGCH_GOD, "%s%s", mitm[corpse].name(DESC_CAP_THE).c_str(),

Replacement in crawl-ref/source/message.cc at line 357 [4.1993826]

B:BD[6.556082] → [6.556082:556132]

    do_message_print( channel, 0, format, argp );

[6.556082]

[6.556132]

    do_message_print( channel, channel == MSGCH_GOD? you.religion : 0,
                      format, argp );

Replacement in crawl-ref/source/food.cc at line 305 [4.3043806]

B:BD[7.2367] → [7.2367:2490]

                (you.religion == GOD_OKAWARU || you.religion == GOD_MAKHLEB ||
                 you.religion == GOD_TROG))

[7.2367]

[7.2490]

                god_likes_butchery(you.religion))

Insertion in crawl-ref/source/food.cc at line 317 [4.3043806]

[7.2827]


                if (you.duration[DUR_PRAYER]
                    && god_hates_butchery(you.religion))
                {
                    did_god_conduct(DID_DEDICATED_BUTCHERY, 10);
                }