fiddlerwoaroof/crawl - Change JPGW2YFZDRPAWPG4VAKOOB5SCJA2QSSLR5JJP7ULRBX3LLGI7PUAC

AutoID amulet of resist slowing when quaffing !slowing ("You feel

lethargic.")

Allow selection of "good random" choices for secondary choices, as well. Some of the main combinations might still have to be modified (Kenku Gladiator? really?) Apart from that, we're all set…

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

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

JPGW2YFZDRPAWPG4VAKOOB5SCJA2QSSLR5JJP7ULRBX3LLGI7PUAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/player.cc at line 5058 [3.962854]

[3.1065346]

[4.17096]


        // Identify amulet.
        item_def amu = you.inv[you.equip[EQ_AMULET]];
        if (!item_type_known(amu))
            set_ident_type( amu, ID_KNOWN_TYPE );

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

B:BD[5.74707] → [6.1738:1780]

        cprintf(EOL "* - Random choice; "

[5.74707]

[6.1780]

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

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

B:BD[7.18966] → [7.18966:19042]

        while (keyin != '*' && (keyin < 'a' || keyin >= ('a' + numbooks)));

[7.18966]

[8.385581]

        while (keyin != '*' && keyin != '+'
               && (keyin < 'a' || keyin >= ('a' + numbooks)));

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

B:BD[8.385588] → [9.1106:1181]

    if (Options.random_pick || Options.book == SBT_RANDOM || keyin == '*')

[8.385588]

[5.75667]

    if (Options.random_pick || Options.book == SBT_RANDOM || keyin == '*'
        || keyin == '+')
    {

Insertion in crawl-ref/source/newgame.cc at line 2098 [3.1132300]
[5.75697]
[8.385686]
```
    }
```

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

B:BD[10.9166] → [11.6623:6668]

∅:D[9.1229] → [5.75734:75775]

∅:D[11.6668] → [5.75734:75775]

B:BD[8.385775] → [5.75734:75775]

    if (Options.random_pick || keyin == '*')
        keyin = random2(numbooks) + 'a';

[10.9166]

[8.385809]

    if (Options.random_pick || keyin == '*' || keyin == '+')
    {
        int good_choices = 0;
        if (keyin == '+' || Options.random_pick && Options.good_random)
        {
            for (int i = 0; i < numbooks; i++)
            {
                if (_book_restriction(i, summons_too) == CC_UNRESTRICTED
                    && one_chance_in(++good_choices))
                {
                    keyin = i;
                }
            }
        }
        if (!good_choices)
            keyin = random2(numbooks) + 'a';
    }

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

B:BD[2.3390] → [2.3390:3536]

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

[2.3390]

[2.3536]

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

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

B:BD[2.4037] → [2.4037:4183]

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

[2.4037]

[2.4183]

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

Deletion in crawl-ref/source/newgame.cc at line 2193 [3.1132300]
B:BD[2.4502] → [2.4502:4521]
```
            break;
```

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

B:BD[2.4539] → [2.4539:4685]

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

[2.4539]

[12.4220]

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

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

B:BD[13.217338] → [6.2188:2230]

        cprintf(EOL "* - Random choice; "

[13.217338]

[6.2230]

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

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

B:BD[3.1169727] → [14.18782:18858]

        while (keyin != '*' && (keyin < 'a' || keyin > ('a' + num_choices))

[3.1169727]

[2.5498]

        while (keyin != '*' && keyin != '+'
                  && (keyin < 'a' || keyin > ('a' + num_choices))

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

B:BD[3.1169806] → [2.5567:5645]

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

[3.1169806]

[8.385975]

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

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

B:BD[3.1169937] → [9.1407:1484]

    if (Options.random_pick || Options.weapon == WPN_RANDOM || keyin == '*')

[3.1169937]

[3.1170014]

    if (Options.random_pick || Options.weapon == WPN_RANDOM || keyin == '*'
        || keyin == '+')

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

B:BD[13.218394] → [14.18925:18967]

∅:D[14.18967] → [7.19154:19203]

B:BD[3.1170061] → [7.19154:19203]

        // Try to choose a decent weapon.
        for (int times = 0; times < 50; times++)

[13.218394]

[3.1170105]

        ng_weapon = WPN_RANDOM;
        int good_choices = 0;
        if (keyin == '+' || Options.good_random && keyin != '*')

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

B:BD[3.1170115] → [3.1170115:1170263]

            keyin = random2(num_choices);
            int x = effective_stat_bonus(startwep[keyin]);
            if (x > -2)
                break;

[3.1170115]

[3.1170263]

            for (int i = 0; i < num_choices; i++)
            {
                if (_weapon_restriction(startwep[keyin]) == CC_UNRESTRICTED
                    && one_chance_in(++good_choices))
                {
                    keyin = i;
                }
            }

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

B:BD[3.1170273] → [3.1170273:1170295]

B:BD[3.1170295] → [15.9673:9705]

        keyin += 'a';
        ng_weapon = WPN_RANDOM;

[3.1170273]

[15.9705]


        if (!good_choices)
        {
            // Still try to choose a decent weapon.
            for (int times = 0; times < 50; times++)
            {
                keyin = random2(num_choices);
                int x = effective_stat_bonus(startwep[keyin]);
                if (x > -2)
                    break;
            }
            keyin += 'a';
        }

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

[2.6166]

        return (true);
    }
}
static bool _has_good_necromancy_apts()
{
    switch (you.species)
    {
    case SP_HUMAN:
    case SP_DEEP_ELF:
    case SP_SLUDGE_ELF:
    case SP_KOBOLD:
    case SP_NAGA:
    case SP_OGRE_MAGE:
    case SP_KENKU:
    case SP_DEMONSPAWN:
    case SP_MUMMY:
    case SP_GHOUL:
    case SP_VAMPIRE:

Insertion in crawl-ref/source/newgame.cc at line 2407 [3.1132300]
[2.6189]
[2.6189]
```
    default:
        return (player_genus(GENPC_DRACONIAN));
```

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

∅:D[13.232339] → [3.1251985:1252053]

B:BD[3.1251985] → [3.1251985:1252053]

B:BD[3.1252053] → [13.232340:232372]

            choice = (coinflip() ? DK_NECROMANCY : DK_YREDELEMNUL);
            ng_dk  = DK_RANDOM;

[13.232339]

[13.232372]

            ng_dk = DK_RANDOM;
            if (Options.good_random && !_has_good_necromancy_apts())
                choice = DK_YREDELEMNUL;
            else
                choice = (coinflip() ? DK_NECROMANCY : DK_YREDELEMNUL);

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

B:BD[3.1252199] → [14.28759:28806]

B:BD[14.28806] → [2.6765:6792]

∅:D[2.6792] → [14.28806:28868]

B:BD[14.28806] → [14.28806:28868]

B:BD[14.28868] → [2.6793:6878]

∅:D[2.6878] → [12.4703:4730]

B:BD[14.28868] → [12.4703:4730]

B:BD[12.4730] → [2.6879:6911]

∅:D[2.6911] → [12.4730:4757]

B:BD[12.4730] → [12.4730:4757]

∅:D[12.4757] → [14.28900:28956]

B:BD[14.28900] → [14.28900:28956]

            switch (you.species)
            {
            case SP_HUMAN:
            case SP_DEEP_ELF:
            case SP_SLUDGE_ELF:
            case SP_KOBOLD:
            case SP_NAGA:
            case SP_OGRE_MAGE:
            case SP_KENKU:
            case SP_DEMONSPAWN:
            case SP_MUMMY:
            case SP_GHOUL:
            case SP_VAMPIRE:

[3.1252199]

[14.28956]

            if (_has_good_necromancy_apts())

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

B:BD[14.28994] → [14.28994:29038]

B:BD[14.29038] → [2.6912:6993]

∅:D[2.6993] → [14.29075:29089]

B:BD[14.29075] → [14.29075:29089]

                break;
            default:
                textcolor(player_genus(GENPC_DRACONIAN) ? LIGHTGREY : DARKGREY);
            }

[14.28994]

[3.1252235]

            else
                textcolor(DARKGREY);

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

[15.13074]

                case '+':
                    if (keyn == '+' && !_has_good_necromancy_apts())
                        choice = DK_YREDELEMNUL;
                    // fall-through for random