fiddlerwoaroof/crawl - Change AV3T4BN5IFAAE4CQURI5BKTUW22AKA7DVCTPXM4ZVCI6P62UULCAC

When saccing an item with a quantity (e.g. bunch of arrows), treat it as if

the appropriate number of singleton items were sacced. Modify Okawaru and Makhleb piety gain test slightly.

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

Created by haranp on June 13, 2008

AV3T4BN5IFAAE4CQURI5BKTUW22AKA7DVCTPXM4ZVCI6P62UULCAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 4838 [5.804403]

[4.795]

}
// God effects of sacrificing one item from a stack (e.g., a weapon, one
// out of 20 arrows, etc.) Does not modify the actual item in any way.
static piety_gain_t _sacrifice_one_item_noncount( const item_def& item)
{
    piety_gain_t relative_piety_gain = PIETY_NONE;
    // item_value() multiplies by quantity
    const int value = item_value(item) / item.quantity;
    switch (you.religion)
    {
    case GOD_NEMELEX_XOBEH:
        if (you.attribute[ATTR_CARD_COUNTDOWN] && random2(800) < value)
        {
            you.attribute[ATTR_CARD_COUNTDOWN]--;
#if DEBUG_DIAGNOSTICS || DEBUG_CARDS || DEBUG_SACRIFICE
            mprf(MSGCH_DIAGNOSTICS, "Countdown down to %d",
                 you.attribute[ATTR_CARD_COUNTDOWN]);
#endif
        }
        if (item.base_type == OBJ_CORPSES && one_chance_in(2+you.piety/50)
            // Nemelex piety gain is fairly fast...at least
            // when you have low piety.
            || value/2 >= random2(30 + you.piety/2))
        {
            if ( is_artefact(item) )
            {
                gain_piety(2);
                relative_piety_gain = PIETY_LOTS;
            }
            else
            {
                gain_piety(1);
                relative_piety_gain = PIETY_SOME;
            }
        }
        if (item.base_type == OBJ_FOOD && item.sub_type == FOOD_CHUNK)
            // No sacrifice value for chunks of flesh, since food
            // value goes towards decks of wonder.
            ;
        else if (item.base_type == OBJ_CORPSES)
        {
#if DEBUG_GIFTS || DEBUG_CARDS || DEBUG_SACRIFICE
            mprf(MSGCH_DIAGNOSTICS, "Corpse mass is %d",
                 item_mass(item));
#endif
            you.sacrifice_value[item.base_type] += item_mass(item);
        }
        else
            you.sacrifice_value[item.base_type] += value;
        break;
    case GOD_OKAWARU:
    case GOD_MAKHLEB:
        if (item.base_type == OBJ_CORPSES
            || value >= random2(200)
            || (player_under_penance() && value >= random2(5)))
        {
            gain_piety(1);
            relative_piety_gain = PIETY_SOME;
        }
        break;
    case GOD_SIF_MUNA:
        if (value >= 150)       // no point in saccing stacks to Sif
        {
            gain_piety(1 + random2(3));
            relative_piety_gain = PIETY_SOME;
        }
        break;
    case GOD_KIKUBAAQUDGHA:
    case GOD_TROG:
    case GOD_SHINING_ONE:
        gain_piety(1);
        relative_piety_gain = PIETY_SOME;
        break;
    default:
        break;
    }
    return relative_piety_gain;

Replacement in crawl-ref/source/religion.cc at line 4933 [5.804403]

B:BD[6.2991] → [6.2991:3076]

        simple_god_message(" doesn't care about such mundane gifts.", you.religion);

[6.2991]

[7.404]

        simple_god_message(" doesn't care about such mundane gifts.",
                           you.religion);

Replacement in crawl-ref/source/religion.cc at line 4952 [5.804403]

B:BD[8.3371] → [9.2787:2862]

        int donation_value = (int) (you.gold/200 * log((double)you.gold));

[8.3371]

[8.3438]

        const int donation_value = (int) (you.gold/200 * log((double)you.gold));

Replacement in crawl-ref/source/religion.cc at line 4966 [5.804403]

B:BD[6.3085] → [6.3085:3143]

        int estimated_piety = you.piety + donation_value;

[6.3085]

[10.3670]

        const int estimated_piety = you.piety + donation_value;

Replacement in crawl-ref/source/religion.cc at line 4975 [5.804403]

B:BD[11.2869] → [11.2869:2951]

                mpr("You feel that soon you will be absolved of all your sins.");

[11.2869]

[11.2951]

                mpr("You feel that you will soon be absolved of all your sins.");

Replacement in crawl-ref/source/religion.cc at line 4977 [5.804403]

B:BD[11.2968] → [11.2968:3048]

                mpr("You feel that soon your burden of sins will be lighter.");

[11.2968]

[11.3048]

                mpr("You feel that your burden of sins will soon be lighter.");

Replacement in crawl-ref/source/religion.cc at line 5013 [5.804403]

B:BD[12.510] → [12.510:634]

        const int next  = item.link;  // in case we can't get it later.
        const int value = item_value( item, true );

[12.510]

[5.879969]

        const int next = item.link;  // in case we can't get it later.

Replacement in crawl-ref/source/religion.cc at line 5045 [5.804403]

∅:D[13.5498] → [14.1538:1606]

B:BD[14.1538] → [14.1538:1606]

        mprf(MSGCH_DIAGNOSTICS, "Sacrifice item value: %d", value);

[13.5498]

[14.1606]

        mprf(MSGCH_DIAGNOSTICS, "Sacrifice item value: %d",
             item_value(item));

Replacement in crawl-ref/source/religion.cc at line 5048 [5.804403]
B:BD[14.1613] → [10.3680:3681]
∅:D[14.1614] → [5.880101:880131]
∅:D[15.1687] → [5.880101:880131]
∅:D[10.3681] → [5.880101:880131]
B:BD[5.880101] → [5.880101:880131]
```
        switch (you.religion)
```
[14.1613]
[5.880131]
```
        
        for ( int j = 0; j < item.quantity; ++j )
```

Replacement in crawl-ref/source/religion.cc at line 5051 [5.804403]

B:BD[5.880141] → [14.1615:1647]

B:BD[14.1708] → [15.1688:1764]

∅:D[15.1764] → [14.1803:1871]

B:BD[14.1803] → [14.1803:1871]

B:BD[14.1871] → [13.5499:5555]

∅:D[13.5555] → [14.1896:2039]

B:BD[14.1896] → [14.1896:2039]

B:BD[14.2039] → [3.4867:4966]

∅:D[3.4966] → [16.624:789]

B:BD[16.624] → [16.624:789]

∅:D[16.789] → [14.2349:2363]

B:BD[14.2349] → [14.2349:2363]

B:BD[14.2363] → [17.2513:2554]

B:BD[17.2554] → [18.5015:5033]

∅:D[18.5033] → [17.2554:2589]

B:BD[17.2554] → [17.2554:2589]

B:BD[17.2589] → [18.5034:5106]

∅:D[18.5106] → [17.2589:2610]

B:BD[17.2589] → [17.2589:2610]

B:BD[17.2610] → [18.5107:5125]

∅:D[18.5125] → [17.2610:2645]

B:BD[17.2610] → [17.2610:2645]

B:BD[17.2645] → [18.5126:5198]

∅:D[18.5198] → [13.5938:6153]

B:BD[19.2129] → [13.5938:6153]

B:BD[13.6153] → [10.3682:3700]

∅:D[10.3700] → [13.6172:6467]

B:BD[13.6172] → [13.6172:6467]

∅:D[19.2129] → [14.2394:2408]

∅:D[13.6467] → [14.2394:2408]

B:BD[14.2394] → [14.2394:2408]

B:BD[14.2408] → [13.6468:6547]

∅:D[13.6547] → [14.2437:2456]

B:BD[14.2437] → [14.2437:2456]

        case GOD_NEMELEX_XOBEH:
            if (you.attribute[ATTR_CARD_COUNTDOWN] && random2(800) < value)
            {
                you.attribute[ATTR_CARD_COUNTDOWN]--;
#if DEBUG_DIAGNOSTICS || DEBUG_CARDS || DEBUG_SACRIFICE
                mprf(MSGCH_DIAGNOSTICS, "Countdown down to %d",
                     you.attribute[ATTR_CARD_COUNTDOWN]);
#endif
            }
            if (item.base_type == OBJ_CORPSES
                    && one_chance_in(2+you.piety/50)
                // Nemelex piety gain is fairly fast...at least
                // when you have low piety.
                || value/2 >= random2(30 + you.piety/2))
            {
                if ( is_artefact(item) )
                {
                    gain_piety(2);
                    relative_piety_gain = PIETY_LOTS;
                }
                else
                {
                    gain_piety(1);
                    relative_piety_gain = PIETY_SOME;
                }
            }
            if (item.base_type == OBJ_FOOD && item.sub_type == FOOD_CHUNK)
                // No sacrifice value for chunks of flesh, since food
                // value goes towards decks of wonder.
                ;
            else if (item.base_type == OBJ_CORPSES)
            {
#if DEBUG_GIFTS || DEBUG_CARDS || DEBUG_SACRIFICE
                mprf(MSGCH_DIAGNOSTICS, "Corpse mass is %d",
                     item_mass(item));
#endif
                you.sacrifice_value[item.base_type] += item_mass(item);
            }
            else
                you.sacrifice_value[item.base_type] += value;
            break;

[5.880141]

[14.2456]

            const piety_gain_t gain = _sacrifice_one_item_noncount(item);

Replacement in crawl-ref/source/religion.cc at line 5053 [5.804403]

B:BD[5.880163] → [5.880163:880215]

B:BD[5.880215] → [10.3701:3750]

∅:D[10.3750] → [5.880460:880500]

B:BD[5.880460] → [5.880460:880500]

∅:D[20.196071] → [5.880500:880543]

B:BD[5.880500] → [5.880500:880543]

        case GOD_OKAWARU:
        case GOD_MAKHLEB:
            if (mitm[i].base_type == OBJ_CORPSES
                || random2(value) >= 50
                || player_under_penance())

[14.2457]

[5.880543]

            // Update piety gain if necessary.
            if ( gain != PIETY_NONE )

Replacement in crawl-ref/source/religion.cc at line 5056 [5.804403]

∅:D[19.2167] → [5.880557:880588]

B:BD[5.880557] → [5.880557:880588]

B:BD[5.880588] → [18.5199:5249]

∅:D[18.5249] → [5.880588:880602]

B:BD[5.880588] → [5.880588:880602]

B:BD[5.880632] → [5.880632:880679]

B:BD[5.880842] → [5.880842:880872]

B:BD[5.880872] → [19.2168:2182]

∅:D[19.2182] → [5.880872:880916]

B:BD[5.880872] → [5.880872:880916]

B:BD[5.880916] → [18.5250:5300]

                gain_piety(1);
                relative_piety_gain = PIETY_SOME;
            }
            break;
        case GOD_SIF_MUNA:
            if (value >= 150)
            {
                gain_piety(1 + random2(3));
                relative_piety_gain = PIETY_SOME;

[5.880557]

[19.2220]

                if ( relative_piety_gain == PIETY_NONE )
                    relative_piety_gain = gain;
                else            // some + some = lots
                    relative_piety_gain = PIETY_LOTS;

Deletion in crawl-ref/source/religion.cc at line 5061 [5.804403]
∅:D[19.2234] → [5.880946:881021]
B:BD[5.880946] → [5.880946:881021]
B:BD[5.881021] → [2.2528:2558]
∅:D[2.2558] → [5.881258:881285]
B:BD[5.881258] → [5.881258:881285]
B:BD[5.881285] → [18.5301:5347]
∅:D[19.2268] → [5.881937:881993]
∅:D[18.5347] → [5.881937:881993]
B:BD[5.881937] → [5.881937:881993]
```
            break;
        case GOD_KIKUBAAQUDGHA:
        case GOD_TROG:
        case GOD_SHINING_ONE:
            gain_piety(1);
            relative_piety_gain = PIETY_SOME;
            break;
        default:
            break;
```