fiddlerwoaroof/crawl - Change ORZ37JMK7WY6FLTYZGC75D3POVCAZMZ7RCZIY4ZL2EGPXBMBCKJQC

Update a number of secondary choice restrictions (books and weapons).

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

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

ORZ37JMK7WY6FLTYZGC75D3POVCAZMZ7RCZIY4ZL2EGPXBMBCKJQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/newgame.cc at line 1928 [6.1132300]

B:BD[5.4121] → [5.4121:4477]

        case SP_OGRE:
            // Ogres are, of course, really bad at Fire and Ice, so it's usually
            // restricted, but if the summoning book comes into play unrestrict
            // those two because ogres are even *worse* at Summonings.
            if (!summon_too)
                return (CC_RESTRICTED);
            // else fall-through

Deletion in crawl-ref/source/newgame.cc at line 1935 [6.1132300]
B:BD[5.4664] → [5.4664:4690]
```
        case SP_HALFLING:
```
Insertion in crawl-ref/source/newgame.cc at line 1940 [6.1132300]
[5.4809]
[5.4809]
```
        case SP_DEMIGOD:
```
Insertion in crawl-ref/source/newgame.cc at line 1942 [6.1132300]
[5.4837]
[5.4837]
```
        case SP_MUMMY:
```

Replacement in crawl-ref/source/newgame.cc at line 1946 [6.1132300]

B:BD[5.4893] → [7.2652:2714]

            if (!summon_too && player_genus(GENPC_DRACONIAN))

[5.4893]

[7.2714]

            if (player_genus(GENPC_DRACONIAN))

Deletion in crawl-ref/source/newgame.cc at line 1955 [6.1132300]

B:BD[5.5001] → [4.2562:2584]

∅:D[4.2584] → [5.5028:5130]

B:BD[5.5028] → [5.5028:5130]

        case SP_OGRE:
            if (!summon_too)
                return (CC_RESTRICTED);
            // else fall-through

Deletion in crawl-ref/source/newgame.cc at line 1962 [6.1132300]
B:BD[5.5310] → [5.5310:5336]
```
        case SP_HALFLING:
```

Replacement in crawl-ref/source/newgame.cc at line 1966 [6.1132300]

∅:D[4.2612] → [5.5427:5475]

B:BD[5.5427] → [5.5427:5475]

        case SP_GHOUL:
        case SP_VAMPIRE:

[4.2612]

[5.5475]

        case SP_KENKU:
        case SP_DEMIGOD:
        case SP_DEMONSPAWN:
        case SP_MUMMY:

Replacement in crawl-ref/source/newgame.cc at line 1973 [6.1132300]

B:BD[5.5531] → [7.2757:2819]

            if (!summon_too && player_genus(GENPC_DRACONIAN))

[5.5531]

[7.2819]

            if (player_genus(GENPC_DRACONIAN))

Deletion in crawl-ref/source/newgame.cc at line 1982 [6.1132300]
B:BD[5.5645] → [5.5645:5668]
```
        case SP_HUMAN:
```
Deletion in crawl-ref/source/newgame.cc at line 1985 [6.1132300]
B:BD[5.5748] → [5.5748:5796]
```
        case SP_MERFOLK:
        case SP_GNOME:
```
Deletion in crawl-ref/source/newgame.cc at line 1987 [6.1132300]
B:BD[5.5842] → [5.5842:5869]
```
        case SP_OGRE_MAGE:
```
Replacement in crawl-ref/source/newgame.cc at line 1988 [6.1132300]
B:BD[5.5892] → [5.5892:5920]
```
        case SP_DEMONSPAWN:
```
[5.5892]
[5.5920]
```
        case SP_MUMMY:
```

Deletion in crawl-ref/source/newgame.cc at line 1994 [6.1132300]

B:BD[5.6020] → [7.2862:2951]

            if (player_genus(GENPC_DRACONIAN))
                return (CC_UNRESTRICTED);

Replacement in crawl-ref/source/newgame.cc at line 2140 [6.1132300]

B:BD[8.2869] → [8.2869:2892]

        case SP_HUMAN:

[8.2869]

[8.2892]

        case SP_NAGA:
        case SP_VAMPIRE:
            // The fighter's heavy armour hinders stabbing.
            if (you.char_class == JOB_FIGHTER)
                return (CC_RESTRICTED);
            // else fall through

Deletion in crawl-ref/source/newgame.cc at line 2156 [6.1132300]

B:BD[8.3238] → [8.3238:3334]

        case SP_NAGA:
        case SP_MINOTAUR:
        case SP_KENKU:
        case SP_VAMPIRE:

Replacement in crawl-ref/source/newgame.cc at line 2159 [6.1132300]

B:BD[8.3390] → [9.3553:3689]

            return (player_genus(GENPC_DRACONIAN) ? CC_UNRESTRICTED
                                                  : CC_RESTRICTED);

[8.3390]

[8.3536]

            return (CC_RESTRICTED);

Replacement in crawl-ref/source/newgame.cc at line 2162 [6.1132300]

B:BD[10.17388] → [11.3804:3857]

    // Mace and hand axe, usually the same aptitude.

[10.17388]

[8.3547]

    // Maces and hand axes usually share the same restrictions.

Insertion in crawl-ref/source/newgame.cc at line 2166 [6.1132300]

[8.3641]

        if (you.species == SP_VAMPIRE)
            return (CC_RESTRICTED);

Insertion in crawl-ref/source/newgame.cc at line 2182 [6.1132300]

[8.3981]

        case SP_DEMIGOD:
        case SP_DEMONSPAWN:
        case SP_VAMPIRE:

Insertion in crawl-ref/source/newgame.cc at line 2203 [6.1132300]
[8.4464]
[4.2638]
```
        case SP_DEMIGOD:
        case SP_DEMONSPAWN:
```
Deletion in crawl-ref/source/newgame.cc at line 2227 [6.1132300]
B:BD[2.2796] → [2.2796:2849]
```
        case SP_DEMIGOD:
        case SP_DEMONSPAWN:
```
Replacement in crawl-ref/source/newgame.cc at line 2443 [6.1132300]
B:BD[9.5160] → [9.5160:5200]
```
static bool _has_good_necromancy_apts()
```
[9.5160]
[9.5200]
```
static bool _necromancy_okay()
```
Deletion in crawl-ref/source/newgame.cc at line 2447 [6.1132300]
B:BD[9.5233] → [9.5233:5252]
```
    case SP_HUMAN:
```
Deletion in crawl-ref/source/newgame.cc at line 2449 [6.1132300]
B:BD[9.5298] → [9.5298:5336]
```
    case SP_KOBOLD:
    case SP_NAGA:
```
Deletion in crawl-ref/source/newgame.cc at line 2450 [6.1132300]
B:BD[9.5359] → [9.5359:5378]
```
    case SP_KENKU:
```

Replacement in crawl-ref/source/newgame.cc at line 4452 [6.1132300]

B:BD[3.11375] → [3.11375:11444]

            if (Options.good_random && !_has_good_necromancy_apts())

[3.11375]

[3.11444]

            if (Options.good_random && !_necromancy_okay())

Replacement in crawl-ref/source/newgame.cc at line 4464 [6.1132300]
B:BD[3.11712] → [3.11712:11757]
```
            if (_has_good_necromancy_apts())
```
[3.11712]
[3.11757]
```
            if (_necromancy_okay())
```

Replacement in crawl-ref/source/newgame.cc at line 4516 [6.1132300]

B:BD[3.13429] → [3.13429:13498]

                    if (keyn == '+' && !_has_good_necromancy_apts())

[3.13429]

[3.13498]

                    if (keyn == '+' && !_necromancy_okay())

Update a number of secondary choice restrictions (books and weapons).

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/newgame.cc at line 1928 [6.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1935 [6.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1940 [6.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1942 [6.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1946 [6.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1955 [6.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1962 [6.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1966 [6.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1973 [6.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1982 [6.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1985 [6.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1987 [6.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1988 [6.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1994 [6.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2140 [6.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2156 [6.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2159 [6.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2162 [6.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2166 [6.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2182 [6.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2203 [6.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2227 [6.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2443 [6.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2447 [6.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2449 [6.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2450 [6.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4452 [6.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4464 [6.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4516 [6.1132300]