fiddlerwoaroof/crawl - Change M6IHSU5JWCTOTUSPCVVHMAQ4XJDGQJOLZTTN5BGKEOS4B6Z7IOWAC

Fix good random secondary choices during character selection.

Re-enable quivering with '(' - still buggy, and I'm trying to work out why, but at least it works for some ammo now.

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

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

M6IHSU5JWCTOTUSPCVVHMAQ4XJDGQJOLZTTN5BGKEOS4B6Z7IOWAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/quiver.cc at line 236 [5.3828]

B:BD[2.2799] → [2.2799:2800]

[2.2799]

[5.7559]

#ifdef DEBUG_QUIVER
        mprf(MSGCH_DIAGNOSTICS, "item %s is for throwing",
             item.name(DESC_PLAIN).c_str());
#endif

Replacement in crawl-ref/source/newgame.cc at line 2118 [6.1132300]
B:BD[3.3501] → [3.3501:3546]
```
            keyin = random2(numbooks) + 'a';
```
[3.3501]
[3.3546]
```
            keyin = random2(numbooks);
```
Replacement in crawl-ref/source/newgame.cc at line 2121 [6.1132300]
B:BD[7.385810] → [7.385810:385855]
```
    book.sub_type = firstbook + keyin - 'a';
```
[7.385810]
[8.16970]
```
    book.sub_type = firstbook + keyin;
```

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

B:BD[3.4075] → [3.4075:4141]

∅:D[3.4141] → [9.5498:5566]

B:BD[8.18858] → [9.5498:5566]

                  && (keyin < 'a' || keyin > ('a' + num_choices))
               || startwep_restrictions[keyin - 'a'] == CC_BANNED);

[3.4075]

[10.218011]

               && (keyin < 'a' || keyin > ('a' + num_choices)
                   || startwep_restrictions[keyin - 'a'] == CC_BANNED));

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

B:BD[6.1169937] → [3.4249:4350]

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

[6.1169937]

[6.1170014]

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

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

B:BD[3.4544] → [3.4544:4620]

                if (_weapon_restriction(startwep[keyin]) == CC_UNRESTRICTED

[3.4544]

[3.4620]

                if (_weapon_restriction(startwep[i]) == CC_UNRESTRICTED

Deletion in crawl-ref/source/newgame.cc at line 2355 [6.1132300]
B:BD[3.5091] → [3.5091:5117]
```
            keyin += 'a';
```
Insertion in crawl-ref/source/newgame.cc at line 2356 [6.1132300]
[3.5127]
[11.9705]
```
        keyin += 'a';
```
Insertion in crawl-ref/source/newgame.cc at line 4830 [6.1132300]
[3.5954]
[3.5954]
```
                    {
```

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

[3.6003]

                        break;
                    }

Replacement in crawl-ref/source/monstuff.cc at line 2057 [6.1396662]

B:BD[4.2580] → [4.2580:2636]

        const bool flee_sanct = !mons_wont_attack(mon)

[4.2580]

[4.2636]

        const bool flee_sanct = !mons_wont_attack(mon)

Insertion in crawl-ref/source/monstuff.cc at line 3236 [6.1396662]
[12.12290]
[13.5157]

Insertion in crawl-ref/source/item_use.cc at line 1279 [6.2781507]

[6.2810213]

[14.4496]

#ifdef DEBUG_QUIVER
        mprf(MSGCH_DIAGNOSTICS, "i: %d, slot: %d", i, fire_order[i]);
#endif

Replacement in crawl-ref/source/item_use.cc at line 1285 [6.2781507]

B:BD[15.5746] → [15.5746:5819]

                (i + fire_order.size() + direction) % fire_order.size();

[15.5746]

[14.4629]

                (i + direction + fire_order.size()) % fire_order.size();
#ifdef DEBUG_QUIVER
            mprf(MSGCH_DIAGNOSTICS, "i: %d (%d), next: %d (%d), size: %d",
                 i, current, next, fire_order[next], fire_order.size());
#endif

Insertion in crawl-ref/source/acr.cc at line 2418 [6.4397395]

[16.12262]

#ifdef DEBUG_QUIVER
        mprf(MSGCH_DIAGNOSTICS, "next slot: %d, item: %s", next,
             next == -1 ? "none" : you.inv[next].name(DESC_PLAIN).c_str());
#endif

Replacement in crawl-ref/source/acr.cc at line 2424 [6.4397395]

B:BD[17.4922] → [16.12287:12402]

            // kind of a hacky way to get quiver to change
            you.m_quiver->on_item_fired(you.inv[next]);

[17.4922]

[17.5094]

            // Kind of a hacky way to get quiver to change.
            you.m_quiver->on_item_fired(you.inv[next], true);