fiddlerwoaroof/crawl - Change AOKMGUJ24JCC7WVMZOFCBTWPF5Y6JALZIMCMQXLOO2VBG2U33W2QC

* Make messages about rotting corpses/skeletons in inventory more

concise.

Use an alias to "you.inv[i]" instead of repeatedly using it directly.

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

Created by zelgadis on June 3, 2009

AOKMGUJ24JCC7WVMZOFCBTWPF5Y6JALZIMCMQXLOO2VBG2U33W2QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/effects.cc at line 3000 [5.3382105]

B:BD[4.5525] → [4.5525:5562]

        if (you.inv[i].quantity < 1)

[4.5525]

[4.5562]

        item_def &item(you.inv[i]);
        if (item.quantity < 1)

Replacement in crawl-ref/source/effects.cc at line 3005 [5.3382105]

B:BD[4.5585] → [6.3562:3616]

        if (!_food_item_needs_time_check(you.inv[i]))

[4.5585]

[4.5670]

        if (!_food_item_needs_time_check(item))

Replacement in crawl-ref/source/effects.cc at line 3008 [5.3382105]
B:BD[7.2697] → [8.23492:23541]
```
        if (you.inv[i].base_type == OBJ_POTIONS)
```
[7.2697]
[8.23541]
```
        if (item.base_type == OBJ_POTIONS)
```
Replacement in crawl-ref/source/effects.cc at line 3011 [5.3382105]
∅:D[2.11474] → [8.23589:23652]
B:BD[8.23589] → [8.23589:23652]
```
            if (maybe_coagulate_blood_potions_inv(you.inv[i]))
```
[2.11474]
[8.23652]
```
            if (maybe_coagulate_blood_potions_inv(item))
```
Replacement in crawl-ref/source/effects.cc at line 3016 [5.3382105]
B:BD[3.3519] → [3.3519:3565]
```
        if (you.inv[i].base_type == OBJ_FOOD)
```
[3.3519]
[3.3565]
```
        if (item.base_type == OBJ_FOOD)
```

Replacement in crawl-ref/source/effects.cc at line 3018 [5.3382105]

B:BD[3.3591] → [3.3591:3648]

        else if (you.inv[i].sub_type == CORPSE_SKELETON)

[3.3591]

[3.3648]

        else if (item.sub_type == CORPSE_SKELETON)

Replacement in crawl-ref/source/effects.cc at line 3024 [5.3382105]
∅:D[7.2697] → [4.5944:5997]
∅:D[2.11528] → [4.5944:5997]
∅:D[9.11701] → [4.5944:5997]
∅:D[10.14456] → [4.5944:5997]
B:BD[4.5944] → [4.5944:5997]
```
        if ((time_delta / 20) >= you.inv[i].special)
```
[2.11528]
[4.5997]
```
        if ((time_delta / 20) >= item.special)
```

Replacement in crawl-ref/source/effects.cc at line 3026 [5.3382105]

B:BD[4.6007] → [8.23732:23782]

            if (you.inv[i].base_type == OBJ_FOOD)

[4.6007]

[11.3597]

            if (item.base_type == OBJ_FOOD)

Replacement in crawl-ref/source/effects.cc at line 3031 [5.3382105]

B:BD[3.3715] → [3.3715:3826]

                // In case time_delta >= 210
                if (!you.inv[i].props.exists(ROTTING_WARNED_KEY))

[3.3715]

[3.3826]

                // In case time_delta >= 220
                if (!item.props.exists(ROTTING_WARNED_KEY))

Replacement in crawl-ref/source/effects.cc at line 3035 [5.3382105]
B:BD[11.3695] → [11.3695:3737]
```
                destroy_item(you.inv[i]);
```
[11.3695]
[11.3737]
```
                destroy_item(item);
```

Replacement in crawl-ref/source/effects.cc at line 3042 [5.3382105]

B:BD[2.11573] → [2.11573:11680]

            if (you.inv[i].sub_type == CORPSE_SKELETON
                || !mons_skeleton(you.inv[i].plus))

[2.11573]

[4.6463]

            if (item.sub_type == CORPSE_SKELETON
                || !mons_skeleton(item.plus))

Replacement in crawl-ref/source/effects.cc at line 3048 [5.3382105]

B:BD[4.6561] → [3.3868:3928]

                if (you.inv[i].sub_type == CORPSE_SKELETON)

[4.6561]

[3.3928]

                if (item.sub_type == CORPSE_SKELETON)

Replacement in crawl-ref/source/effects.cc at line 3053 [5.3382105]
∅:D[3.4028] → [4.6561:6603]
B:BD[4.6561] → [4.6561:6603]
```
                destroy_item(you.inv[i]);
```
[3.4028]
[4.6603]
```
                destroy_item(item);
```

Replacement in crawl-ref/source/effects.cc at line 3058 [5.3382105]

B:BD[4.6690] → [12.12055:12106]

            turn_corpse_into_skeleton(you.inv[i]);

[4.6690]

[13.4560]

            turn_corpse_into_skeleton(item);

Replacement in crawl-ref/source/effects.cc at line 3067 [5.3382105]
∅:D[2.11744] → [4.6932:6981]
∅:D[9.11764] → [4.6932:6981]
B:BD[4.6932] → [4.6932:6981]
```
        you.inv[i].special -= (time_delta / 20);
```
[2.11744]
[4.6981]
```
        item.special -= (time_delta / 20);
```

Replacement in crawl-ref/source/effects.cc at line 3069 [5.3382105]

B:BD[4.6982] → [8.23783:23822]

B:BD[8.23822] → [14.2650:2714]

        if (food_is_rotten(you.inv[i])
            && (you.inv[i].special + (time_delta / 20) >= 100))

[4.6982]

[4.7069]

        if (food_is_rotten(item)
            && (item.special + (time_delta / 20) >= 100))

Replacement in crawl-ref/source/effects.cc at line 3075 [5.3382105]

B:BD[3.4066] → [3.4066:4200]

        if (you.inv[i].base_type == OBJ_FOOD && you.inv[i].special <= 10
            && !you.inv[i].props.exists(ROTTING_WARNED_KEY))

[3.4066]

[3.4200]

        if (item.base_type == OBJ_FOOD && you.inv[i].special <= 10
            && !item.props.exists(ROTTING_WARNED_KEY))

Replacement in crawl-ref/source/effects.cc at line 3078 [5.3382105]

B:BD[3.4210] → [3.4210:4308]

            // In case time_delta >= 210
            you.inv[i].props[ROTTING_WARNED_KEY] = true;

[3.4210]

[3.4308]

            // In case time_delta >= 220
            item.props[ROTTING_WARNED_KEY] = true;

Replacement in crawl-ref/source/effects.cc at line 3148 [5.3382105]

B:BD[4.9101] → [3.4354:4425]

        if ((num_chunks_gone + num_bones_gone + num_corpses_gone) > 0)

[4.9101]

[3.4425]

        if ((num_chunks_gone + num_bones_gone + num_corpses_gone
             + num_corpses_rotted) > 0)

Insertion in crawl-ref/source/effects.cc at line 3151 [5.3382105]

[3.4435]

            std::string msg;
            if (num_chunks_gone == num_chunks
                && num_bones_gone == num_bones
                && (num_corpses_gone + num_corpses_rotted) == num_corpses)
            {
                msg = "All of the ";
            }
            else
                msg = "Some of the ";

Replacement in crawl-ref/source/effects.cc at line 3163 [5.3382105]

B:BD[3.4515] → [3.4515:4725]

                strs.push_back(make_stringf("%s of the chunks of flesh",
                                            num_chunks_gone < num_chunks ?
                                            "some" : "all"));

[3.4515]

[3.4725]

                strs.push_back("chunks of flesh");

Replacement in crawl-ref/source/effects.cc at line 3165 [5.3382105]

B:BD[3.4761] → [3.4761:4963]

                strs.push_back(make_stringf("%s of the skeletons",
                                            num_bones_gone < num_bones ?
                                            "some" : "all"));

[3.4761]

[3.4963]

                strs.push_back("skeletons");
            if ((num_corpses_gone + num_corpses_rotted) > 0)
                strs.push_back("corpses");

Replacement in crawl-ref/source/effects.cc at line 3169 [5.3382105]

B:BD[3.4964] → [3.4964:5206]

            if (num_corpses_gone > 0)
                strs.push_back(make_stringf("%s of the corpses",
                                            num_corpses_gone < num_corpses ?
                                            "some" : "all"));

[3.4964]

[3.5206]

            msg += comma_separated_line(strs.begin(), strs.end());
            msg += " in your inventory have ";

Replacement in crawl-ref/source/effects.cc at line 3172 [5.3382105]

B:BD[3.5207] → [3.5207:5773]

            strs[0] = upcase_first(strs[0]);
            std::string line = comma_separated_line(strs.begin(), strs.end());
            line += " in your inventory have completely rotted away.";
            mprf("%s", line.c_str());
        }
        num_corpses -= num_corpses_gone;
        if (num_corpses_rotted > 0)
        {
            mprf("%s of the %scorpses in your invetory rotted away into "
                 "skeletons.",
                 num_corpses_rotted < num_corpses ?  "Some" : "All",
                 num_corpses_gone > 0 ? "remaining " : "");

[3.5207]

[3.5773]

            if (num_corpses_rotted == 0)
                msg += "completely ";
            else if ((num_chunks_gone + num_bones_gone
                      + num_corpses_gone) == 0)
            {
                msg += "partially ";
            }
            else
                msg += "completely or partially ";
                
            msg += "rotted away.";
            mprf(MSGCH_ROTTEN_MEAT, "%s", msg.c_str());

Replacement in crawl-ref/source/effects.cc at line 3191 [5.3382105]

B:BD[3.5864] → [3.5864:5939]

        mprf("%s of the %schunks of flesh in your inventory are close to "

[3.5864]

[3.5939]

        mprf(MSGCH_ROTTEN_MEAT,
             "%s of the %schunks of flesh in your inventory are close to "