fiddlerwoaroof/crawl - Change HCQBAKIE4MXJ3XID6CECTZGNWYC33C3642KOKNKO37VVRDMJ2T4QC

Add several complicated restrictions to the starting gods. Yes, this is

probably done in a needlessly redundant way, but I'm tired and cranky, so please do forgive me. Might be buggy, thus won't apply to 0.4 yet.

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

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

HCQBAKIE4MXJ3XID6CECTZGNWYC33C3642KOKNKO37VVRDMJ2T4QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.cc at line 1986 [7.39949]
B:BD[6.666] → [6.666:680]
```
    // portal
```
[6.666]
[8.654]
```
    // portal.
```

Replacement in crawl-ref/source/travel.cc at line 3433 [7.39949]

B:BD[9.2897] → [9.2897:2962]

    return (i == levels.end()? false : i->second.know_stair(c));

[9.2897]

[9.2962]

    return (i == levels.end() ? false : i->second.know_stair(c));

Replacement in crawl-ref/source/travel.cc at line 3438 [7.39949]

B:BD[7.125095] → [7.125095:125199]

    if (num < 0 || num >= TRAVEL_WAYPOINT_COUNT) return;
    if (waypoints[num].id.depth == -1) return;

[7.125095]

[7.125199]

    if (num < 0 || num >= TRAVEL_WAYPOINT_COUNT)
        return;
    if (waypoints[num].id.depth == -1)
        return;

Replacement in crawl-ref/source/newgame.cc at line 2419 [11.1132300]
B:BD[10.5769] → [10.5769:5814]
```
static bool _is_valid_religion(god_type god)
```
[10.5769]
[10.5814]
```
static char_choice_restriction  _religion_restriction(god_type god)
```

Replacement in crawl-ref/source/newgame.cc at line 2423 [11.1132300]

B:BD[10.5872] → [10.5872:5896]

        return (false);

[10.5872]

[10.5896]

        return (CC_BANNED);
    switch (god)
    {
    case GOD_BEOGH:
        if (you.species == SP_HILL_ORC)
            return (CC_UNRESTRICTED);
        return (CC_BANNED);
    case GOD_ZIN:
        switch (you.species)
        {
        case SP_DEMONSPAWN:
        case SP_MUMMY:
        case SP_GHOUL:
        case SP_VAMPIRE:
            return (CC_BANNED);
        case SP_HIGH_ELF:
        case SP_MOUNTAIN_DWARF:
            return (CC_UNRESTRICTED);
        default:
            return (CC_RESTRICTED);
        }
    case GOD_YREDELEMNUL:
        switch (you.species)
        {
        case SP_HILL_ORC:
            // Restrict in favour of Beogh, else unrestricted.
            if (you.char_class == JOB_PRIEST)
                return (CC_RESTRICTED);
            // intentional fall-through
        case SP_HUMAN:
        case SP_HIGH_ELF:
        case SP_SLUDGE_ELF:
        case SP_MOUNTAIN_DWARF:
        case SP_MERFOLK:
        case SP_HALFLING:
        case SP_KOBOLD:
        case SP_CENTAUR:
        case SP_OGRE:
        case SP_TROLL:
        case SP_MINOTAUR:
        case SP_DEMONSPAWN:
        case SP_MUMMY:
        case SP_GHOUL:
        case SP_VAMPIRE:
            return (CC_UNRESTRICTED);
        default:
            if (player_genus(GENPC_DRACONIAN))
                return (CC_UNRESTRICTED);
            return (CC_RESTRICTED);
        }

Replacement in crawl-ref/source/newgame.cc at line 2477 [11.1132300]

B:BD[10.5897] → [10.5897:5968]

    if (god == GOD_BEOGH)
        return (you.species == SP_HILL_ORC);

[10.5897]

[10.5968]

    case GOD_XOM:
        switch (you.species)
        {
        case SP_HUMAN:
        case SP_MOUNTAIN_DWARF:
        case SP_HILL_ORC:
        case SP_MERFOLK:
        case SP_CENTAUR:
        case SP_OGRE:
        case SP_TROLL:
        case SP_MINOTAUR:
        case SP_KENKU:
        case SP_DEMONSPAWN:
        case SP_VAMPIRE:
            return (CC_UNRESTRICTED);
        default:
            if (player_genus(GENPC_DRACONIAN))
                return (CC_UNRESTRICTED);
            return (CC_RESTRICTED);
        }
    case GOD_MAKHLEB:
        switch (you.species)
        {
        case SP_HUMAN:
        case SP_HIGH_ELF:
        case SP_SLUDGE_ELF:
        case SP_MOUNTAIN_DWARF:
        case SP_MERFOLK:
        case SP_HALFLING:
        case SP_GNOME:
        case SP_KOBOLD:
        case SP_CENTAUR:
        case SP_OGRE:
        case SP_TROLL:
        case SP_MINOTAUR:
        case SP_DEMONSPAWN:
        case SP_MUMMY:
        case SP_GHOUL:
        case SP_VAMPIRE:
            return (CC_UNRESTRICTED);
        default:
            if (player_genus(GENPC_DRACONIAN))
                return (CC_UNRESTRICTED);
            return (CC_RESTRICTED);
        }

Replacement in crawl-ref/source/newgame.cc at line 2524 [11.1132300]

B:BD[10.5969] → [10.5969:6119]

    switch (you.species)
    {
    case SP_DEMONSPAWN:
    case SP_MUMMY:
    case SP_GHOUL:
    case SP_VAMPIRE:
        return (!is_good_god(god));

[10.5969]

[10.6119]

    case GOD_LUGONU:
        switch (you.species)
        {
        case SP_HUMAN:
        case SP_MOUNTAIN_DWARF:
        case SP_HILL_ORC:
        case SP_MERFOLK:
        case SP_SPRIGGAN:
        case SP_CENTAUR:
        case SP_OGRE:
        case SP_TROLL:
        case SP_MINOTAUR:
        case SP_DEMONSPAWN:
        case SP_VAMPIRE:
            return (CC_UNRESTRICTED);
        default:
            if (player_genus(GENPC_DRACONIAN))
                return (CC_UNRESTRICTED);
            return (CC_RESTRICTED);
        }

Replacement in crawl-ref/source/newgame.cc at line 2546 [11.1132300]
B:BD[10.6133] → [10.6133:6166]
B:BD[10.6166] → [12.5128:5151]
```
        // All gods are allowed.
        return (true);
```
[10.6133]
[12.5151]
```
        return (CC_RESTRICTED);
```

Insertion in crawl-ref/source/newgame.cc at line 4290 [11.1132300]

[11.1223477]

[13.26007]

            const god_type gods[3] = { GOD_ZIN, GOD_YREDELEMNUL, GOD_BEOGH };

Replacement in crawl-ref/source/newgame.cc at line 4293 [11.1132300]

B:BD[13.26048] → [10.6196:6249]

            if (!_is_valid_religion(Options.priest))

[13.26048]

[14.3025]

            if (_religion_restriction(Options.priest) == CC_BANNED)

Replacement in crawl-ref/source/newgame.cc at line 4300 [11.1132300]

B:BD[14.3317] → [14.3317:3388]

                you.religion = coinflip() ? GOD_YREDELEMNUL : GOD_ZIN;

[14.3317]

[15.9827]

                bool did_chose = false;
                if (Options.good_random)
                {
                    int count = 0;
                    for (int i = 0; i < 3; i++)
                    {
                        if (_religion_restriction(gods[i]) == CC_BANNED)
                            continue;

Replacement in crawl-ref/source/newgame.cc at line 4309 [11.1132300]

B:BD[15.9828] → [13.26049:26106]

∅:D[13.26106] → [14.3457:3565]

B:BD[14.3457] → [14.3457:3565]

                // For orcs 50% chance of Beogh instead.
                if (you.species == SP_HILL_ORC && coinflip())
                    you.religion = GOD_BEOGH;

[15.9828]

[15.9829]

                        if (_religion_restriction(gods[i]) == CC_UNRESTRICTED
                            && one_chance_in(++count))
                        {
                            you.religion = gods[i];
                            did_chose = true;
                        }
                    }
                }

Insertion in crawl-ref/source/newgame.cc at line 4318 [11.1132300]

[15.9830]

[14.3582]

                if (!did_chose)
                {
                    you.religion = (coinflip() ? GOD_YREDELEMNUL : GOD_ZIN);
                    // For orcs 50% chance of Beogh instead.
                    if (you.species == SP_HILL_ORC && coinflip())
                        you.religion = GOD_BEOGH;
                }

Replacement in crawl-ref/source/newgame.cc at line 4335 [11.1132300]

B:BD[11.1223597] → [10.6250:6408]

∅:D[10.6408] → [14.3835:3901]

∅:D[13.26359] → [14.3835:3901]

B:BD[14.3835] → [14.3835:3901]

∅:D[13.26711] → [14.3901:3972]

B:BD[14.3901] → [14.3901:3972]

                // Zin and Yredelemnul are valid for everyone.
                // (The undead have been handled above.)
                textcolor(LIGHTGREY);
                cprintf("a - Zin (for traditional priests)" EOL);
                cprintf("b - Yredelemnul (for priests of death)" EOL);

[11.1223597]

[13.26712]

                const char* god_name[3] = {"Zin (for traditional priests)",
                                           "Yredelemnul (for priests of death)",
                                           "Beogh (for priests of Orcs)"};

Replacement in crawl-ref/source/newgame.cc at line 4339 [11.1132300]

B:BD[13.26713] → [5.5296:5347]

                if (_is_valid_religion(GOD_BEOGH))

[13.26713]

[5.5347]

                for (int i = 0; i < 3; i++)

Replacement in crawl-ref/source/newgame.cc at line 4341 [11.1132300]

B:BD[5.5365] → [5.5365:5470]

                    textcolor(LIGHTGREY);
                    cprintf("c - Beogh (priest of Orcs)" EOL);

[5.5365]

[5.5470]

                    if (_religion_restriction(gods[i]) == CC_BANNED)
                        continue;
                    if (_religion_restriction(gods[i]) == CC_UNRESTRICTED)
                        textcolor(LIGHTGREY);
                    else
                        textcolor(DARKGREY);
                    const char letter = 'a' + i;
                    cprintf("%c - %s" EOL, letter, god_name[i]);

Replacement in crawl-ref/source/newgame.cc at line 4354 [11.1132300]

B:BD[14.4120] → [14.4120:4170]

                cprintf(EOL "* - Random choice; "

[14.4120]

[14.4170]

                cprintf(EOL "* - Random choice; + - Good random choice" EOL

Replacement in crawl-ref/source/newgame.cc at line 4358 [11.1132300]

B:BD[14.4291] → [10.6638:6696]

                if (!_is_valid_religion(Options.prev_pr))

[14.4291]

[14.4371]

                if (_religion_restriction(Options.prev_pr) == CC_BANNED)

Replacement in crawl-ref/source/newgame.cc at line 4365 [11.1132300]

B:BD[14.4579] → [16.2556:2629]

                            Options.prev_pr == GOD_ZIN ?         "Zin" :

[14.4579]

[16.2629]

                            Options.prev_pr == GOD_ZIN         ? "Zin" :

Replacement in crawl-ref/source/newgame.cc at line 4367 [11.1132300]

B:BD[16.2710] → [16.2710:2859]

                            Options.prev_pr == GOD_BEOGH ?       "Beogh"
                                                         :       "Random");

[16.2710]

[14.4849]

                            Options.prev_pr == GOD_BEOGH       ? "Beogh"
                                                               : "Random");

Deletion in crawl-ref/source/newgame.cc at line 4402 [11.1132300]
B:BD[17.11323] → [17.11323:11353]
```
                    case '*':
```

Insertion in crawl-ref/source/newgame.cc at line 4403 [11.1132300]

[18.3136]

[16.2860]

                        if (keyn == '+')
                        {
                            int count = 0;
                            for (int i = 0; i < 3; i++)
                            {
                                if (_religion_restriction(gods[i]) == CC_BANNED)
                                    continue;
                                if (_religion_restriction(gods[i])
                                        == CC_UNRESTRICTED
                                    && one_chance_in(++count))
                                {
                                    you.religion = gods[i];
                                }
                            }
                            if (count > 0)
                                break;
                        }
                        // intentional fall-through
                    case '*':

Insertion in crawl-ref/source/newgame.cc at line 4473 [11.1132300]
[19.5646]
[19.5646]
```
        const god_type gods[3] = { GOD_XOM, GOD_MAKHLEB, GOD_LUGONU };
```

Replacement in crawl-ref/source/newgame.cc at line 4483 [11.1132300]

B:BD[19.5948] → [19.5948:6124]

            you.religion = (one_chance_in(3) ? GOD_XOM :
                            coinflip()       ? GOD_MAKHLEB
                                             : GOD_LUGONU);

[19.5948]

[19.6124]

            bool did_chose = false;
            if (Options.good_random)
            {
                int count = 0;
                for (int i = 0; i < 3; i++)
                {
                    if (_religion_restriction(gods[i]) == CC_BANNED)
                        continue;
                    if (_religion_restriction(gods[i]) == CC_UNRESTRICTED
                        && one_chance_in(++count))
                    {
                        you.religion = gods[i];
                        did_chose = true;
                    }
                }
            }
            if (!did_chose)
            {
                you.religion = (one_chance_in(3) ? GOD_XOM :
                                coinflip()       ? GOD_MAKHLEB
                                                 : GOD_LUGONU);
            }

Insertion in crawl-ref/source/newgame.cc at line 4515 [11.1132300]

[19.6331]


            const char* god_name[3] = {"Xom of Chaos",
                                       "Makhleb the Destroyer",
                                       "Lugonu the Unformed"};

Replacement in crawl-ref/source/newgame.cc at line 4520 [11.1132300]

B:BD[19.6332] → [2.2562:2633]

∅:D[2.2633] → [19.6399:6586]

B:BD[19.6399] → [19.6399:6586]

            // Xom, Makhleb, and Lugonu are okay choices for everyone.
            textcolor( LIGHTGREY );
            cprintf("a - Xom of Chaos" EOL);
            cprintf("b - Makhleb the Destroyer" EOL);
            cprintf("c - Lugonu the Unformed" EOL);

[19.6332]

[19.6586]

            for (int i = 0; i < 3; i++)
            {
                if (_religion_restriction(gods[i]) == CC_BANNED)
                    continue;
                if (_religion_restriction(gods[i]) == CC_UNRESTRICTED)
                    textcolor(LIGHTGREY);
                else
                    textcolor(DARKGREY);
                const char letter = 'a' + i;
                cprintf("%c - %s" EOL, letter, god_name[i]);
            }

Replacement in crawl-ref/source/newgame.cc at line 4535 [11.1132300]

B:BD[19.6619] → [19.6619:6665]

            cprintf(EOL "* - Random choice; "

[19.6619]

[19.6665]

            cprintf(EOL "* - Random choice; + - Good random choice" EOL

Insertion in crawl-ref/source/newgame.cc at line 4576 [11.1132300]

[19.8052]

                case '+':
                    if (keyn == '+')
                    {
                        int count = 0;
                        for (int i = 0; i < 3; i++)
                        {
                            if (_religion_restriction(gods[i]) == CC_BANNED)
                                continue;
                            if (_religion_restriction(gods[i])
                                    == CC_UNRESTRICTED
                                && one_chance_in(++count))
                            {
                                you.religion = gods[i];
                            }
                        }
                        if (count > 0)
                            break;
                    }
                    // intentional fall-through

Deletion in crawl-ref/source/newgame.cc at line 4597 [11.1132300]
B:BD[19.8078] → [19.8078:8104]
```
                case '+':
```

Replacement in crawl-ref/source/newgame.cc at line 4682 [11.1132300]

B:BD[19.11375] → [3.3403:3463]

∅:D[3.3463] → [19.11444:11502]

B:BD[19.11444] → [19.11444:11502]

            if (Options.good_random && !_necromancy_okay())
                choice = DK_YREDELEMNUL;
            else

[19.11375]

[19.11502]

            bool did_chose = false;
            if (Options.good_random)
            {
                if (_necromancy_okay())
                {
                    choice = DK_NECROMANCY;
                    did_chose = true;
                }
                if (_religion_restriction(GOD_YREDELEMNUL) == CC_UNRESTRICTED)
                {
                    if (!did_chose || coinflip())
                        choice = DK_YREDELEMNUL;
                    did_chose = true;
                }
            }
            if (!did_chose)

Replacement in crawl-ref/source/newgame.cc at line 4717 [11.1132300]

B:BD[19.11960] → [19.11960:11994]

            textcolor(LIGHTGREY);

[19.11960]

[19.11994]

            if (_religion_restriction(GOD_YREDELEMNUL) == CC_UNRESTRICTED)
                textcolor(LIGHTGREY);
            else
                textcolor(DARKGREY);

Replacement in crawl-ref/source/newgame.cc at line 4725 [11.1132300]

B:BD[19.12079] → [19.12079:12125]

            cprintf(EOL "* - Random choice; "

[19.12079]

[19.12125]

            cprintf(EOL "* - Random choice; + - Good random choice " EOL

Replacement in crawl-ref/source/newgame.cc at line 4765 [11.1132300]

B:BD[19.13429] → [3.3501:3561]

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

[19.13429]

[19.13498]

                    if (keyn == '+')

Replacement in crawl-ref/source/newgame.cc at line 4767 [11.1132300]

B:BD[19.13520] → [19.13520:13600]

                        choice = DK_YREDELEMNUL;
                        break;

[19.13520]

[19.13600]

                        bool did_chose = false;
                        if (_necromancy_okay())
                        {
                            choice = DK_NECROMANCY;
                            did_chose = true;
                        }
                        if (_religion_restriction(GOD_YREDELEMNUL)
                                == CC_UNRESTRICTED)
                        {
                            if (!did_chose || coinflip())
                                choice = DK_YREDELEMNUL;
                            did_chose = true;
                        }
                        if (did_chose)
                            break;

Replacement in crawl-ref/source/food.cc at line 585 [11.3043806]

B:BD[20.10835] → [20.10835:10967]

            // * Mummies can't eat
            // * Ghouls relish the bad things
            // * Vampires won't bottle bad corpses

[20.10835]

[21.7086]

            // * Mummies can't eat.
            // * Ghouls relish the bad things.
            // * Vampires won't bottle bad corpses.

Insertion in crawl-ref/source/food.cc at line 1190 [11.3043806]

[22.4043]

[4.2829]

        std::string item_name = get_message_colour_tags(*si, DESC_NOCAP_A,
                                                        MSGCH_PROMPT);

Replacement in crawl-ref/source/food.cc at line 1196 [11.3043806]
B:BD[4.3003] → [4.3003:3049]
```
             si->name(DESC_NOCAP_A).c_str());
```
[4.3003]
[23.11995]
```
             item_name.c_str());
```