fiddlerwoaroof/crawl - Change GNF4E3QZL4L24PB5KIRO5JJAZYIAIQLGH6PEJB3ONWMIIYDKTY6AC

[1859486] Fixed skeletons weighing five times more than intended, burden state not changing when corpse rots to skeleton.

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

Created by dshaligram on December 28, 2007

GNF4E3QZL4L24PB5KIRO5JJAZYIAIQLGH6PEJB3ONWMIIYDKTY6AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 2539 [4.962854]

B:BD[4.1004472] → [4.1004472:1004806]

B:BD[4.1004806] → [5.348324:348399]

∅:D[5.348399] → [4.1004881:1004891]

B:BD[4.1004881] → [4.1004881:1004891]

        if (you.inv[bu].base_type == OBJ_CORPSES)
        {
            if (you.inv[bu].sub_type == CORPSE_BODY)
                you.burden += mons_weight(you.inv[bu].plus);
            else if (you.inv[bu].sub_type == CORPSE_SKELETON)
                you.burden += mons_weight(you.inv[bu].plus) / 2;
        }
        else
        {
            you.burden += item_mass( you.inv[bu] ) * you.inv[bu].quantity;
        }

[4.1004472]

[4.1004891]

        you.burden += item_mass( you.inv[bu] ) * you.inv[bu].quantity;

Insertion in crawl-ref/source/items.h at line 79 [4.2580284]
[4.2582423]
[6.393]
```
void destroy_item( item_def &item, bool never_created = false );
```
Replacement in crawl-ref/source/items.cc at line 503 [4.2584728]
B:BD[7.342817] → [6.512:562]
```
void destroy_item( int dest, bool never_created )
```
[7.342817]
[4.2597150]
```
void destroy_item( item_def &item, bool never_created )
```

Replacement in crawl-ref/source/items.cc at line 505 [4.2584728]

B:BD[4.2597152] → [4.2597152:2597370]

    // Don't destroy non-items, but this function may be called upon 
    // to remove items reduced to zero quantity, so we allow "invalid"
    // objects in.
    if (dest == NON_ITEM || !is_valid_item( mitm[dest] ))

[4.2597152]

[4.2597370]

    if (!is_valid_item( item ))

Deletion in crawl-ref/source/items.cc at line 507 [4.2584728]
B:BD[4.2597386] → [4.2597386:2597413]
B:BD[4.2597413] → [3.2880:2912]
```
    unlink_item( dest );
    item_def& item(mitm[dest]);
```

Insertion in crawl-ref/source/items.cc at line 525 [4.2584728]

[3.3213]

[4.2597485]

}
void destroy_item( int dest, bool never_created )
{
    // Don't destroy non-items, but this function may be called upon 
    // to remove items reduced to zero quantity, so we allow "invalid"
    // objects in.
    if (dest == NON_ITEM || !is_valid_item( mitm[dest] ))
        return;
    unlink_item( dest );
    destroy_item( mitm[dest], never_created );

Insertion in crawl-ref/source/items.cc at line 2445 [4.2584728]

[2.7089]

[4.2644983]

            }
        }
    }
}
static void rot_inventory_food(long time_delta)
{
    // Update all of the corpses and food chunks in the player's
    // inventory {should be moved elsewhere - dlb}
    bool burden_changed_by_rot = false;
    bool new_rotting_item = false;
    for (int i = 0; i < ENDOFPACK; i++)
    {
        if (you.inv[i].quantity < 1)
            continue;
        if (you.inv[i].base_type != OBJ_CORPSES && you.inv[i].base_type != OBJ_FOOD)
            continue;
        if (you.inv[i].base_type == OBJ_CORPSES
            && you.inv[i].sub_type > CORPSE_SKELETON)
        {
            continue;
        }
        if (you.inv[i].base_type == OBJ_FOOD && you.inv[i].sub_type != FOOD_CHUNK)
            continue;
        if ((time_delta / 20) >= you.inv[i].special)
        {
            if (you.inv[i].base_type == OBJ_FOOD)
            {
                if (you.equip[EQ_WEAPON] == i)
                    unwield_item();
                destroy_item(you.inv[i]);
                burden_changed_by_rot = true;
                continue;
            }
            if (you.inv[i].sub_type == CORPSE_SKELETON)
                continue;       // carried skeletons are not destroyed
            if (!mons_skeleton( you.inv[i].plus ))
            {
                if (you.equip[EQ_WEAPON] == i)
                    unwield_item();
                destroy_item(you.inv[i]);
                burden_changed_by_rot = true;
                continue;
            }
            you.inv[i].sub_type = CORPSE_SKELETON;
            you.inv[i].special = 0;
            you.inv[i].colour = LIGHTGREY;
            you.wield_change = true;
            burden_changed_by_rot = true;
            continue;
        }
        you.inv[i].special -= (time_delta / 20);
        if (you.inv[i].special < 100 && (you.inv[i].special + (time_delta / 20)>=100))
        {
            new_rotting_item = true; 
        }
    }
    //mv: messages when chunks/corpses become rotten
    if (new_rotting_item)
    {
        // XXX: should probably still notice?
        // Races that can't smell don't care, and trolls are stupid and
        // don't care.
        if (player_can_smell() && you.species != SP_TROLL)
        {
            int temp_rand = 0; // Grr.
            switch (you.mutation[MUT_SAPROVOROUS])
            {
            // level 1 and level 2 saprovores aren't so touchy
            case 1:
            case 2:
                temp_rand = random2(8);
                mpr( ((temp_rand  < 5) ? "You smell something rotten." :
                      (temp_rand == 5) ? "You smell rotting flesh." :
                      (temp_rand == 6) ? "You smell decay."
                                       : "There is something rotten in your inventory."),
                    MSGCH_ROTTEN_MEAT );
                break;
            // level 3 saprovores like it
            case 3:
                temp_rand = random2(8);
                mpr( ((temp_rand  < 5) ? "You smell something rotten." :
                      (temp_rand == 5) ? "The smell of rotting flesh makes you hungry." :
                      (temp_rand == 6) ? "You smell decay. Yum-yum."
                                       : "Wow! There is something tasty in your inventory."),
                    MSGCH_ROTTEN_MEAT );
                break;
            default:
                temp_rand = random2(8);
                mpr( ((temp_rand  < 5) ? "You smell something rotten." :
                      (temp_rand == 5) ? "The smell of rotting flesh makes you sick." :
                      (temp_rand == 6) ? "You smell decay. Yuck!"
                                       : "Ugh! There is something really disgusting in your inventory."), 
                    MSGCH_ROTTEN_MEAT );
                break;

Insertion in crawl-ref/source/items.cc at line 2557 [4.2584728]

[4.2645196]

[2.7090]

        learned_something_new(TUT_ROTTEN_FOOD);
    }
    if (burden_changed_by_rot)
    {
        mpr("Your equipment suddenly weighs less.", MSGCH_ROTTEN_MEAT);
        burden_change();

Deletion in crawl-ref/source/items.cc at line 2576 [4.2584728]
B:BD[2.7381] → [2.7381:7448]
∅:D[2.7448] → [4.2645399:2645400]
B:BD[4.2645399] → [4.2645399:2645400]
B:BD[4.2645400] → [2.7449:7593]
∅:D[2.7593] → [4.2645642:2645643]
B:BD[4.2645642] → [4.2645642:2645643]
```
    int temp_rand;              // probability determination {dlb}
    unsigned char i;            // loop variable {dlb}
    bool new_rotting_item = false; //mv: becomes true when some new item becomes rotting
```

Deletion in crawl-ref/source/items.cc at line 2800 [4.2584728]

B:BD[4.2652774] → [4.2652774:2653528]

B:BD[4.2653528] → [8.606:642]

∅:D[8.642] → [4.2653712:2653713]

B:BD[4.2653712] → [4.2653712:2653713]

B:BD[4.2653713] → [8.643:788]

∅:D[8.788] → [4.2653795:2654150]

B:BD[4.2653795] → [4.2653795:2654150]

B:BD[4.2654150] → [8.789:825]

∅:D[8.825] → [4.2654289:2654290]

B:BD[4.2654289] → [4.2654289:2654290]

B:BD[4.2654290] → [8.826:891]

∅:D[8.891] → [4.2654290:2654640]

B:BD[4.2654290] → [4.2654290:2654640]


    // Update all of the corpses and food chunks in the player's
    // inventory {should be moved elsewhere - dlb}
    for (i = 0; i < ENDOFPACK; i++)
    {
        if (you.inv[i].quantity < 1)
            continue;
        if (you.inv[i].base_type != OBJ_CORPSES && you.inv[i].base_type != OBJ_FOOD)
            continue;
        if (you.inv[i].base_type == OBJ_CORPSES
            && you.inv[i].sub_type > CORPSE_SKELETON)
        {
            continue;
        }
        if (you.inv[i].base_type == OBJ_FOOD && you.inv[i].sub_type != FOOD_CHUNK)
            continue;
        if ((time_delta / 20) >= you.inv[i].special)
        {
            if (you.inv[i].base_type == OBJ_FOOD)
            {
                if (you.equip[EQ_WEAPON] == i)
                    unwield_item();
                mpr("Your equipment suddenly weighs less.", MSGCH_ROTTEN_MEAT);
                // FIXME should replace with a destroy_item call
                you.inv[i].quantity = 0;
                burden_change();
                continue;
            }
            if (you.inv[i].sub_type == CORPSE_SKELETON)
                continue;       // carried skeletons are not destroyed
            if (!mons_skeleton( you.inv[i].plus ))
            {
                if (you.equip[EQ_WEAPON] == i)
                    unwield_item();
                // FIXME should replace with a destroy_item call
                you.inv[i].quantity = 0;
                burden_change();
                continue;
            }
            you.inv[i].sub_type = 1;
            you.inv[i].special = 0;
            you.inv[i].colour = LIGHTGREY;
            you.wield_change = true;
            continue;
        }
        you.inv[i].special -= (time_delta / 20);

Replacement in crawl-ref/source/items.cc at line 2801 [4.2584728]

B:BD[4.2654641] → [4.2654641:2654792]

        if (you.inv[i].special < 100 && (you.inv[i].special + (time_delta / 20)>=100))
        {
            new_rotting_item = true; 
        }
    }

[4.2654641]

[4.2654792]

    rot_inventory_food(time_delta);

Deletion in crawl-ref/source/items.cc at line 2803 [4.2584728]

B:BD[4.2654793] → [4.2654793:2654878]

B:BD[4.2654878] → [9.1374:1574]

∅:D[9.1574] → [4.2654907:2654917]

B:BD[4.2654907] → [4.2654907:2654917]

B:BD[4.2654917] → [9.1575:2140]

∅:D[9.2140] → [4.2655091:2655092]

B:BD[4.2655091] → [4.2655091:2655092]

B:BD[4.2655092] → [9.2141:2633]

∅:D[9.2633] → [4.2655529:2655530]

B:BD[4.2655529] → [4.2655529:2655530]

B:BD[4.2655530] → [9.2634:3107]

∅:D[9.3107] → [4.2656462:2656472]

B:BD[4.2656462] → [4.2656462:2656472]

B:BD[4.2656472] → [10.80386:80434]

∅:D[10.80434] → [4.2656472:2656479]

B:BD[4.2656472] → [4.2656472:2656479]

    //mv: messages when chunks/corpses become rotten
    if (new_rotting_item)
    {
        // XXX: should probably still notice?
        // Races that can't smell don't care, and trolls are stupid and
        // don't care.
        if (player_can_smell() && you.species != SP_TROLL)
        {
            switch (you.mutation[MUT_SAPROVOROUS])
            {
            // level 1 and level 2 saprovores aren't so touchy
            case 1:
            case 2:
                temp_rand = random2(8);
                mpr( ((temp_rand  < 5) ? "You smell something rotten." :
                      (temp_rand == 5) ? "You smell rotting flesh." :
                      (temp_rand == 6) ? "You smell decay."
                                       : "There is something rotten in your inventory."),
                    MSGCH_ROTTEN_MEAT );
                break;
            // level 3 saprovores like it
            case 3:
                temp_rand = random2(8);
                mpr( ((temp_rand  < 5) ? "You smell something rotten." :
                      (temp_rand == 5) ? "The smell of rotting flesh makes you hungry." :
                      (temp_rand == 6) ? "You smell decay. Yum-yum."
                                       : "Wow! There is something tasty in your inventory."),
                    MSGCH_ROTTEN_MEAT );
                break;
            default:
                temp_rand = random2(8);
                mpr( ((temp_rand  < 5) ? "You smell something rotten." :
                      (temp_rand == 5) ? "The smell of rotting flesh makes you sick." :
                      (temp_rand == 6) ? "You smell decay. Yuck!"
                                       : "Ugh! There is something really disgusting in your inventory."), 
                    MSGCH_ROTTEN_MEAT );
                break;
            }
        }
        learned_something_new(TUT_ROTTEN_FOOD);
    }