fiddlerwoaroof/crawl - Change JCAMHL6K5G2RYXFZDSBEWOAXSENAHGLQZTA6JJEMRYX5EGC6UOQQC

* Change "Your inventory suddenly weighs less" message to messages which

are more self explanatory.

Remove tutorial event explaining the "Your inventory suddenly weighs less".

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

Created by zelgadis on June 3, 2009

JCAMHL6K5G2RYXFZDSBEWOAXSENAHGLQZTA6JJEMRYX5EGC6UOQQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/tutorial.cc at line 408 [7.5936]

B:BD[5.3124] → [6.666:745]

    case TUT_ROTTEN_GONE:
        return "rotten food rotted away completely";

Deletion in crawl-ref/source/tutorial.cc at line 2519 [7.5936]

∅:D[3.2893] → [8.21360:21375]

B:BD[8.21360] → [8.21360:21375]

∅:D[8.21375] → [9.1163:1164]

B:BD[10.45722] → [9.1163:1164]

B:BD[9.1164] → [6.5413:5648]

        break;
    case TUT_ROTTEN_GONE:
        text << "One of the skeletons or rotten chunks of meat you carried "
                "rotted away completely, or one of the rotten corpses you "
                "carried rotted away into a skeleton.";

Deletion in crawl-ref/source/enum.h at line 2921 [12.3287960]
B:BD[11.22416] → [6.13904:13925]
```
    TUT_ROTTEN_GONE,
```

Replacement in crawl-ref/source/enum.h at line 2922 [12.3287960]

B:BD[13.27635] → [6.13926:13985]

    TUT_GOD_DISPLEASED,       // 45
    TUT_EXCOMMUNICATE,

[13.27635]

[13.27669]

    TUT_GOD_DISPLEASED,
    TUT_EXCOMMUNICATE,        // 45

Replacement in crawl-ref/source/enum.h at line 2927 [12.3287960]
B:BD[13.27731] → [6.13986:14022]
```
    TUT_YOU_RESIST,           // 50
```
[13.27731]
[11.22416]
```
    TUT_YOU_RESIST,
```
Replacement in crawl-ref/source/enum.h at line 2929 [12.3287960]
B:BD[11.22438] → [6.14023:14046]
```
    TUT_YOU_ENCHANTED,
```
[11.22438]
[14.3662]
```
    TUT_YOU_ENCHANTED,        // 50
```

Replacement in crawl-ref/source/enum.h at line 2933 [12.3287960]

B:BD[13.27811] → [6.14047:14103]

    TUT_YOU_CURSED,           // 55
    TUT_YOU_HUNGRY,

[13.27811]

[14.3715]

    TUT_YOU_CURSED,
    TUT_YOU_HUNGRY,           // 55

Replacement in crawl-ref/source/enum.h at line 2938 [12.3287960]

B:BD[5.38186] → [6.14104:14163]

    TUT_POSTBERSERK,          // 60
    TUT_CAUGHT_IN_NET,

[5.38186]

[11.22607]

    TUT_POSTBERSERK,
    TUT_CAUGHT_IN_NET,        // 60

Replacement in crawl-ref/source/enum.h at line 2944 [12.3287960]

B:BD[14.3794] → [6.14164:14229]

    TUT_NEED_HEALING,         // 65
    TUT_NEED_POISON_HEALING,

[14.3794]

[15.6166]

    TUT_NEED_HEALING,
    TUT_NEED_POISON_HEALING,  // 65

Replacement in crawl-ref/source/enum.h at line 2950 [12.3287960]

B:BD[11.22742] → [6.14230:14286]

    TUT_MULTI_PICKUP,         // 70
    TUT_HEAVY_LOAD,

[11.22742]

[16.2405]

    TUT_MULTI_PICKUP,
    TUT_HEAVY_LOAD,           // 70

Replacement in crawl-ref/source/enum.h at line 2955 [12.3287960]
B:BD[6.14309] → [6.14309:14345]
B:BD[6.14345] → [4.4952:4976]
```
    TUT_DONE_EXPLORE,         // 75
    TUT_AUTO_EXCLUSION,
```
[6.14309]
[13.27993]
```
    TUT_DONE_EXPLORE,
    TUT_AUTO_EXCLUSION,       // 75
```

Replacement in crawl-ref/source/enum.h at line 2960 [12.3287960]

B:BD[6.14386] → [4.4977:5049]

    TUT_LOAD_SAVED_GAME,      // 80
    TUT_EVENTS_NUM            // 81

[6.14386]

[17.4245]

    TUT_LOAD_SAVED_GAME,
    TUT_EVENTS_NUM            // 80

Insertion in crawl-ref/source/effects.cc at line 2979 [12.3382105]
[18.14342]
[18.14342]
```
#define ROTTING_WARNED_KEY "rotting_warned"
```

Insertion in crawl-ref/source/effects.cc at line 2988 [12.3382105]

[19.8084]

[20.5479]


    int num_chunks         = 0;
    int num_chunks_rotting = 0;
    int num_chunks_gone    = 0;
    int num_bones          = 0;
    int num_bones_gone     = 0;
    int num_corpses        = 0;
    int num_corpses_rotted = 0;
    int num_corpses_gone   = 0;

Insertion in crawl-ref/source/effects.cc at line 3013 [12.3382105]

[21.23730]


        if (you.inv[i].base_type == OBJ_FOOD)
            num_chunks++;
        else if (you.inv[i].sub_type == CORPSE_SKELETON)
            num_bones++;
        else
            num_corpses++;

Insertion in crawl-ref/source/effects.cc at line 3028 [12.3382105]

[2.3694]


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

Insertion in crawl-ref/source/effects.cc at line 3035 [12.3382105]
[2.3783]
[22.12028]

Insertion in crawl-ref/source/effects.cc at line 3046 [12.3382105]

[20.6561]

                if (you.inv[i].sub_type == CORPSE_SKELETON)
                    num_bones_gone++;
                else
                    num_corpses_gone++;

Insertion in crawl-ref/source/effects.cc at line 3059 [12.3382105]
[20.6899]
[20.6899]
```
            num_corpses_rotted++;
```

Insertion in crawl-ref/source/effects.cc at line 3072 [12.3382105]

[20.7127]


        if (you.inv[i].base_type == OBJ_FOOD && you.inv[i].special <= 10
            && !you.inv[i].props.exists(ROTTING_WARNED_KEY))
        {
            // In case time_delta >= 210
            you.inv[i].props[ROTTING_WARNED_KEY] = true;
            num_chunks_rotting++;
        }

Replacement in crawl-ref/source/effects.cc at line 3146 [12.3382105]

B:BD[20.9101] → [20.9101:9173]

B:BD[20.9173] → [6.14531:14579]

        mpr("Your equipment suddenly weighs less.", MSGCH_ROTTEN_MEAT);
        learned_something_new(TUT_ROTTEN_GONE);

[20.9101]

[20.9173]

        if ((num_chunks_gone + num_bones_gone + num_corpses_gone) > 0)
        {
            std::vector<std::string> strs;
            if (num_chunks_gone > 0)
                strs.push_back(make_stringf("%s of the chunks of flesh",
                                            num_chunks_gone < num_chunks ?
                                            "some" : "all"));
            if (num_bones_gone > 0)
                strs.push_back(make_stringf("%s of the skeletons",
                                            num_bones_gone < num_bones ?
                                            "some" : "all"));
            if (num_corpses_gone > 0)
                strs.push_back(make_stringf("%s of the corpses",
                                            num_corpses_gone < num_corpses ?
                                            "some" : "all"));
            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 " : "");
        }

Insertion in crawl-ref/source/effects.cc at line 3179 [12.3382105]

[20.9198]

    }
    num_chunks -= num_chunks_gone;
    if (num_chunks_rotting > 0)
    {
        mprf("%s of the %schunks of flesh in your inventory are close to "
             "completely rotting away.",
             num_chunks_rotting < num_chunks ? "Some" : "All",
             num_chunks_gone > 0 ? "remaining " : "");