fiddlerwoaroof/crawl - Change 2D6QENGAEM7WKV3OWDBOWIEBKPHWO7MCV6VOM52GR3FNNWBZ57JAC

Tutorial changes:

Note items which give abilities or resistances even if they're not equipped.
Don't give conjurers the item note about heavy armour for non-body armour, but do give a note about shields making casting harder.
Miscellaneous other improvements.

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

Created by zelgadis on May 24, 2009

2D6QENGAEM7WKV3OWDBOWIEBKPHWO7MCV6VOM52GR3FNNWBZ57JAC

Dependencies

In channels

main

Change contents

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

[4.3238]

        }
        else if (Options.tutorial_type == TUT_MAGIC_CHAR)
        {
            text << "\nAs a spellslinger you don't need a weapon to fight. "
                    "However, you should still carry at least one knife, "
                    "dagger, sword or axe so that you can chop up corpses.";

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

B:BD[6.14449] → [4.3381:3601]

                "you've picked up. Darts can be thrown by hand, but other "
                "missile types like arrows and needles require a launcher "
                "and training in using it to be really effective. "

[6.14449]

[6.14675]

                "you've picked up. Darts and throwing nets can be thrown by "
                "by hand, but other missile types like arrows and needles "
                "require a launcher and training in using it to be really "
                "effective. "

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

B:BD[3.3676] → [3.3676:3735]

                    "canthen travel to one of the spots.";

[3.3676]

[3.3735]

                    "can then travel to one of the spots.";

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

B:BD[4.28490] → [4.28490:28564]

            text << "\n\nOr you could <w>Z</w>ap a wand to deal damage.";

[4.28490]

[4.28564]

            text << "\n\nOr you could evoke (<w>V</w>) a wand to deal damage.";

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

B:BD[7.23175] → [7.23175:23253]

            text << " Note that casting spells is still very much possible.";

[7.23175]

[7.23253]

            text << " Note that casting spells is still very much possible, "
                    "as is using wands, scrolls and potions.";
        else
            text << " Note that using wands, scrolls and potions is still "
                    "very much possible.";

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

[7.23694]

        if (Options.tutorial_type == TUT_MAGIC_CHAR)
            listed.push_back("your spells (<w>z?</w>)");

Replacement in crawl-ref/source/tutorial.cc at line 3016 [5.5936]
B:BD[8.1600] → [6.27998:28034]
```
static std::string _tut_abilities()
```
[8.1600]
[8.1635]
```
static std::string _tut_abilities(const item_def& item)
```

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

B:BD[8.1637] → [6.28035:28108]

   return ("To do this, enter the ability menu with <w>a</w>, and then "

[8.1637]

[8.1714]

   std::string str = "To do this, ";
   if (!item_is_equipped(item))
   {
       switch(item.base_type)
       {
       case OBJ_WEAPONS:   str += "first <w>w</w>ield it"; break;
       case OBJ_ARMOUR:    str += "first <w>W</w>ear it"; break;
       case OBJ_JEWELLERY: str += "first <w>P</w>ut it on"; break;
       default:
           str += "<r>(BUG! this item shouldn't give an ability)</r>";
           break;
       }
       str += ", then ";
   }
   str += "enter the ability menu with <w>a</w>, and then "

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

B:BD[8.1791] → [8.1791:1866]

           "activation, especially by the untrained, is likely to fail.");

[8.1791]

[9.3807]

           "activation, especially by the untrained, is likely to fail.";
   return (str);

Replacement in crawl-ref/source/tutorial.cc at line 3079 [5.5936]
∅:D[10.2147] → [6.28306:28352]
B:BD[11.6071] → [6.28306:28352]
```
                    ostr << _tut_abilities();
```
[10.2147]
[12.4327]
```
                    ostr << _tut_abilities(item);
```

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

[6.29396]

[8.3022]

                wearable = false;
            }
            else if (item.sub_type == ARM_CENTAUR_BARDING
                     && you.species != SP_CENTAUR)
            {
                ostr << "Only centaurs can wear centaur barding.";
                wearable = false;
            }
            else if (item.sub_type == ARM_NAGA_BARDING)
            {
                ostr << "Only nagas can wear naga barding.";

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

B:BD[7.25272] → [7.25272:25315]

                && !is_light_armour(item))

[7.25272]

[7.25315]

                && !is_light_armour(item)
                && get_armour_slot(item) == EQ_BODY_ARMOUR)

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

[7.25682]

            }
            else if (Options.tutorial_type == TUT_MAGIC_CHAR
                     && is_shield(item))
            {
                ostr << "\nNote that shields will hinder you ability to "
                        "cast spells; the larger the shield, the bigger "
                        "the penalty.";

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

B:BD[13.12739] → [13.12739:12801]

                if (is_artefact(item) && gives_ability(item))

[13.12739]

[13.12801]

                if (gives_ability(item))

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

B:BD[13.12819] → [13.12819:12898]

B:BD[13.12898] → [10.2148:2227]

∅:D[10.2227] → [13.12978:13024]

B:BD[13.12978] → [13.12978:13024]

                    ostr << "\nWhen worn, some types of armour (such as this "
                            "one) offer certain abilities you can activate. ";
                    ostr << _tut_abilities();

[13.12819]

[13.13024]

                    ostr << "\n\nWhen worn, some types of armour (such as "
                            "this one) offer certain abilities you can "
                            "activate. ";
                    ostr << _tut_abilities(item);

Replacement in crawl-ref/source/tutorial.cc at line 3398 [5.5936]
∅:D[10.2303] → [6.31468:31510]
B:BD[6.31468] → [6.31468:31510]
```
                ostr << _tut_abilities();
```
[10.2303]
[8.3850]
```
                ostr << _tut_abilities(item);
```
Deletion in crawl-ref/source/itemprop.cc at line 2414 [15.646661]
B:BD[14.27541] → [14.27541:27626]
B:BD[14.27626] → [2.3558:3604]
∅:D[2.3604] → [14.27674:27702]
B:BD[14.27674] → [14.27674:27702]
```
    {
        // unwielded weapon
        item_def *weap = you.slot_item(EQ_WEAPON);
        if (!weap || weap->slot != item.slot)
            return (false);
```
Deletion in crawl-ref/source/itemprop.cc at line 2415 [15.646661]
B:BD[14.27717] → [14.27717:27723]
```
    }
```
Deletion in crawl-ref/source/itemprop.cc at line 2416 [15.646661]
∅:D[14.27747] → [8.12773:12779]
B:BD[8.12773] → [8.12773:12779]
```
    {
```

Deletion in crawl-ref/source/itemprop.cc at line 2418 [15.646661]

B:BD[14.27798] → [14.27798:27944]

B:BD[14.27944] → [2.3605:3715]

∅:D[2.3715] → [14.28058:28118]

B:BD[14.28058] → [14.28058:28118]

∅:D[14.28118] → [16.28430:28431]

B:BD[8.13423] → [16.28430:28431]

            // unworn ring
            item_def *lring = you.slot_item(EQ_LEFT_RING);
            item_def *rring = you.slot_item(EQ_RIGHT_RING);
            if ((!lring || lring->slot != item.slot)
                && (!rring || rring->slot != item.slot))
            {
                return (false);
            }

Deletion in crawl-ref/source/itemprop.cc at line 2427 [15.646661]
B:BD[14.28370] → [14.28370:28454]
B:BD[14.28454] → [2.3716:3766]
∅:D[2.3766] → [14.28506:28538]
B:BD[14.28506] → [14.28506:28538]
∅:D[14.28538] → [16.28432:28433]
B:BD[8.13879] → [16.28432:28433]
```
            // unworn amulet
            item_def *amul = you.slot_item(EQ_AMULET);
            if (!amul || amul->slot != item.slot)
                return (false);
```
Deletion in crawl-ref/source/itemprop.cc at line 2431 [15.646661]
B:BD[14.28638] → [14.28638:28644]
```
    }
```
Insertion in crawl-ref/source/itemprop.cc at line 2436 [15.646661]
[14.28783]
[16.28434]
```
        const special_armour_type ego = get_armour_ego_type(item);
```

Replacement in crawl-ref/source/itemprop.cc at line 2438 [15.646661]

B:BD[16.28435] → [14.28784:28852]

B:BD[14.28852] → [2.3767:3811]

∅:D[2.3811] → [14.28898:28926]

B:BD[14.28898] → [14.28898:28926]

        // unworn armour
        item_def *arm = you.slot_item(eq);
        if (!arm || arm->slot != item.slot)
            return (false);

[16.28435]

[14.28926]

        if (ego == SPARM_DARKNESS || ego == SPARM_LEVITATION)
            return (true);

Deletion in crawl-ref/source/itemprop.cc at line 2466 [15.646661]
B:BD[14.29236] → [14.29236:29321]
B:BD[14.29321] → [2.3857:3903]
∅:D[2.3903] → [14.29369:29397]
B:BD[14.29369] → [14.29369:29397]
```
    {
        // unwielded weapon
        item_def *weap = you.slot_item(EQ_WEAPON);
        if (!weap || weap->slot != item.slot)
            return (false);
```
Deletion in crawl-ref/source/itemprop.cc at line 2467 [15.646661]
B:BD[14.29412] → [14.29412:29418]
```
    }
```
Deletion in crawl-ref/source/itemprop.cc at line 2468 [15.646661]
B:BD[14.29442] → [14.29442:29448]
```
    {
```

Deletion in crawl-ref/source/itemprop.cc at line 2470 [15.646661]

B:BD[14.29497] → [14.29497:29524]

B:BD[14.29524] → [2.3945:4186]

∅:D[2.4186] → [14.29757:29817]

B:BD[14.29757] → [14.29757:29817]

∅:D[14.29817] → [12.9154:9155]

B:BD[12.9154] → [12.9154:9155]

            // unworn ring
            const item_def *lring = you.slot_item(EQ_LEFT_RING);
            const item_def *rring = you.slot_item(EQ_RIGHT_RING);
            if ((!lring || lring->slot != item.slot)
                && (!rring || rring->slot != item.slot))
            {
                return (false);
            }

Deletion in crawl-ref/source/itemprop.cc at line 2482 [15.646661]
B:BD[14.30267] → [14.30267:30296]
B:BD[14.30296] → [2.4187:4298]
∅:D[2.4298] → [14.30403:30435]
B:BD[14.30403] → [14.30403:30435]
∅:D[14.30435] → [12.9851:9852]
B:BD[12.9851] → [12.9851:9852]
```
            // unworn amulet
            const item_def *amul = you.slot_item(EQ_AMULET);
            if (!amul || amul->slot != item.slot)
                return (false);
```
Deletion in crawl-ref/source/itemprop.cc at line 2486 [15.646661]
B:BD[14.30570] → [14.30570:30576]
```
    }
```
Deletion in crawl-ref/source/itemprop.cc at line 2490 [15.646661]
B:BD[14.30687] → [14.30687:30715]
∅:D[14.30715] → [12.10150:10151]
B:BD[12.10150] → [12.10150:10151]
B:BD[12.10151] → [14.30716:30784]
B:BD[14.30784] → [2.4299:4343]
```
            return (false);
        // unworn armour
        item_def *arm = you.slot_item(eq);
        if (!arm || arm->slot != item.slot)
```
Deletion in crawl-ref/source/itemprop.cc at line 2491 [15.646661]
B:BD[14.30858] → [14.30858:30873]
```
        break;
```
Deletion in crawl-ref/source/itemprop.cc at line 2500 [15.646661]
B:BD[14.31144] → [14.31144:31228]
B:BD[14.31228] → [2.4396:4442]
∅:D[2.4442] → [14.31276:31304]
B:BD[14.31276] → [14.31276:31304]
∅:D[14.31304] → [16.28442:28443]
B:BD[12.10783] → [16.28442:28443]
```
    {
        // unwielded staff
        item_def *weap = you.slot_item(EQ_WEAPON);
        if (!weap || weap->slot != item.slot)
            return (false);
```
Deletion in crawl-ref/source/itemprop.cc at line 2506 [15.646661]
B:BD[14.31492] → [14.31492:31498]
```
    }
```

Tutorial changes:

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Deletion in crawl-ref/source/itemprop.cc at line 2414 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2415 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2416 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2418 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2427 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2431 [15.646661]

Insertion in crawl-ref/source/itemprop.cc at line 2436 [15.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2438 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2466 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2467 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2468 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2470 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2482 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2486 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2490 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2491 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2500 [15.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2506 [15.646661]