fiddlerwoaroof/crawl - Change G5CA5STLILMQZO2ICHZTVTW76V6RMC7KWP4ELU7ANZBNXYSTWV7AC

Move around numerous restrictions in the secondary choices during

character selection.

For weapons, I've applied the following rules:

If there are significant differences between the aptitudes for the different starting weapons, only unrestrict the best ones.
If all aptitudes are identical and <= 100, unrestrict all of them.
If all aptitudes are identical but > 100, leave all of them restricted.
If all aptitudes are really bad, but one of them is significantly better (say, 110 compared to 140) unrestrict that one.
For non-Kobold gladiators, use spear restriction value for tridents.

For books, I've similarly used the aptitudes for Fire/Ice/Summonings. I've tried to apply similar reasonings for Necromancy vs. Yredelemnul (Invocations), but because Invocations is internally boosted few species are even remotely as good in Necromancy as Invocations, so that doesn't really work. I don't understand the logic used to decide which species work good with Xom as opposed to Makhleb.

The plan is to allow players to get an idea about the strengths and weaknesses of their chosen character from the choices offered alone, and to later be able to move these checks into functions of their own and then use them for differentiating between random choices and good random choices, like for species/class.

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

Created by j-p-e-g on June 26, 2008

G5CA5STLILMQZO2ICHZTVTW76V6RMC7KWP4ELU7ANZBNXYSTWV7AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/newgame.cc at line 1919 [3.1132300]

[2.15220]

    case SP_OGRE:
        if (numbooks < 3)
            book_restrictions[0] = CC_RESTRICTED;
        // else fall-through

Insertion in crawl-ref/source/newgame.cc at line 1927 [3.1132300]
[2.15305]
[2.15305]
```
    case SP_SLUDGE_ELF:
```
Insertion in crawl-ref/source/newgame.cc at line 1929 [3.1132300]
[2.15333]
[2.15333]
```
    case SP_HILL_ORC:
    case SP_HALFLING:
    case SP_GNOME:
```
Deletion in crawl-ref/source/newgame.cc at line 1933 [3.1132300]
B:BD[2.15353] → [2.15353:15372]
```
    case SP_MUMMY:
```
Replacement in crawl-ref/source/newgame.cc at line 1935 [3.1132300]
B:BD[2.15413] → [2.15413:15461]
```
    case SP_RED_DRACONIAN:
    case SP_DEMIGOD:
```
[2.15413]
[2.15461]
```
    case SP_KENKU:
```
Deletion in crawl-ref/source/newgame.cc at line 1937 [3.1132300]
B:BD[2.15485] → [2.15485:15504]
```
    case SP_KENKU:
```

Insertion in crawl-ref/source/newgame.cc at line 1947 [3.1132300]

[2.15676]

    case SP_OGRE_MAGE:
        if (numbooks < 3)
            book_restrictions[0] = CC_RESTRICTED;
        // else fall-through

Insertion in crawl-ref/source/newgame.cc at line 1955 [3.1132300]

[2.15761]

    case SP_SLUDGE_ELF:
    case SP_HILL_ORC:
    case SP_MERFOLK:
    case SP_HALFLING:
    case SP_GNOME:

Deletion in crawl-ref/source/newgame.cc at line 1961 [3.1132300]
B:BD[2.15781] → [2.15781:15800]
```
    case SP_MUMMY:
```

Replacement in crawl-ref/source/newgame.cc at line 1962 [3.1132300]

B:BD[2.15818] → [2.15818:15953]

    case SP_OGRE_MAGE:
    case SP_RED_DRACONIAN:
    case SP_DEMIGOD:
    case SP_DEMONSPAWN:
    case SP_KENKU:
    case SP_MERFOLK:

[2.15818]

[2.15953]

    case SP_OGRE:
    case SP_GHOUL:
    case SP_VAMPIRE:

Insertion in crawl-ref/source/newgame.cc at line 1975 [3.1132300]
[2.16131]
[2.16131]
```
    case SP_HUMAN:
```
Insertion in crawl-ref/source/newgame.cc at line 1979 [3.1132300]
[2.16199]
[2.16199]
```
    case SP_MERFOLK:
    case SP_GNOME:
```
Deletion in crawl-ref/source/newgame.cc at line 1982 [3.1132300]
B:BD[2.16219] → [2.16219:16238]
```
    case SP_MUMMY:
```
Insertion in crawl-ref/source/newgame.cc at line 1983 [3.1132300]
[2.16256]
[2.16256]
```
    case SP_OGRE_MAGE:
```
Insertion in crawl-ref/source/newgame.cc at line 1985 [3.1132300]
[2.16275]
[2.16275]
```
    case SP_DEMONSPAWN:
```

Replacement in crawl-ref/source/newgame.cc at line 1991 [3.1132300]

B:BD[2.16373] → [2.16373:16419]

        book_restrictions[2] = CC_RESTRICTED;

[2.16373]

[2.16419]

        if (player_genus(GENPC_DRACONIAN))
            book_restrictions[2] = CC_UNRESTRICTED;
        else
            book_restrictions[2] = CC_RESTRICTED;

Insertion in crawl-ref/source/newgame.cc at line 2103 [3.1132300]
[2.17123]
[2.17123]
```
    case SP_HUMAN:
```

Insertion in crawl-ref/source/newgame.cc at line 2107 [3.1132300]

[2.17189]

    // Sludge elves have bad aptitudes with short swords (110) but are still
    // better with them than any other starting weapon.
    case SP_SLUDGE_ELF:

Insertion in crawl-ref/source/newgame.cc at line 2113 [3.1132300]

[2.17250]

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

Replacement in crawl-ref/source/newgame.cc at line 2122 [3.1132300]

B:BD[2.17331] → [2.17331:17381]

        startwep_restrictions[0] = CC_RESTRICTED;

[2.17331]

[2.17381]

        if (player_genus(GENPC_DRACONIAN))
            startwep_restrictions[0] = CC_UNRESTRICTED;
        else
            startwep_restrictions[0] = CC_RESTRICTED;

Replacement in crawl-ref/source/newgame.cc at line 2128 [3.1132300]
B:BD[2.17388] → [2.17388:17413]
```
    // Mace and hand axe
```
[2.17388]
[2.17413]
```
    // Mace and hand axe, usually the same aptitude.
```

Insertion in crawl-ref/source/newgame.cc at line 2131 [3.1132300]

[2.17444]

    case SP_TROLL:
        startwep_restrictions[1] = CC_UNRESTRICTED;
        startwep_restrictions[2] = CC_RESTRICTED;
        break;

Replacement in crawl-ref/source/newgame.cc at line 2140 [3.1132300]
B:BD[2.17553] → [2.17553:17574]
```
    case SP_DEMIGOD:
```
[2.17553]
[2.17574]
```
    case SP_NAGA:
    case SP_OGRE:
    case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 2144 [3.1132300]
B:BD[2.17596] → [2.17596:17620]
```
    case SP_DEMONSPAWN:
```

Replacement in crawl-ref/source/newgame.cc at line 2150 [3.1132300]

B:BD[2.17772] → [2.17772:17872]

        startwep_restrictions[1] = CC_RESTRICTED;
        startwep_restrictions[2] = CC_RESTRICTED;

[2.17772]

[2.17872]

        if (player_genus(GENPC_DRACONIAN))
        {
            startwep_restrictions[1] = CC_UNRESTRICTED;
            startwep_restrictions[2] = CC_UNRESTRICTED;
        }
        else
        {
            startwep_restrictions[1] = CC_RESTRICTED;
            startwep_restrictions[2] = CC_RESTRICTED;
        }

Insertion in crawl-ref/source/newgame.cc at line 2167 [3.1132300]
[2.17964]
[2.17964]
```
    case SP_MERFOLK:
```
Insertion in crawl-ref/source/newgame.cc at line 2169 [3.1132300]
[2.17983]
[2.17983]
```
    case SP_NAGA:
```
Replacement in crawl-ref/source/newgame.cc at line 2171 [3.1132300]
B:BD[2.18004] → [2.18004:18025]
```
    case SP_DEMIGOD:
```
[2.18004]
[2.18025]
```
    case SP_OGRE_MAGE:
```
Deletion in crawl-ref/source/newgame.cc at line 2173 [3.1132300]
B:BD[2.18047] → [2.18047:18071]
```
    case SP_DEMONSPAWN:
```
Deletion in crawl-ref/source/newgame.cc at line 2174 [3.1132300]
B:BD[2.18090] → [2.18090:18111]
```
    case SP_MERFOLK:
```

Replacement in crawl-ref/source/newgame.cc at line 2178 [3.1132300]

B:BD[2.18192] → [2.18192:18242]

        startwep_restrictions[3] = CC_RESTRICTED;

[2.18192]

[2.18242]

        if (player_genus(GENPC_DRACONIAN))
            startwep_restrictions[3] = CC_UNRESTRICTED;
        else
            startwep_restrictions[3] = CC_RESTRICTED;

Replacement in crawl-ref/source/newgame.cc at line 2188 [3.1132300]

B:BD[4.2610] → [2.18265:18317]

        startwep_restrictions[4] = CC_UNRESTRICTED;

[4.2610]

[4.2611]

        // Both are polearms, right?
        startwep_restrictions[4] = startwep_restrictions[3];

Replacement in crawl-ref/source/newgame.cc at line 4693 [3.1132300]

B:BD[2.28868] → [2.28868:28900]

            case SP_DEMONSPAWN:

[2.28868]

[2.28900]

            case SP_KENKU:
            case SP_MUMMY:

Insertion in crawl-ref/source/newgame.cc at line 4712 [3.1132300]
[2.29323]
[2.29323]
```
            case SP_MERFOLK:
```
Insertion in crawl-ref/source/newgame.cc at line 4714 [3.1132300]
[2.29350]
[2.29350]
```
            case SP_CENTAUR:
```
Deletion in crawl-ref/source/newgame.cc at line 4718 [3.1132300]
B:BD[2.29438] → [2.29438:29467]
```
            case SP_CENTAUR:
```
Deletion in crawl-ref/source/newgame.cc at line 4721 [3.1132300]
B:BD[2.29556] → [2.29556:29614]
```
            case SP_MERFOLK:
            case SP_VAMPIRE:
```

Replacement in crawl-ref/source/newgame.cc at line 4738 [3.1132300]

∅:D[5.9897] → [6.232531:232749]

B:BD[6.232531] → [6.232531:232749]

                        Options.prev_dk == DK_NECROMANCY? "Necromancy" :
                        Options.prev_dk == DK_YREDELEMNUL? "Yredelemnul" :
                                                           "Random");

[5.9897]

[6.232749]

                        Options.prev_dk == DK_NECROMANCY  ? "Necromancy" :
                        Options.prev_dk == DK_YREDELEMNUL ? "Yredelemnul"
                                                          : "Random");

Deletion in crawl-ref/source/newgame.cc at line 4861 [3.1132300]
B:BD[2.30115] → [2.30115:30150]
```
            case SP_RED_DRACONIAN:
```

Replacement in crawl-ref/source/newgame.cc at line 4869 [3.1132300]

B:BD[2.30383] → [2.30383:30422]

                textcolor( DARKGREY );

[2.30383]

[2.30422]

                if (player_genus(GENPC_DRACONIAN))
                    textcolor( LIGHTGREY );
                else
                    textcolor( DARKGREY );

Deletion in crawl-ref/source/newgame.cc at line 4889 [3.1132300]
B:BD[2.30805] → [2.30805:30840]
```
            case SP_RED_DRACONIAN:
```

Replacement in crawl-ref/source/newgame.cc at line 4898 [3.1132300]

B:BD[2.31100] → [2.31100:31139]

                textcolor( DARKGREY );

[2.31100]

[2.31139]

                if (player_genus(GENPC_DRACONIAN))
                    textcolor( LIGHTGREY );
                else
                    textcolor( DARKGREY );

Move around numerous restrictions in the secondary choices during

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/newgame.cc at line 1919 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1927 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1929 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1933 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1935 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1937 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1947 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1955 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1961 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1962 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1975 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1979 [3.1132300]

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

Insertion in crawl-ref/source/newgame.cc at line 1983 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1985 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1991 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2103 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2107 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2113 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2122 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2128 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2131 [3.1132300]

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

Deletion in crawl-ref/source/newgame.cc at line 2144 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2150 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2167 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2169 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2171 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2173 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2174 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2178 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2188 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4693 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 4712 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 4714 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 4718 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 4721 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4738 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 4861 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4869 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 4889 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4898 [3.1132300]