fiddlerwoaroof/crawl - Change BFCFMN2BXNLXJCYYCL2V2XTDQQNM3PJPSRB6CU76FM3332NC7GMAC

A number of tutorial improvements, including reintroducing info on spellbooks.

Also: Fix 1832819. (Horn mutation not making helmet slot show as "restricted") Fix 1831983. (Autobutcher now ignores weapons inscribed with !w)

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

Created by j-p-e-g on November 19, 2007

BFCFMN2BXNLXJCYYCL2V2XTDQQNM3PJPSRB6CU76FM3332NC7GMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.h at line 34 [5.3315]
B:BD[3.532] → [4.563:604]
```
void tutorial_dissection_reminder(void);
```
[3.532]
[5.4101]
```
void tutorial_dissection_reminder(bool healthy);
```
Replacement in crawl-ref/source/tutorial.h at line 44 [5.3315]
B:BD[6.175] → [6.175:220]
```
void tutorial_describe_item(item_def &item);
```
[6.175]
[6.220]
```
void tutorial_describe_item(const item_def &item);
```
Replacement in crawl-ref/source/tutorial.cc at line 723 [5.5936]
B:BD[4.850] → [4.850:886]
```
void tutorial_dissection_reminder()
```
[4.850]
[3.25147]
```
void tutorial_dissection_reminder(bool healthy)
```
Replacement in crawl-ref/source/tutorial.cc at line 729 [5.5936]
B:BD[4.968] → [4.968:1008]
```
    if (you.hunger_state < HS_SATIATED)
```
[4.968]
[4.1008]
```
    if (you.hunger_state < HS_SATIATED && healthy)
```

Replacement in crawl-ref/source/tutorial.cc at line 743 [5.5936]

B:BD[3.25286] → [4.1285:1365]

        text += "If you don't need to eat it, consider <w>D<magenta>issecting "

[3.25286]

[4.1365]

        text += "If you don't want to eat it, consider <w>D<magenta>issecting "

Deletion in crawl-ref/source/tutorial.cc at line 978 [5.5936]

∅:D[7.8245] → [3.32667:32723]

B:BD[3.32667] → [3.32667:32723]

B:BD[3.32723] → [7.8246:8323]

∅:D[7.8323] → [3.32800:32878]

B:BD[3.32800] → [3.32800:32878]

          if (!you.skills[SK_SPELLCASTING])
          {
              text << "\nHowever, first you will have to get accustomed to "
                      "spellcasting by reading lots of scrolls.";
          }

Replacement in crawl-ref/source/tutorial.cc at line 980 [5.5936]

B:BD[8.1863] → [8.1863:1935]

               more();
               text << "\n\nAs a worshipper of "

[8.1863]

[8.1935]

               text << "\nAs a worshipper of "

Insertion in crawl-ref/source/tutorial.cc at line 985 [5.5936]

[8.2169]

          }
          else if (!you.skills[SK_SPELLCASTING])
          {
              text << "\nHowever, first you will have to get accustomed to "
                      "spellcasting by reading lots of scrolls.";

Replacement in crawl-ref/source/tutorial.cc at line 1230 [5.5936]

∅:D[9.317] → [3.42293:42375]

B:BD[3.42293] → [3.42293:42375]

B:BD[3.42375] → [8.3218:3403]

                  "an attribute may decrease. It wears off with time (wait with "
                  "<w>5<magenta>) or you can quaff a potion of healing. "
                  "Also you can always press <w>@<magenta> to see your current "
                  "status. ";

[9.317]

[3.42451]

                  "an attribute may decrease. It wears off with time (";
                  
          if (!i_feel_safe())
              text << "find a quiet corner and ";
          text << "wait with <w>5<magenta>) or you could quaff a potion of "
                  "healing. ";

Replacement in crawl-ref/source/tutorial.cc at line 1240 [5.5936]

B:BD[3.42547] → [7.11912:11991]

∅:D[7.11991] → [3.42626:42704]

B:BD[3.42626] → [3.42626:42704]

B:BD[3.42704] → [8.3416:3536]

          text << "Poison will slowly reduce your hp. It wears off with time "
                  "(wait with <w>5<magenta>) or you could quaff a potion of "
                  "healing. Also you can always press <w>@<magenta> to see your "
                  "current status. ";

[3.42547]

[3.42734]

          text << "Poison will slowly reduce your hp. It wears off with time (";
          
          if (!i_feel_safe())
              text << "find a quiet corner and ";
          text << "wait with <w>5<magenta>) or you could quaff a potion of "
                  "healing. ";

Insertion in crawl-ref/source/tutorial.cc at line 1262 [5.5936]

[3.43564]

                  
          if (Options.tutorial_type == TUT_BERSERK_CHAR)
              text << "\nNote that you cannot Berserk while hungry.";

Insertion in crawl-ref/source/tutorial.cc at line 1272 [5.5936]

[3.43933]


          if (Options.tutorial_type == TUT_MAGIC_CHAR)
              text << "\nNote that you cannot cast spells while starving.";

Replacement in crawl-ref/source/tutorial.cc at line 1531 [5.5936]
B:BD[10.3810] → [10.3810:3861]
```
static std::string tut_throw_stuff(item_def &item)
```
[10.3810]
[10.3861]
```
static std::string tut_throw_stuff(const item_def &item)
```
Replacement in crawl-ref/source/tutorial.cc at line 1548 [5.5936]
B:BD[10.4248] → [10.4248:4292]
```
void tutorial_describe_item(item_def &item)
```
[10.4248]
[10.4292]
```
void tutorial_describe_item(const item_def &item)
```
Insertion in crawl-ref/source/tutorial.cc at line 1936 [5.5936]
[10.17486]
[10.17486]
```
    ostr << "</magenta>";
```
Replacement in crawl-ref/source/spl-book.h at line 51 [11.395672]
B:BD[11.397157] → [8.7885:7927]
```
bool player_can_memorise(item_def &book);
```
[11.397157]
[11.397157]
```
bool player_can_memorise(const item_def &book);
```
Replacement in crawl-ref/source/spl-book.cc at line 1144 [11.397614]
B:BD[11.426263] → [8.7997:8038]
```
bool player_can_memorise(item_def &book)
```
[11.426263]
[6.11035]
```
bool player_can_memorise(const item_def &book)
```

Replacement in crawl-ref/source/player.cc at line 532 [11.962854]

B:BD[12.867] → [12.867:942]

   if (you.species == SP_MINOTAUR && eq == EQ_HELMET)
       return false;

[12.867]

[13.1549]

   if (you.mutation[MUT_HORNS] && eq == EQ_HELMET)
       return (special_armour);

Replacement in crawl-ref/source/monstuff.cc at line 348 [11.1396662]

B:BD[4.6349] → [4.6349:6389]

        tutorial_dissection_reminder();

[4.6349]

[11.1405522]

    {
        tutorial_dissection_reminder(
            mons_corpse_effect(monster->type) != CE_POISONOUS
             || player_res_poison() > 0 );
    }

Insertion in crawl-ref/source/food.cc at line 173 [11.3043806]

[14.14682]

            && !has_warning_inscription(you.inv[i], OPER_WIELD) // don't even ask

Insertion in crawl-ref/source/describe.cc at line 3420 [11.3736416]
[15.475059]
[11.3844518]
```
    if (Options.tutorial_left)
        tutorial_describe_item(item);
```
Deletion in crawl-ref/source/describe.cc at line 3480 [11.3736416]
B:BD[16.2188] → [10.23301:23338]
B:BD[10.23371] → [10.23371:23409]
B:BD[10.23409] → [2.1263:1280]
∅:D[2.1280] → [10.23409:23415]
B:BD[10.23409] → [10.23409:23415]
```
    if (Options.tutorial_left)
    {
        tutorial_describe_item(item);
        getch();
    }
```

Replacement in crawl-ref/source/describe.cc at line 3481 [11.3736416]

B:BD[2.1351] → [2.1351:1421]

    else if (allow_inscribe && wherey() <= get_number_of_lines() - 3)

[2.1351]

[17.723]

    if (!Options.tutorial_left && allow_inscribe
        && wherey() <= get_number_of_lines() - 3)

Replacement in crawl-ref/source/acr.cc at line 1282 [11.4397395]

B:BD[18.2348] → [19.53503:53540]

∅:D[19.53540] → [18.2406:2512]

B:BD[18.2406] → [18.2406:2512]

            else if (!you.running &&
                     Options.tutorial_events[TUT_SHIFT_RUN] &&
                     you.num_turns >= 200)

[18.2348]

[18.2512]

            else if (!you.running
                     && Options.tutorial_events[TUT_SHIFT_RUN]
                     && you.num_turns >= 200
                     && you.hp == you.hp_max
                     && you.magic_points == you.max_magic_points)

Replacement in crawl-ref/source/acr.cc at line 1290 [11.4397395]

B:BD[18.2594] → [19.53541:53578]

∅:D[19.53578] → [18.2652:2757]

B:BD[18.2652] → [18.2652:2757]

            else if (!you.running &&
                     Options.tutorial_events[TUT_MAP_VIEW] &&
                     you.num_turns >= 500)

[18.2594]

[18.2757]

            else if (!you.running
                     && Options.tutorial_events[TUT_MAP_VIEW]
                     && you.num_turns >= 500
                     && you.hp == you.hp_max
                     && you.magic_points == you.max_magic_points)

A number of tutorial improvements, including reintroducing info on spellbooks.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tutorial.h at line 34 [5.3315]

Replacement in crawl-ref/source/tutorial.h at line 44 [5.3315]

Replacement in crawl-ref/source/tutorial.cc at line 723 [5.5936]

Replacement in crawl-ref/source/tutorial.cc at line 729 [5.5936]

Replacement in crawl-ref/source/tutorial.cc at line 743 [5.5936]

Deletion in crawl-ref/source/tutorial.cc at line 978 [5.5936]

Replacement in crawl-ref/source/tutorial.cc at line 980 [5.5936]

Insertion in crawl-ref/source/tutorial.cc at line 985 [5.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1230 [5.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1240 [5.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1262 [5.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1272 [5.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1531 [5.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1548 [5.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1936 [5.5936]

Replacement in crawl-ref/source/spl-book.h at line 51 [11.395672]

Replacement in crawl-ref/source/spl-book.cc at line 1144 [11.397614]