fiddlerwoaroof/crawl - Change ESWIM76FGJL4QFLSHU6AC4D74PT7OPLQ7ZCJYWLZS5UCBAJDXYHAC

Improved tutorial with extensive information on items

as well as a few features. A bit of a clean-up and a few additions.

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

Created by j-p-e-g on August 14, 2007

ESWIM76FGJL4QFLSHU6AC4D74PT7OPLQ7ZCJYWLZS5UCBAJDXYHAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.h at line 110 [7.13254]
[6.96]
[6.96]
```
int get_mons_colour(const monsters *mons);
```
Replacement in crawl-ref/source/view.cc at line 587 [7.16817]
B:BD[8.236] → [8.236:285]
```
static int get_mons_colour(const monsters *mons)
```
[8.236]
[8.285]
```
int get_mons_colour(const monsters *mons)
```

Insertion in crawl-ref/source/tutorial.h at line 40 [10.3315]

[9.165]

[10.4546]

void tutorial_describe_item(item_def& item);
bool tutorial_feat_interesting(int feat);
void tutorial_describe_feature(int feat);

Insertion in crawl-ref/source/tutorial.cc at line 5 [10.5936]
[11.1317]
[12.1129]
```
#include "tutorial.h"
```
Deletion in crawl-ref/source/tutorial.cc at line 9 [10.5936]
∅:D[12.1168] → [11.1317:1339]
B:BD[11.1317] → [11.1317:1339]
```
#include "tutorial.h"
```
Insertion in crawl-ref/source/tutorial.cc at line 13 [10.5936]
[13.36]
[11.1399]
```
#include "itemname.h"
```
Insertion in crawl-ref/source/tutorial.cc at line 21 [10.5936]
[11.1539]
[11.1539]
```
#include "randart.h"
```
Insertion in crawl-ref/source/tutorial.cc at line 23 [10.5936]
[11.1561]
[11.1561]
```
#include "skills2.h"
```
Replacement in crawl-ref/source/tutorial.cc at line 33 [10.5936]
B:BD[11.1646] → [11.1646:1675]
```
#define TUTORIAL_VERSION 110
```
[11.1646]
[11.1675]
```
#define TUTORIAL_VERSION 111
```
Replacement in crawl-ref/source/tutorial.cc at line 45 [10.5936]
B:BD[11.1825] → [11.1825:1877]
```
    for ( unsigned i = 0; i < TUT_EVENTS_NUM; ++i )
```
[11.1825]
[11.1877]
```
    for ( long i = 0; i < TUT_EVENTS_NUM; ++i )
```
Deletion in crawl-ref/source/tutorial.cc at line 54 [10.5936]
B:BD[11.2031] → [11.2031:2074]
```
    Options.tutorial_type = readShort(fp);
```
Insertion in crawl-ref/source/tutorial.cc at line 56 [10.5936]
[11.2128]
[11.2128]
```
        
    Options.tutorial_type = readShort(fp);
```

Replacement in crawl-ref/source/tutorial.cc at line 239 [10.5936]

B:BD[12.4779] → [12.4779:4853]

        "  <white>x</white> - examine something in your vicinity" EOL EOL

[12.4779]

[12.4853]

        "  <white>x</white> - examines something in your vicinity" EOL EOL

Replacement in crawl-ref/source/tutorial.cc at line 297 [10.5936]
∅:D[3.684] → [11.9837:9864]
B:BD[11.9837] → [11.9837:9864]
```
      case TUT_SEEN_TRAPS:
```
[3.684]
[11.9864]
```
      case TUT_SEEN_TRAP:
```

Insertion in crawl-ref/source/tutorial.cc at line 341 [10.5936]

[11.11235]

      case TUT_RETREAT_CASTER:
          return "were told to retreat as a caster";

Insertion in crawl-ref/source/tutorial.cc at line 357 [10.5936]

[14.201]

[11.11660]

      case TUT_MONSTER_BRAND:
          return "learned about colour brandings";

Replacement in crawl-ref/source/tutorial.cc at line 418 [10.5936]

B:BD[12.6013] → [12.6013:6089]

        "of the map you remember but cannot currently see, will be greyed "

[12.6013]

[12.6089]

        "of the map you remember but cannot currently see will be greyed "

Insertion in crawl-ref/source/tutorial.cc at line 563 [10.5936]
[11.18111]
[11.18111]
```
    {
```

Replacement in crawl-ref/source/tutorial.cc at line 565 [10.5936]

B:BD[11.18192] → [11.18192:18271]

                "spells more often! Remember to rest when your Magic is low.";

[11.18192]

[11.18271]

               "spells more often! Remember to rest when your Magic is low.";
    }

Replacement in crawl-ref/source/tutorial.cc at line 841 [10.5936]

B:BD[15.1828] → [15.1828:2117]

            "<lightgray>b<magenta> or <brown>K<magenta>. You can gain "
            "information about it by pressing <w>x<magenta>, moving the cursor "
            "on the monster and then pressing <w>v<magenta>. To attack it with "
            "your wielded weapon, just move into it.";

[15.1828]

[16.2215]

            "<lightgray>b<magenta> or <brown>K<magenta>. ";
            
    if (get_mons_colour(&mon) != (&mon)->colour)
        learned_something_new(TUT_MONSTER_BRAND);
    else
    {
        text += "You can gain information about it by pressing <w>x<magenta> "
                "and moving the cursor on the monster.";
    }
    text += "\nTo attack this monster with your wielded weapon, just move into "
            "it.";

Deletion in crawl-ref/source/tutorial.cc at line 854 [10.5936]
∅:D[16.2289] → [11.28788:28801]
B:BD[11.28788] → [11.28788:28801]
```
    more();
```
Insertion in crawl-ref/source/tutorial.cc at line 857 [10.5936]
[11.28858]
[11.28858]
```
        more();
```

Replacement in crawl-ref/source/tutorial.cc at line 859 [10.5936]

B:BD[11.28939] → [14.295:910]

                "bow. Do this as follows: <w>wbff<magenta> where <w>wb<magenta> "
                "wields the bow, and <w>ff<magenta> fires appropriate ammunition "
                "(your arrows) at the nearest hostile monster. If you'd like to "
                "choose a new monster you can type <w>f<magenta> followed by "
                "<w>+<magenta> or <w>-<magenta> instead to cycle through the "
                "available targets. Then press <w>Enter<magenta>, <w>f<magenta> "
                "or <w>.<magenta> to fire. If you miss, <w>ff<magenta> fires at "
                "the previous target again.";

[11.28939]

[16.2290]

                "bow. If you have a look at your bow with <w>v<magenta>, you'll "
                "find an explanation of how to do this. First <w>w<magenta>ield "
                "it, then follow the instructions.";

Insertion in crawl-ref/source/tutorial.cc at line 866 [10.5936]
[11.29532]
[14.911]
```
        more();
```

Replacement in crawl-ref/source/tutorial.cc at line 868 [10.5936]

B:BD[14.996] → [14.996:1077]

∅:D[14.1077] → [11.29698:29799]

B:BD[11.29698] → [11.29698:29799]

B:BD[11.29799] → [14.1078:1536]

                "Do this as follows: <w>Za.<magenta> where <w>Za<magenta> zaps "
                "the first spell you know, ";
        text += spell_title(get_spell_by_letter('a'));
        text += ", and <w>.<magenta> shoots at the targetted monster (the closest "
                "hostile monster). To target a different monster, use <w>+<magenta> "
                "or <w>-<magenta> to cycle through the available targets. "
                "<w>Enter<magenta>, <w>f<magenta> or <w>.<magenta> will fire. If you "
                "miss, <w>Za<magenta> followed by any of the aforementioned keys "
                "will fire at it again.";

[14.996]

[16.2369]

                "If you have a look at your spellbook with <w>v<magenta>, you'll "
                "find an explanation of how to do this.";

Replacement in crawl-ref/source/tutorial.cc at line 995 [10.5936]

B:BD[12.9304] → [12.9304:9356]

                   << "you will be unable to wear "

[12.9304]

[12.9356]

                   << " you will be unable to wear "

Replacement in crawl-ref/source/tutorial.cc at line 1039 [10.5936]

B:BD[12.10170] → [12.10170:10249]

               << "<magenta>'. Both must be <w>i<magenta>elded to be of use. "

[12.10170]

[11.37417]

               << "<magenta>'. Both must be <w>w<magenta>ielded to be of use. "

Insertion in crawl-ref/source/tutorial.cc at line 1062 [10.5936]

[3.1829]

          if (you.num_turns < 1)
              return;

Replacement in crawl-ref/source/tutorial.cc at line 1076 [10.5936]
∅:D[3.2365] → [11.38236:38263]
B:BD[11.38236] → [11.38236:38263]
```
      case TUT_SEEN_TRAPS:
```
[3.2365]
[14.1775]
```
      case TUT_SEEN_TRAP:
```

Replacement in crawl-ref/source/tutorial.cc at line 1082 [10.5936]

B:BD[11.38423] → [11.38423:38635]

                  "depicted by <w>^<magenta>. They can do physical damage (with "
                  "darts or needles, for example) or have other, more magical "
                  "effects, like teleportation.";

[11.38423]

[11.38635]

                  "depicted by " << colour_to_tag(colour) << "^<magenta>. They "
                  "can do physical damage (with darts or needles, for example) "
                  "or have other, more magical effects, like teleportation.";

Replacement in crawl-ref/source/tutorial.cc at line 1143 [10.5936]

B:BD[11.41468] → [12.11676:11760]

∅:D[12.11760] → [11.41552:41603]

B:BD[11.41552] → [11.41552:41603]

          text << "One of your skills just got raised. Type <w>m<magenta> to take "
                  "a look at your skills screen.";

[11.41468]

[11.41603]

          text << "One of your skills just got raised. To view or manage your "
                  "skill set, type <w>m<magenta>.";

Insertion in crawl-ref/source/tutorial.cc at line 1303 [10.5936]

[11.50128]

      case TUT_RETREAT_CASTER:
          text << "Without magical power you're unable to cast spells. While "
                  "melee is a possibility, that's not where your strengths lie, "
                  "so retreat (if possible) might be the better option.";
          break;

Replacement in crawl-ref/source/tutorial.cc at line 1318 [10.5936]

∅:D[12.14332] → [11.50761:50828]

B:BD[11.50761] → [11.50761:50828]

                  "look at your abilities or to use one of them.";

[12.14332]

[11.50828]

                   "look at your abilities or to use one of them.";

Insertion in crawl-ref/source/tutorial.cc at line 1342 [10.5936]

[11.51305]

      case TUT_MONSTER_BRAND:
          text << "That monster looks a bit unusual. You might wish to examine "
                  "it a bit more closely by pressing <w>x<magenta> and moving "
                  "the cursor onto its square.";
          break;

Insertion in crawl-ref/source/tutorial.cc at line 1387 [10.5936]

[3.4320]

[11.51746]

}
// a short explanation of Crawl's target mode
// and the most important commands
static std::string tut_target_mode(bool spells = false)
{
   std::string result;
   result = "You'll then find yourself in target mode with the nearest monster "
            "or previous target already targetted. You can also cycle through "
            "all hostile monsters in sight with <w>+<magenta> or <w>-<magenta>. "
            "Once you're aiming at the correct monster, simply hit "
            "<w>f<magenta>, <w>Enter<magenta> or <w>.<magenta> to shoot at it. "
            "If you miss, <w> ";
          
   if (spells)
       result += "Zap";
   else
       result += "ff";
       
   result += "<magenta> fires at the same target again.";
   
   return (result);
}
static std::string tut_throw_stuff(item_def &item)
{
    std::string result;
    
    result  = "To do this, type <w>t<magenta> to throw, then <w>";
    result += item.slot;
    result += "<magenta> for ";
    result += (item.quantity > 1 ? "these" : "this");
    result += " ";
    result += item_base_name(item);
    result += (item.quantity > 1? "s" : "");
    result += ". ";
    result += tut_target_mode();
    return (result);
}
void tutorial_describe_item(item_def &item)
{
    std::ostringstream ostr;
    ostr << "<magenta>";
    switch (item.base_type)
    {
       case OBJ_WEAPONS:
       {
            // for identified artefacts don't give all this information
            // (The screen is likely to overflow.)
            if (is_artefact(item) && item_type_known(item))
                return;
            
            item_def *weap = you.slot_item(EQ_WEAPON);
            bool wielded = (*weap).slot == item.slot;
            bool long_text = false;
            if (!wielded)
            {
               ostr << "You can wield this weapon with <w>w<magenta>, or use "
                       "<w>'<magenta> to switch between the weapons in slot "
                       "a and b. (Use <w>=<magenta> to adjust item slots.)";
                    
               // weapon skill used by this weapon and the best weapon skill
               int curr_wpskill, best_wpskill;
               
               // maybe this is a launching weapon
               if (is_range_weapon(item))
               {
                   // then only compare with other launcher skills
                   curr_wpskill = range_skill(item);
                   best_wpskill = best_skill(SK_SLINGS, SK_DARTS, 99);
               }
               else 
               {
                   // compare with other melee weapons
                   curr_wpskill = weapon_skill(item);
                   best_wpskill = best_skill(SK_SHORT_BLADES, SK_STAVES, 99);
                   // maybe unarmed is better
                   if (you.skills[SK_UNARMED_COMBAT] > you.skills[best_wpskill])
                       best_wpskill = SK_UNARMED_COMBAT;
               }
                   
               if (you.skills[curr_wpskill] + 2 < you.skills[best_wpskill])
               {
                      ostr << "\nOn second look you've been training in <w>"
                           << skill_name(best_wpskill)
                           << "<magenta> for a while, so maybe you should "
                              "continue training that rather than <w>"
                           << skill_name(curr_wpskill)
                           << "<magenta>. (Type <w>m<magenta> to see the skill "
                              "management screen for the actual numbers.)";
                      long_text = true;
               }
            }
            else // wielded weapon
            {
                if (is_range_weapon(item))
                {
                    ostr << "To attack a monster, you only need to "
                            "<w>f<magenta>ire the appropriate type of ammunition. ";
                    ostr << tut_target_mode();
                }
                else
                {
                    ostr << "To attack a monster, you can simply walk into it.";
                }
            }
            if (is_throwable(item, you.body_size()) && !long_text)
            {
                ostr << "\n\nSome weapons (including this one), can also be used "
                        "for ranged combat. ";
                ostr << tut_throw_stuff(item);
                long_text = true;
            }
            if (!item_type_known(item) &&
                (is_artefact(item) || get_equip_desc( item ) != ISFLAG_NO_DESC))
            {
                ostr << "\n\nWeapons and armour that have unusual descriptions "
                     << "like this are much more likely to be of higher "
                     << "enchantment or have special properties, good or bad. "
                     << "The rarer the description, the greater the potential "
                     << "value of an item.";
                     
                Options.tutorial_events[TUT_SEEN_RANDART] = 0;
            }
            if (item_known_cursed( item ) && !long_text)
            {
                ostr << "\n\nOnce wielded, a cursed weapon won't leave your hands "
                        "again until the curse has been lifted by reading a "
                        "scroll of remove curse.";
                if (!wielded && is_throwable(item, you.body_size()))
                    ostr << " (Throwing it is safe, though.)";
                    
                Options.tutorial_events[TUT_YOU_CURSED] = 0;
            }
            Options.tutorial_events[TUT_SEEN_WEAPON] = 0;
            break;
       }
       case OBJ_MISSILES:
            if (item.sub_type == MI_JAVELIN || item.sub_type == MI_SLING_BULLET
                || item.sub_type == MI_DART || item.sub_type == MI_STONE)
            {
                ostr << item.name(DESC_CAP_YOUR)
                     << " can be thrown without the use of a launcher. ";
                ostr << tut_throw_stuff(item);
            }
            else if (is_launched(&you, you.weapon(), item))
            {
                ostr << "As you're already wielding the appropriate launcher, "
                        "you can simply <w>f<magenta>ire "
                     << (item.quantity > 1 ? "these" : "this")
                     << " " << item.name(DESC_BASENAME)
                     << (item.quantity > 1? "s" : "")
                     << ". ";
                ostr << tut_target_mode();
            }
            else
            {
                ostr << "To shoot "
                     << (item.quantity > 1 ? "these" : "this")
                     << " " << item.name(DESC_BASENAME)
                     << (item.quantity > 1? "s" : "")
                     << ", first you need to <w>w<magenta>ield an appropriate "
                        "launcher.";
            }
            Options.tutorial_events[TUT_SEEN_MISSILES] = 0;
            break;
            
       case OBJ_ARMOUR:
            ostr << "You can wear pieces of armour with <w>W<magenta> and take "
                    "them off again with <w>T<magenta>. ";
            if (!item_type_known(item) &&
                (is_artefact(item) || get_equip_desc( item ) != ISFLAG_NO_DESC))
            {
                ostr << "\n\nWeapons and armour that have unusual descriptions "
                     << "like this are much more likely to be of higher "
                     << "enchantment or have special properties, good or bad. "
                     << "The rarer the description, the greater the potential "
                     << "value of an item.";
                Options.tutorial_events[TUT_SEEN_RANDART] = 0;
            }
            if (item_known_cursed( item ))
            {
                ostr << "\nA cursed piece of armour, once worn, cannot be removed "
                        "again until the curse has been lifted by reading a "
                        "scroll of remove curse.";
            }
            Options.tutorial_events[TUT_SEEN_ARMOUR] = 0;
            break;
            
       case OBJ_WANDS:
            ostr << "The magic within can be unleashed by <w>z<magenta>apping it.";
            Options.tutorial_events[TUT_SEEN_WAND] = 0;
            break;
            
       case OBJ_FOOD:
            ostr << "Food can simply be <w>e<magenta>aten. ";
            if (item.sub_type == FOOD_CHUNK)
            {
                ostr << "Note that most species refuse to eat raw meat unless "
                        "really hungry. ";
                if (item.special < 100)
                {
                    ostr << "Even fewer can safely digest rotten meat, and you're "
                            "probably not part of this group.";
                }
            }
            Options.tutorial_events[TUT_SEEN_FOOD] = 0;
            break;
            
       case OBJ_SCROLLS:
            ostr << "Type <w>r<magenta> to read this scroll. ";
            Options.tutorial_events[TUT_SEEN_SCROLL] = 0;
            break;
            
       case OBJ_JEWELLERY:
            ostr << "Jewellery can be <w>P<magenta>ut on or <w>R<magenta>emoved "
                    "again. ";
            if (item_known_cursed( item ))
            {
                ostr << "\nA cursed piece of jewellery will cling to its "
                        "unfortunate wearer's neck or fingers until the curse is "
                        "finally lifted when he or she reads a scroll of remove "
                        "curse.";
            }
            Options.tutorial_events[TUT_SEEN_JEWELLERY] = 0;
            break;
            
       case OBJ_POTIONS:
            ostr << "Use <w>q<magenta> to quaff this potion. ";
            Options.tutorial_events[TUT_SEEN_POTION] = 0;
            break;
            
       case OBJ_BOOKS:
            if (!item_ident(item, ISFLAG_KNOW_TYPE))
            {
                ostr << "It's a book, you can <w>r<magenta>ead it. ";
            }
            else
            {
                if (item.sub_type == BOOK_MANUAL)
                {
                    ostr << "A manual can greatly help you in training a skill. "
                            "To use it, <w>r<magenta>ead it while your experience "
                            "pool (the number in brackets) is full. Note that "
                            "this will drain said pool, so only use this manual "
                            "if you think you need the skill in question.";
                }
                else
                {
                    ostr << "A spellbook! You could <w>M<magenta>emorize some "
                            "spells and then cast them with <w>Z<magenta>. ";
                    if (you.religion == GOD_TROG)
                    {
                         ostr << "\nAs a worshipper of "
                              << god_name(GOD_TROG)
                              << ", though, you might instead wish to burn this "
                                 "tome of hated magic, by using the corresponding "
                                 "<w>a<magenta>bility. "
                                 "Note that this only works on books that are "
                                 "lying on the floor and not on your current "
                                 "square. ";
                    }
                    else if (!you.skills[SK_SPELLCASTING])
                    {
                         ostr << "\nFor now, however, that will have to wait "
                                 "until you've learned the basics of Spellcasting "
                                 "by reading lots of scrolls.";
                    }
                    else
                    {
                         ostr << "Do this as follows: Type <w>Z<magenta>, then "
                                 "choose the spell you want to cast (with "
                                 "<w>?<magenta>), for example <w>a<magenta>, "
                                 "which is the first spell you know, "
                              << spell_title(get_spell_by_letter('a'))
                              << ". ";
                         ostr << tut_target_mode(true);
                    }
                }
            }
            Options.tutorial_events[TUT_SEEN_SPBOOK] = 0;
            break;
            
       case OBJ_CORPSES:
            ostr << "Corpses lying on the floor can be <w>D<magenta>issected "
                    "with a sharp implement to produce chunks for food "
                    "(though they may not be healthy)";
            if (god_likes_butchery(you.religion))
            {
                ostr << ", or as a sacrifice to "
                     << god_name(you.religion)
                     << " (while <w>p<magenta>raying)";
            }
            ostr << ". ";
            if (item.special < 100)
                ostr << "Rotten corpses won't be of any use to you, though, so "
                        "you might just as well <w>d<magenta>rop this.";
            Options.tutorial_events[TUT_SEEN_CARRION] = 0;
            break;
            
       case OBJ_STAVES:
            ostr << "Staffs have to be <w>w<magenta>ielded to be of use. "
                    "There are staves that help spellcasters, and others that "
                    "allow you to harness spells hidden within.";
            if (!item_ident(item, ISFLAG_KNOW_TYPE))
            {
                ostr << "\n\nTo find out what this staff might do, you have to "
                        "wield it, then <w>E<magenta>voke it to see if anything "
                        "interesting happens. If nothing happens, it's probably "
                        "an ancient staff capable of enhancing certain spell "
                        "schools while suppressing others. ";
                if (you.spell_no)
                {
                    ostr << "You can find out which one, by casting spells while "
                            "wielding this staff. Eventually, the staff might "
                            "react to a spell of its school and identify itself.";
                }
            }
            Options.tutorial_events[TUT_SEEN_STAFF] = 0;
            break;
            
       case OBJ_MISCELLANY:
            ostr << "Miscellanous items sometimes harbour magical powers. Try "
                    "<w>w<magenta>ielding and <w>E<magenta>voking it.";
            Options.tutorial_events[TUT_SEEN_MISC] = 0;
            break;
            
       default:
            return;
    }
    std::string broken = ostr.str();
    linebreak_string2(broken, get_tutorial_cols());
    formatted_string::parse_block(broken, false).display();

Insertion in crawl-ref/source/tutorial.cc at line 1730 [10.5936]

[11.51748]


bool tutorial_feat_interesting(int feat)
{
    switch (feat)
    {
       case DNGN_CLOSED_DOOR:
       case DNGN_OPEN_DOOR:
       case DNGN_ORCISH_IDOL:
       case DNGN_GRANITE_STATUE:
       case DNGN_SILVER_STATUE:
       case DNGN_ORANGE_CRYSTAL_STATUE:
       case DNGN_TRAP_MAGICAL:
       case DNGN_TRAP_MECHANICAL:
       case DNGN_STONE_STAIRS_DOWN_I:
       case DNGN_STONE_STAIRS_DOWN_II:
       case DNGN_STONE_STAIRS_DOWN_III:
       case DNGN_STONE_STAIRS_UP_I:
       case DNGN_STONE_STAIRS_UP_II:
       case DNGN_STONE_STAIRS_UP_III:
       case DNGN_ROCK_STAIRS_DOWN:
       case DNGN_ROCK_STAIRS_UP:
            return true;
       default:
            return false;
    }
}
void tutorial_describe_feature(int feat)
{
    std::ostringstream ostr;
    ostr << "<magenta>";
    
    switch (feat)
    {
       case DNGN_CLOSED_DOOR:
            ostr << "You can open it by walking into it.";
            Options.tutorial_events[TUT_SEEN_DOOR];
            break;
       case DNGN_OPEN_DOOR:
            ostr << "You can close an open door if you stand next to it while "
                    "the doorway's empty, and then press <w>c<magenta> followed "
                    "by the direction of the door.";
            Options.tutorial_events[TUT_SEEN_DOOR];
            break;
       case DNGN_ORCISH_IDOL:
       case DNGN_GRANITE_STATUE:
       case DNGN_SILVER_STATUE:
       case DNGN_ORANGE_CRYSTAL_STATUE:
            ostr << "Beware! Sometimes such a statue actually has a mind of its own.";
            break;
       case DNGN_TRAP_MAGICAL:
       case DNGN_TRAP_MECHANICAL:
            ostr << "These nasty constructions can do physical damage (with "
                    "darts or needles, for example) or have other, more magical "
                    "effects. ";
            if (feat == DNGN_TRAP_MECHANICAL)
            {
                ostr << "You can attempt to deactivate the mechanical type by "
                        "standing next to it and then pressing <w>Shift<magenta> "
                        "and the direction of the trap. Note that this usually "
                        "causes the trap to go off, so it can be quite a "
                        "dangerous task.";
            }
            Options.tutorial_events[TUT_SEEN_TRAP];
            break;
       case DNGN_STONE_STAIRS_DOWN_I:
       case DNGN_STONE_STAIRS_DOWN_II:
       case DNGN_STONE_STAIRS_DOWN_III:
            ostr << "You can enter the next (deeper) level by following them "
                    "down (<w>><magenta>). To get back to this level again, "
                    "press <w><<<magenta> while standing on the upstairs.";
            Options.tutorial_events[TUT_SEEN_STAIRS];
            break;
       case DNGN_STONE_STAIRS_UP_I:
       case DNGN_STONE_STAIRS_UP_II:
       case DNGN_STONE_STAIRS_UP_III:
            if (you.your_level < 1)
            {
                ostr << "These stairs lead out of the dungeon. Following them "
                        "will end the game. The only way to win is to transport "
                        "the fabled orb of Zot outside.";
            }
            else
            {
                ostr << "You can enter the previous (lower) level by following "
                        "these down (<w><<<magenta>). To get back to this level "
                        "again, press <w>><magenta> while standing on the "
                        "downstairs.";
            }
            Options.tutorial_events[TUT_SEEN_STAIRS];
            break;
       case DNGN_ROCK_STAIRS_DOWN:
       case DNGN_ROCK_STAIRS_UP:
            ostr << "Escape hatches can be used to quickly leave a level with "
                    "<w><<<magenta> and <w>><magenta>, respectively. Note that "
                    "you will usually be unable to return right away.";
            Options.tutorial_events[TUT_SEEN_ESCAPE_HATCH];
            break;
       default:
            return;
    }
    std::string broken = ostr.str();
    linebreak_string2(broken, get_tutorial_cols());
    formatted_string::parse_block(broken, false).display();
}

Replacement in crawl-ref/source/misc.cc at line 1666 [7.1933596]

B:BD[7.1971388] → [5.202:267]

    learned_something_new(TUT_SEEN_TRAPS, you.x_pos, you.y_pos);

[7.1971388]

    learned_something_new(TUT_SEEN_TRAP, you.x_pos, you.y_pos);

Insertion in crawl-ref/source/items.cc at line 1391 [7.2584728]
[17.354702]
[18.635479]
```
    if (!item.slot)
        item.slot = index_to_letter(item.link);
```
Replacement in crawl-ref/source/itemprop.h at line 2 [18.641567]
B:BD[18.641571] → [18.641571:641599]
```
 *  File:       itemname.cc
```
[18.641571]
[18.641599]
```
 *  File:       itemprop.h
```
Replacement in crawl-ref/source/enum.h at line 3771 [7.3287960]
B:BD[19.1420] → [19.1420:1449]
```
    TUT_SEEN_POTION,        
```
[19.1420]
[19.1449]
```
    TUT_SEEN_POTION,
```

Replacement in crawl-ref/source/enum.h at line 3775 [7.3287960]

B:BD[19.1510] → [19.1510:1572]

    TUT_SEEN_JEWELLERY,     // 5    
    TUT_SEEN_MISC,

[19.1510]

[19.1572]

    TUT_SEEN_JEWELLERY,     // 5
    TUT_SEEN_MISC,

Replacement in crawl-ref/source/enum.h at line 3781 [7.3287960]
B:BD[19.1670] → [19.1670:1714]
```
    TUT_SEEN_RANDART, 
    TUT_SEEN_FOOD,  
```
[19.1670]
[19.1714]
```
    TUT_SEEN_RANDART,
    TUT_SEEN_FOOD,
```

Replacement in crawl-ref/source/enum.h at line 3785 [7.3287960]

B:BD[19.1772] → [19.1772:1801]

B:BD[19.1801] → [3.6890:6948]

    TUT_SEEN_STAIRS,        
    TUT_SEEN_ESCAPE_HATCH,  // 15
    TUT_SEEN_TRAPS,

[19.1772]

[19.1835]

    TUT_SEEN_STAIRS,        // 14
    TUT_SEEN_ESCAPE_HATCH,
    TUT_SEEN_TRAP,

Replacement in crawl-ref/source/enum.h at line 3793 [7.3287960]
B:BD[3.6983] → [3.6983:7010]
```
    TUT_KILLED_MONSTER,   
```
[3.6983]
[19.1996]
```
    TUT_MONSTER_BRAND,
    TUT_KILLED_MONSTER,
```

Replacement in crawl-ref/source/enum.h at line 3797 [7.3287960]

B:BD[19.2043] → [19.2043:2066]

B:BD[19.2066] → [3.7011:7045]

    TUT_YOU_ENCHANTED,
    TUT_YOU_SICK,           // 25

[19.2043]

[3.7045]

    TUT_MAKE_CHUNKS,        // 25
    TUT_OFFER_CORPSE,
    TUT_NEW_ABILITY,
    TUT_FLEEING_MONSTER,
    TUT_ROTTEN_FOOD,
    // status changes
    TUT_YOU_ENCHANTED,      // 30
    TUT_YOU_SICK,

Replacement in crawl-ref/source/enum.h at line 3806 [7.3287960]

∅:D[3.7065] → [19.2121:2193]

B:BD[19.2121] → [19.2121:2193]

B:BD[19.2193] → [3.7066:7120]

∅:D[3.7120] → [19.2249:2299]

B:BD[19.2249] → [19.2249:2299]

    TUT_YOU_CURSED,         
    TUT_YOU_HUNGRY, 
    TUT_YOU_STARVING,
    TUT_MULTI_PICKUP,       // 30
    TUT_HEAVY_LOAD,
    TUT_ROTTEN_FOOD,
    TUT_NEED_HEALING,

[3.7065]

[19.2299]

    TUT_YOU_CURSED,
    TUT_YOU_HUNGRY,
    TUT_YOU_STARVING,       // 35
    TUT_YOU_MUTATED,
    TUT_POSTBERSERK,
    // warning
    TUT_RUN_AWAY,           // 38
    TUT_RETREAT_CASTER,
    TUT_WIELD_WEAPON,
    TUT_NEED_HEALING,

Replacement in crawl-ref/source/enum.h at line 3817 [7.3287960]

B:BD[19.2328] → [3.7121:7198]

∅:D[3.7198] → [19.2383:2405]

B:BD[19.2383] → [19.2383:2405]

    TUT_RUN_AWAY,           // 35
    TUT_MAKE_CHUNKS,
    TUT_OFFER_CORPSE,
    TUT_POSTBERSERK,

[19.2328]

[19.2405]

    // interface
    TUT_MULTI_PICKUP,       // 43
    TUT_HEAVY_LOAD,

Replacement in crawl-ref/source/enum.h at line 3821 [7.3287960]
B:BD[19.2424] → [3.7199:7233]
```
    TUT_MAP_VIEW,           // 40
```
[19.2424]
[19.2445]
```
    TUT_MAP_VIEW,
```
Replacement in crawl-ref/source/enum.h at line 3823 [7.3287960]
B:BD[19.2467] → [3.7234:7255]
∅:D[3.7255] → [19.2501:2546]
B:BD[19.2501] → [19.2501:2546]
B:BD[19.2546] → [14.4222:4247]
B:BD[14.4247] → [3.7256:7290]
```
    TUT_YOU_MUTATED,
    TUT_NEW_ABILITY,  
    TUT_WIELD_WEAPON,
    TUT_FLEEING_MONSTER,
    TUT_EVENTS_NUM          // 46
```
[19.2467]
[3.7290]
```
    TUT_EVENTS_NUM          // 48
```
Insertion in crawl-ref/source/direct.cc at line 50 [7.3697945]
[17.450921]
[7.3698864]
```
#include "tutorial.h"
```

Replacement in crawl-ref/source/direct.cc at line 1767 [7.3697945]

∅:D[20.1894] → [17.474588:474619]

B:BD[17.474588] → [17.474588:474619]

    mpr(feature_desc.c_str());

[20.1894]

[20.1895]

    if (Options.tutorial_left && tutorial_feat_interesting(grd[mx][my]))
    {
        feature_desc += " (Press <w>v<lightgray> for more information.)";
        print_formatted_paragraph(feature_desc, 80);
    }
    else
        mpr(feature_desc.c_str());

Insertion in crawl-ref/source/describe.cc at line 53 [7.3736416]
[7.3737620]
[7.3737620]
```
#include "tutorial.h"
```

Insertion in crawl-ref/source/describe.cc at line 3314 [7.3736416]

[21.5240]

    
    if (Options.tutorial_left)
    {
        gotoxy(1, wherey() + 2);
        tutorial_describe_feature(grd[x][y]);
    }

Insertion in crawl-ref/source/describe.cc at line 3389 [7.3736416]

[22.2188]

[4.569]

    if (Options.tutorial_left)
    {
        gotoxy(1, wherey() + 2);
        tutorial_describe_item(item);
    }

Insertion in crawl-ref/source/delay.cc at line 999 [7.3963459]

[2.4183]

[20.2321]


        if (Options.tutorial_left)
        {
            // enforce that this message comes first
            tutorial_first_monster(*mon);
            if (get_mons_colour(mon) != mon->colour)
                learned_something_new(TUT_MONSTER_BRAND);
        }

Insertion in crawl-ref/source/command.cc at line 118 [7.4082507]

[17.480169]

    
    // slot switching
    tmp.slot = you.inv[to_slot].slot;
    you.inv[to_slot].slot = you.inv[from_slot].slot;
    you.inv[from_slot].slot = tmp.slot;

Deletion in crawl-ref/source/acr.cc at line 893 [7.4397395]

B:BD[23.274] → [3.8553:8680]

    if (Options.tutorial_events[TUT_RUN_AWAY] && 2*you.hp < you.hp_max )
        learned_something_new(TUT_RUN_AWAY);

Insertion in crawl-ref/source/acr.cc at line 916 [7.4397395]

[10.90196]

    else
    {
        if (2*you.hp < you.hp_max)
            learned_something_new(TUT_RUN_AWAY);
            
        if (Options.tutorial_type == TUT_MAGIC_CHAR && you.magic_points < 1)
            learned_something_new(TUT_RETREAT_CASTER);
    }

Deletion in crawl-ref/source/abl-show.cc at line 1842 [7.4494389]
B:BD[24.18783] → [3.9223:9271]
```
        learned_something_new(TUT_NEW_ABILITY);
```

Improved tutorial with extensive information on items

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.h at line 110 [7.13254]

Replacement in crawl-ref/source/view.cc at line 587 [7.16817]

Insertion in crawl-ref/source/tutorial.h at line 40 [10.3315]

Insertion in crawl-ref/source/tutorial.cc at line 5 [10.5936]

Deletion in crawl-ref/source/tutorial.cc at line 9 [10.5936]

Insertion in crawl-ref/source/tutorial.cc at line 13 [10.5936]

Insertion in crawl-ref/source/tutorial.cc at line 21 [10.5936]

Insertion in crawl-ref/source/tutorial.cc at line 23 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 33 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 45 [10.5936]

Deletion in crawl-ref/source/tutorial.cc at line 54 [10.5936]

Insertion in crawl-ref/source/tutorial.cc at line 56 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 239 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 297 [10.5936]

Insertion in crawl-ref/source/tutorial.cc at line 341 [10.5936]

Insertion in crawl-ref/source/tutorial.cc at line 357 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 418 [10.5936]

Insertion in crawl-ref/source/tutorial.cc at line 563 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 565 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 841 [10.5936]

Deletion in crawl-ref/source/tutorial.cc at line 854 [10.5936]

Insertion in crawl-ref/source/tutorial.cc at line 857 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 859 [10.5936]

Insertion in crawl-ref/source/tutorial.cc at line 866 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 868 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 995 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1039 [10.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1062 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1076 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1082 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1143 [10.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1303 [10.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1318 [10.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1342 [10.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1387 [10.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1730 [10.5936]

Replacement in crawl-ref/source/misc.cc at line 1666 [7.1933596]

Insertion in crawl-ref/source/items.cc at line 1391 [7.2584728]

Replacement in crawl-ref/source/itemprop.h at line 2 [18.641567]

Replacement in crawl-ref/source/enum.h at line 3771 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 3775 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 3781 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 3785 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 3793 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 3797 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 3806 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 3817 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 3821 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 3823 [7.3287960]

Insertion in crawl-ref/source/direct.cc at line 50 [7.3697945]