fiddlerwoaroof/crawl - Change TBJIAJXXLFKL2TTRXBVDVCX252MTD567YCRETKJGZLVWCW3DOUXAC

Don't equip Spriggans with knives since they don't need a butchering

tool, and make pure casters not wield said knife (they're unarmed instead). Hunters now start wielding their sling/bow/crossbow. Hunters starting without a launcher will still be wielding their dagger. Update the tutorial accordingly, i.e. you might not have to switch weapons now to fire your bow.

Also, unrestrict Centaur Paladins.

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

Created by j-p-e-g on July 8, 2008

TBJIAJXXLFKL2TTRXBVDVCX252MTD567YCRETKJGZLVWCW3DOUXAC

Dependencies

In channels

main

Change contents

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

B:BD[4.10885] → [4.10885:10963]

                "this. First <w>w</w>ield it, then follow the instructions.";

[4.10885]

[6.553]

                "this. ";
        if (you.equip[EQ_WEAPON] == -1
            || you.inv[you.equip[EQ_WEAPON]].base_type != OBJ_WEAPONS
            || you.inv[you.equip[EQ_WEAPON]].sub_type != WPN_BOW)
        {
            text += "First <w>w</w>ield it, then follow the instructions.";

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

[4.11167]

        }
#ifdef USE_TILE
        else
        {
            text += "Clicking with your <w>right mouse button</w> on your bow "
                    "will also let you read its description.";
        }
#endif

Insertion in crawl-ref/source/tutorial.cc at line 1264 [5.5936]
[4.11168]
[4.11168]
Deletion in crawl-ref/source/newgame.cc at line 1438 [8.1132300]
B:BD[7.8109] → [3.3218:3243]
```
        case SP_CENTAUR:
```

Insertion in crawl-ref/source/newgame.cc at line 4013 [8.1132300]

[9.16833]

[8.1214731]

}
bool _needs_butchering_tool()
{
    // Mummies/Vampires don't eat.
    // Ghouls have claws (see below).
    if (you.is_undead)
        return (false);
    // Trolls have claws.
    if (you.has_claws())
        return (false);
    // Spriggans don't eat meat.
    if (you.mutation[MUT_HERBIVOROUS] == 3)
        return (false);
    return (true);

Replacement in crawl-ref/source/newgame.cc at line 4644 [8.1132300]

B:BD[10.15378] → [2.4623:4741]

        if (!you.is_undead && !you.has_claws())
            _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_KNIFE);

[10.15378]

[8.1229448]

        // The knife is a tool, not a weapon, so don't start wielding it.
        if (_needs_butchering_tool())
            _newgame_make_item(0, EQ_NONE, OBJ_WEAPONS, WPN_KNIFE);

Replacement in crawl-ref/source/newgame.cc at line 4679 [8.1132300]

B:BD[8.1238586] → [2.5535:5653]

        if (!you.is_undead && !you.has_claws())
            _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_KNIFE);

[8.1238586]

[8.1239585]

        // The knife is a tool, not a weapon, so don't start wielding it.
        if (_needs_butchering_tool())
            _newgame_make_item(0, EQ_NONE, OBJ_WEAPONS, WPN_KNIFE);

Replacement in crawl-ref/source/newgame.cc at line 4723 [8.1132300]

B:BD[2.6966] → [2.6966:7084]

        if (!you.is_undead && !you.has_claws())
            _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_KNIFE);

[2.6966]

[11.9841]

        // The knife is a tool, not a weapon, so don't start wielding it.
        if (_needs_butchering_tool())
            _newgame_make_item(0, EQ_NONE, OBJ_WEAPONS, WPN_KNIFE);

Replacement in crawl-ref/source/newgame.cc at line 4737 [8.1132300]

B:BD[2.7427] → [2.7427:7545]

        if (!you.is_undead && !you.has_claws())
            _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_KNIFE);

[2.7427]

[8.1242974]

        // The knife is a tool, not a weapon, so don't start wielding it.
        if (_needs_butchering_tool())
            _newgame_make_item(0, EQ_NONE, OBJ_WEAPONS, WPN_KNIFE);

Replacement in crawl-ref/source/newgame.cc at line 4807 [8.1132300]

B:BD[2.9055] → [2.9055:9173]

        if (!you.is_undead && !you.has_claws())
            _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_KNIFE);

[2.9055]

[8.1247753]

        // The knife is a tool, not a weapon, so don't start wielding it.
        if (_needs_butchering_tool())
            _newgame_make_item(0, EQ_NONE, OBJ_WEAPONS, WPN_KNIFE);

Replacement in crawl-ref/source/newgame.cc at line 4822 [8.1132300]

B:BD[2.9560] → [2.9560:9678]

        if (!you.is_undead && !you.has_claws())
            _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_KNIFE);

[2.9560]

[8.1248405]

        // The knife is a tool, not a weapon, so don't start wielding it.
        if (_needs_butchering_tool())
            _newgame_make_item(0, EQ_NONE, OBJ_WEAPONS, WPN_KNIFE);

Replacement in crawl-ref/source/newgame.cc at line 4837 [8.1132300]

B:BD[2.10064] → [2.10064:10130]

        _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_KNIFE);

[2.10064]

[2.10130]

        // The knife is a tool, not a weapon, so don't start wielding it.
        if (_needs_butchering_tool())
            _newgame_make_item(0, EQ_NONE, OBJ_WEAPONS, WPN_KNIFE);

Replacement in crawl-ref/source/newgame.cc at line 4852 [8.1132300]

B:BD[2.10500] → [2.10500:10618]

        if (!you.is_undead && !you.has_claws())
            _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_KNIFE);

[2.10500]

[11.9845]

        // The knife is a tool, not a weapon, so don't start wielding it.
        if (_needs_butchering_tool())
            _newgame_make_item(0, EQ_NONE, OBJ_WEAPONS, WPN_KNIFE);

Replacement in crawl-ref/source/newgame.cc at line 4960 [8.1132300]
B:BD[10.18896] → [10.18896:18937]
```
        {        case SP_MOUNTAIN_DWARF:
```
[10.18896]
[10.18937]
```
        {
        case SP_MOUNTAIN_DWARF:
```

Insertion in crawl-ref/source/newgame.cc at line 4998 [8.1132300]

[10.20138]


            // Wield the sling instead.
            you.equip[EQ_WEAPON] = 1;

Insertion in crawl-ref/source/newgame.cc at line 5007 [8.1132300]

[10.20387]


            // Wield the crossbow instead.
            you.equip[EQ_WEAPON] = 1;

Insertion in crawl-ref/source/newgame.cc at line 5016 [8.1132300]

[10.20617]


            // Wield the bow instead.
            you.equip[EQ_WEAPON] = 1;