fiddlerwoaroof/crawl - Change PO3IATZV4JX3I3522UAGF53ZLZ4FW7C2J32Z23PEWQVHGGEUO7SAC

Move secondary choice validity checks (gods, books, weapons) into

subfunctions of their own and use them as necessary. Has the side effect of showing Beogh as invalid choice for non-orc priests and tridents as invalid choice for small race Gladiators. Does not yet handle good random choices.

All gods are now unrestricted (if not outright banned, of course), and Necromancy has been unrestricted for a few more species.

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

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

PO3IATZV4JX3I3522UAGF53ZLZ4FW7C2J32Z23PEWQVHGGEUO7SAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/newgame.cc at line 94 [3.1132300]
[3.1135534]
[3.1135534]
```
#include "religion.h"
```

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

B:BD[2.6020] → [2.6020:6166]

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

[2.6020]

[2.6166]

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

Deletion in crawl-ref/source/newgame.cc at line 1998 [3.1132300]
B:BD[4.16083] → [2.6208:6209]
Replacement in crawl-ref/source/newgame.cc at line 2105 [3.1132300]
∅:D[5.9168] → [6.19043:19072]
B:BD[7.385862] → [6.19043:19072]
```
static bool _choose_weapon()
```
[5.9168]
[3.1168210]
```
static char_choice_restriction _weapon_restriction(weapon_type wpn)
```

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

B:BD[3.1168212] → [8.252:395]

B:BD[8.395] → [4.16990:17046]

∅:D[4.17046] → [8.395:414]

B:BD[8.395] → [8.395:414]

B:BD[8.414] → [4.17047:17073]

    const weapon_type startwep[5] = { WPN_SHORT_SWORD, WPN_MACE,
                                      WPN_HAND_AXE, WPN_SPEAR, WPN_TRIDENT };
    char_choice_restriction startwep_restrictions[5];
    int keyin = 0;
    int num_choices = 5;

Replacement in crawl-ref/source/newgame.cc at line 2108 [3.1132300]
B:BD[4.17092] → [4.17092:17117]
```
    switch (you.species)
```
[4.17092]
[4.17117]
```
    switch (wpn)
```

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

B:BD[4.17123] → [9.3356:3375]

∅:D[9.3375] → [4.17123:17189]

B:BD[4.17123] → [4.17123:17189]

B:BD[4.17189] → [9.3376:3533]

∅:D[9.3533] → [4.17189:17250]

B:BD[4.17189] → [4.17189:17250]

B:BD[4.17250] → [9.3534:3636]

∅:D[9.3636] → [4.17250:17317]

B:BD[4.17250] → [4.17250:17317]

    case SP_HUMAN:
    case SP_HIGH_ELF:
    case SP_GREY_ELF:
    case SP_DEEP_ELF:
    // Sludge elves have bad aptitudes with short swords (110) but are still
    // better with them than any other starting weapon.
    case SP_SLUDGE_ELF:
    case SP_HALFLING:
    case SP_KOBOLD:
    case SP_GNOME:
    case SP_SPRIGGAN:
    case SP_NAGA:
    case SP_MINOTAUR:
    case SP_KENKU:
    case SP_VAMPIRE:
        startwep_restrictions[0] = CC_UNRESTRICTED;
        break;

[4.17123]

[4.17317]

    case WPN_SHORT_SWORD:
        switch (you.species)
        {
        case SP_HUMAN:
        case SP_HIGH_ELF:
        case SP_GREY_ELF:
        case SP_DEEP_ELF:
        // Sludge elves have bad aptitudes with short swords (110) but are
        // still better with them than any other starting weapon.
        case SP_SLUDGE_ELF:
        case SP_HALFLING:
        case SP_KOBOLD:
        case SP_GNOME:
        case SP_SPRIGGAN:
        case SP_NAGA:
        case SP_MINOTAUR:
        case SP_KENKU:
        case SP_VAMPIRE:
            return (CC_UNRESTRICTED);

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

B:BD[4.17318] → [4.17318:17331]

B:BD[4.17331] → [9.3637:3803]

∅:D[9.3803] → [4.17381:17387]

B:BD[4.17381] → [4.17381:17387]

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

[4.17318]

[4.17387]

        default:
            if (player_genus(GENPC_DRACONIAN))
                return (CC_UNRESTRICTED);
            else
                return (CC_RESTRICTED);
        }

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

∅:D[9.3857] → [4.17413:17444]

B:BD[4.17413] → [4.17413:17444]

B:BD[4.17444] → [9.3858:3994]

∅:D[9.3994] → [4.17444:17553]

B:BD[4.17444] → [4.17444:17553]

B:BD[4.17553] → [9.3995:4054]

∅:D[9.4054] → [4.17574:17596]

B:BD[4.17574] → [4.17574:17596]

B:BD[4.17620] → [4.17620:17758]

    switch (you.species)
    {
    case SP_TROLL:
        startwep_restrictions[1] = CC_UNRESTRICTED;
        startwep_restrictions[2] = CC_RESTRICTED;
        break;
    case SP_HUMAN:
    case SP_MOUNTAIN_DWARF:
    case SP_HILL_ORC:
    case SP_MUMMY:
    case SP_CENTAUR:
    case SP_NAGA:
    case SP_OGRE:
    case SP_OGRE_MAGE:
    case SP_MINOTAUR:
    case SP_KENKU:
        startwep_restrictions[1] = CC_UNRESTRICTED;
        startwep_restrictions[2] = CC_UNRESTRICTED;
        break;

[9.3857]

[4.17758]

    case WPN_MACE:
        if (you.species == SP_TROLL)
            return (CC_UNRESTRICTED);
        // else fall-through
    case WPN_HAND_AXE:
        switch (you.species)
        {
        case SP_HUMAN:
        case SP_MOUNTAIN_DWARF:
        case SP_HILL_ORC:
        case SP_MUMMY:
        case SP_CENTAUR:
        case SP_NAGA:
        case SP_OGRE:
        case SP_OGRE_MAGE:
        case SP_MINOTAUR:
        case SP_KENKU:
            return (CC_UNRESTRICTED);
        default:
            if (player_genus(GENPC_DRACONIAN))
                return (CC_UNRESTRICTED);
            else
                return (CC_RESTRICTED);
        }

Replacement in crawl-ref/source/newgame.cc at line 2164 [3.1132300]
B:BD[4.17759] → [4.17759:17772]
B:BD[4.17772] → [9.4055:4098]
```
    default:
        if (player_genus(GENPC_DRACONIAN))
```
[4.17759]
[9.4098]
```
    case WPN_SPEAR:
        switch (you.species)
```

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

B:BD[9.4108] → [9.4108:4220]

            startwep_restrictions[1] = CC_UNRESTRICTED;
            startwep_restrictions[2] = CC_UNRESTRICTED;

[9.4108]

[9.4220]

        case SP_HUMAN:
        case SP_HILL_ORC:
        case SP_MERFOLK:
        case SP_MUMMY:
        case SP_NAGA:
        case SP_CENTAUR:
        case SP_OGRE_MAGE:
        case SP_MINOTAUR:
        case SP_KENKU:
            return (CC_UNRESTRICTED);
            break;
        default:
            if (player_genus(GENPC_DRACONIAN))
                return (CC_UNRESTRICTED);
            else
                return (CC_RESTRICTED);

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

B:BD[9.4230] → [9.4230:4243]

        else

[9.4230]

[9.4243]


    case WPN_TRIDENT:
        if (you.species != SP_MERFOLK
            && (you.char_class != JOB_GLADIATOR
                || player_size(PSIZE_BODY) < SIZE_MEDIUM))

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

B:BD[9.4253] → [9.4253:4361]

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

[9.4253]

[9.4361]

            return (CC_BANNED);

Deletion in crawl-ref/source/newgame.cc at line 2193 [3.1132300]
∅:D[9.4371] → [4.17872:17878]
B:BD[4.17872] → [4.17872:17878]
```
    }
```
Replacement in crawl-ref/source/newgame.cc at line 2194 [3.1132300]
B:BD[4.17879] → [4.17879:17964]
B:BD[4.17964] → [9.4372:4393]
∅:D[9.4393] → [4.17964:17983]
B:BD[4.17964] → [4.17964:17983]
B:BD[4.17983] → [9.4394:4412]
∅:D[9.4412] → [4.17983:18004]
B:BD[4.17983] → [4.17983:18004]
B:BD[4.18004] → [9.4413:4436]
∅:D[9.4436] → [4.18025:18047]
B:BD[4.18025] → [4.18025:18047]
B:BD[4.18071] → [4.18071:18090]
B:BD[4.18111] → [4.18111:18178]
```
    // Spear
    switch (you.species)
    {
    case SP_HUMAN:
    case SP_HILL_ORC:
    case SP_MERFOLK:
    case SP_MUMMY:
    case SP_NAGA:
    case SP_CENTAUR:
    case SP_OGRE_MAGE:
    case SP_MINOTAUR:
    case SP_KENKU:
        startwep_restrictions[3] = CC_UNRESTRICTED;
        break;
```
[4.17879]
[4.18178]
```
        // Both are polearms, right?
        return (_weapon_restriction(WPN_SPEAR));
```

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

B:BD[4.18192] → [9.4437:4603]

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

[4.18192]

[4.18242]

        return (CC_BANNED);

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

[4.18248]

[3.1168451]

}
static bool _choose_weapon()
{
    const weapon_type startwep[5] = { WPN_SHORT_SWORD, WPN_MACE,
                                      WPN_HAND_AXE, WPN_SPEAR, WPN_TRIDENT };

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

B:BD[3.1168452] → [4.18249:18264]

∅:D[4.18264] → [10.3195:3263]

B:BD[3.1168452] → [10.3195:3263]

∅:D[10.3263] → [11.2566:2610]

B:BD[11.2566] → [11.2566:2610]

B:BD[11.2610] → [9.4604:4702]

∅:D[9.4702] → [11.2611:2617]

∅:D[4.18317] → [11.2611:2617]

B:BD[3.1168768] → [11.2611:2617]

B:BD[11.2617] → [4.18318:18373]

    // Trident
    if (you.char_class == JOB_GLADIATOR && you.species != SP_KOBOLD
        || you.species == SP_MERFOLK)
    {
        // Both are polearms, right?
        startwep_restrictions[4] = startwep_restrictions[3];
    }
    else
        startwep_restrictions[4] = CC_BANNED;

[3.1168452]

[3.1168768]

    char_choice_restriction startwep_restrictions[5];
    int keyin = 0;
    const int num_choices = (you.char_class == JOB_GLADIATOR
                             || you.species == SP_MERFOLK ? 5 : 4);
    for (int i = 0; i < num_choices; i++)
        startwep_restrictions[i] = _weapon_restriction(startwep[i]);

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

B:BD[4.18858] → [4.18858:18924]

               || startwep_restrictions[keyin-'a'] == CC_BANNED);

[4.18858]

[12.218011]

               || startwep_restrictions[keyin - 'a'] == CC_BANNED);

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

B:BD[3.1169806] → [13.1330:1406]

        if (keyin != '*' && effective_stat_bonus(startwep[keyin-'a']) > -4)

[3.1169806]

[7.385975]

        if (keyin != '*' && effective_stat_bonus(startwep[keyin - 'a']) > -4)

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

[4.19081]

[3.1170349]

}
// Gods are not restricted but there are some choices that are banned (false).
// Everything else will be unrestricted.
static bool _is_valid_religion(god_type god)
{
    // Sanity check.
    if (you.species == SP_DEMIGOD)
        return (false);
    if (god == GOD_BEOGH)
        return (you.species == SP_HILL_ORC);
    switch (you.species)
    {
    case SP_DEMONSPAWN:
    case SP_MUMMY:
    case SP_GHOUL:
    case SP_VAMPIRE:
        return (!is_good_god(god));
    default:
        // All gods are allowed.
        return (true);
    }

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

∅:D[4.26048] → [14.2950:3025]

B:BD[14.2950] → [14.2950:3025]

            if (you.species != SP_HILL_ORC && Options.priest == GOD_BEOGH)

[4.26048]

[14.3025]

            if (!_is_valid_religion(Options.priest))

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

B:BD[3.1223597] → [4.26107:26359]

                switch (you.species)
                {
                case SP_MOUNTAIN_DWARF:
                    textcolor( LIGHTGREY );
                    break;
                default:
                    textcolor( DARKGREY );
                }

[3.1223597]

[14.3835]

                // Zin and Yredelemnul are valid for everyone.
                // (The undead have been handled above.)
                textcolor(LIGHTGREY);

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

B:BD[14.3901] → [4.26360:26711]


                switch (you.species)
                {
                case SP_HUMAN:
                case SP_MOUNTAIN_DWARF:
                case SP_MUMMY:
                case SP_DEMONSPAWN:
                    textcolor( LIGHTGREY );
                    break;
                default:
                    textcolor( DARKGREY );
                }

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

∅:D[4.26713] → [14.3972:4020]

B:BD[14.3972] → [14.3972:4020]

B:BD[14.4020] → [4.26714:26776]

∅:D[4.26776] → [14.4020:4083]

B:BD[14.4020] → [14.4020:4083]

B:BD[14.4083] → [4.26777:26795]

                if (you.species == SP_HILL_ORC)
                {
                    textcolor( LIGHTGREY );
                    cprintf("c - Beogh (priest of Orcs)" EOL);
                }

[4.26713]

[15.18713]

                const bool valid = _is_valid_religion(GOD_BEOGH);
                textcolor( valid ? LIGHTGREY : DARKGREY );
                cprintf("%s - Beogh (priest of Orcs)" EOL,
                        valid ? "c" : " ");

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

B:BD[14.4291] → [14.4291:4371]

                if (Options.prev_pr == GOD_BEOGH && you.species != SP_HILL_ORC)

[14.4291]

[14.4371]

                if (!_is_valid_religion(Options.prev_pr))

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

∅:D[5.9834] → [16.12213:12279]

B:BD[16.12213] → [16.12213:12279]

                ng_pr = (keyn == '*'? GOD_RANDOM : you.religion);

[5.9834]

[14.6378]

                ng_pr = (keyn == '*' ? GOD_RANDOM : you.religion);

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

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

[4.28868]

[9.4703]

            case SP_KOBOLD:
            case SP_NAGA:
            case SP_OGRE_MAGE:

Insertion in crawl-ref/source/newgame.cc at line 4727 [3.1132300]
[9.4730]
[9.4730]
```
            case SP_DEMONSPAWN:
```

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

B:BD[4.29038] → [4.29038:29075]

                textcolor(DARKGREY);

[4.29038]

[4.29075]

                textcolor(player_genus(GENPC_DRACONIAN) ? LIGHTGREY : DARKGREY);

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

B:BD[3.1252285] → [4.29090:29323]

B:BD[4.29323] → [9.4758:4787]

∅:D[9.4787] → [4.29323:29350]

B:BD[4.29323] → [4.29323:29350]

B:BD[4.29350] → [9.4788:4817]

∅:D[9.4817] → [4.29350:29438]

B:BD[4.29350] → [4.29350:29438]

B:BD[4.29467] → [4.29467:29556]

B:BD[4.29614] → [4.29614:29747]


            switch (you.species)
            {
            case SP_HUMAN:
            case SP_HIGH_ELF:
            case SP_SLUDGE_ELF:
            case SP_MOUNTAIN_DWARF:
            case SP_HALFLING:
            case SP_HILL_ORC:
            case SP_MERFOLK:
            case SP_GNOME:
            case SP_CENTAUR:
            case SP_OGRE:
            case SP_TROLL:
            case SP_RED_DRACONIAN:
            case SP_MINOTAUR:
            case SP_DEMONSPAWN:
            case SP_GHOUL:
                textcolor(LIGHTGREY);
                break;
            default:
                textcolor(DARKGREY);
            }

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

[4.29748]

[3.1252285]

            // Yredelemnul is an okay choice for everyone.
            textcolor(LIGHTGREY);

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

B:BD[3.1255024] → [4.29890:30115]

B:BD[4.30150] → [4.30150:30383]

B:BD[4.30383] → [9.5039:5198]

∅:D[9.5198] → [4.30422:30436]

B:BD[4.30422] → [4.30422:30436]

            switch (you.species)
            {
            case SP_HUMAN:
            case SP_SLUDGE_ELF:
            case SP_MOUNTAIN_DWARF:
            case SP_HILL_ORC:
            case SP_OGRE:
            case SP_TROLL:
            case SP_CENTAUR:
            case SP_MINOTAUR:
            case SP_DEMONSPAWN:
            case SP_MERFOLK:
            case SP_VAMPIRE:
                textcolor( LIGHTGREY );
                break;
            default:
                if (player_genus(GENPC_DRACONIAN))
                    textcolor( LIGHTGREY );
                else
                    textcolor( DARKGREY );
            }

[3.1255024]

[3.1255060]

            // Both Xom and Makhleb are okay choices for everyone.
            textcolor( LIGHTGREY );

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

B:BD[3.1255105] → [4.30437:30805]

B:BD[4.30840] → [4.30840:31100]

B:BD[4.31100] → [9.5199:5358]

∅:D[9.5358] → [4.31139:31153]

B:BD[4.31139] → [4.31139:31153]


            switch (you.species)
            {
            case SP_HUMAN:
            case SP_HIGH_ELF:
            case SP_SLUDGE_ELF:
            case SP_MOUNTAIN_DWARF:
            case SP_HALFLING:
            case SP_HILL_ORC:
            case SP_KOBOLD:
            case SP_MUMMY:
            case SP_GNOME:
            case SP_OGRE:
            case SP_TROLL:
            case SP_CENTAUR:
            case SP_MINOTAUR:
            case SP_DEMONSPAWN:
            case SP_GHOUL:
            case SP_MERFOLK:
            case SP_VAMPIRE:
                textcolor( LIGHTGREY );
                break;
            default:
                if (player_genus(GENPC_DRACONIAN))
                    textcolor( LIGHTGREY );
                else
                    textcolor( DARKGREY );
            }

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

B:BD[12.233526] → [16.13603:13800]

                        Options.prev_ck == GOD_XOM?     "Xom" :
                        Options.prev_ck == GOD_MAKHLEB? "Makhleb"
                                                      : "Random");

[12.233526]

[12.233717]

                        Options.prev_ck == GOD_XOM     ? "Xom" :
                        Options.prev_ck == GOD_MAKHLEB ? "Makhleb"
                                                       : "Random");

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

B:BD[3.1256624] → [3.1256624:1256661]

B:BD[3.1256661] → [4.31445:31482]

∅:D[4.31482] → [17.4679:4716]

B:BD[3.1256697] → [17.4679:4716]

B:BD[17.4716] → [4.31483:31520]

        you.skills[SK_FIGHTING] = 2;
        you.skills[SK_DODGING]  = 1;
        you.skills[SK_THROWING] = 2;
        you.skills[SK_STAVES]   = 3;

[3.1256246]

[18.180]

        you.skills[SK_FIGHTING]    = 2;
        you.skills[SK_DODGING]     = 1;
        you.skills[SK_THROWING]    = 2;
        you.skills[SK_STAVES]      = 3;