fiddlerwoaroof/crawl - Change 3RY3A4K3ZCAJ235ID3ZDKFWYSYFD42AZOVAKL6767D5GH2QJTCPQC

If a monster wields a non-branded launcher there is no message, so we

know it is a plain one -> it is now auto-identified which enables us to autoidentify branded ammo shot from it.

Fix Trolls starting out wearing bucklers and remove the stat checks during (normal) random weapon choice.

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

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

3RY3A4K3ZCAJ235ID3ZDKFWYSYFD42AZOVAKL6767D5GH2QJTCPQC

Dependencies

In channels

main

Change contents

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

B:BD[3.5013] → [3.5013:5086]

            {
                int x = effective_stat_bonus(startwep[i]);

[3.5013]

[5.18702]

                cprintf("%c - %s" EOL, letter, weapon_base_name(startwep[i]));

Deletion in crawl-ref/source/newgame.cc at line 2337 [4.1132300]

B:BD[5.18703] → [3.5087:5264]

∅:D[3.5264] → [6.217115:217116]

∅:D[7.385974] → [6.217115:217116]

B:BD[4.1169504] → [6.217115:217116]

                cprintf("%c - %s%s" EOL, letter,
                        weapon_base_name(startwep[i]),
                        (x <= -4) ? " (not ideal)" : "" );
            }

Deletion in crawl-ref/source/newgame.cc at line 2394 [4.1132300]
∅:D[2.2909] → [6.218011:218012]
∅:D[8.5566] → [6.218011:218012]
∅:D[9.9672] → [6.218011:218012]
∅:D[5.18924] → [6.218011:218012]
B:BD[6.218011] → [6.218011:218012]
∅:D[6.218356] → [4.1169805:1169806]
B:BD[4.1169805] → [4.1169805:1169806]
B:BD[4.1169806] → [10.4142:4183]
B:BD[10.4183] → [3.5404:5544]
∅:D[11.1406] → [7.385975:385985]
∅:D[10.4248] → [7.385975:385985]
∅:D[3.5544] → [7.385975:385985]
∅:D[8.5645] → [7.385975:385985]
B:BD[4.1169882] → [7.385975:385985]
∅:D[7.385985] → [4.1169882:1169930]
B:BD[4.1169882] → [4.1169882:1169930]
B:BD[4.1169930] → [7.385986:386021]
```
        if (keyin != '*' && keyin != '+'
            && (claws_allowed && startwep[keyin - 'a'] == WPN_UNARMED
                || effective_stat_bonus(startwep[keyin - 'a']) > -4))
        {
            cprintf(EOL "A fine choice. " EOL);
            delay(1000);
        }
```

Replacement in crawl-ref/source/newgame.cc at line 2416 [4.1132300]

B:BD[10.4784] → [10.4784:4959]

B:BD[10.4959] → [3.5545:5641]

        {
            // Still try to choose a decent weapon.
            for (int times = 0; times < 50; times++)
            {
                keyin = random2(num_choices);
                if (claws_allowed && startwep[keyin] == WPN_UNARMED)
                    break;

[10.4784]

[3.5641]

            keyin = random2(num_choices);

Deletion in crawl-ref/source/newgame.cc at line 2418 [4.1132300]

∅:D[3.5642] → [10.4959:5091]

B:BD[10.4959] → [10.4959:5091]

B:BD[10.5117] → [10.5117:5127]

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

Replacement in crawl-ref/source/newgame.cc at line 3276 [4.1132300]

B:BD[12.3243] → [12.3243:3316]

        // Don't replace shields with bucklers for draconians and ogres.

[12.3243]

[12.3316]

        // Don't replace shields with bucklers for large races or draconians

Replacement in crawl-ref/source/newgame.cc at line 3278 [4.1132300]

B:BD[12.3351] → [12.3351:3427]

            || !player_genus(GENPC_OGRE) && !player_genus(GENPC_DRACONIAN))

[12.3351]

[12.3427]

            || player_size(PSIZE_TORSO) < SIZE_LARGE
               && !player_genus(GENPC_DRACONIAN))

Replacement in crawl-ref/source/mon-util.cc at line 3298 [4.1699344]
B:BD[13.5837] → [14.2762:2800]
```
    if (msg && brand != SPWPN_NORMAL)
```
[13.5837]
[13.5890]
```
    if (msg)
```

Replacement in crawl-ref/source/mon-util.cc at line 3334 [4.1699344]

B:BD[15.4274] → [15.4274:4309]

            message_given = false;

[15.4274]

[13.6893]

            // A ranged weapon without special message is known to be unbranded.
            if (!is_range_weapon(item))
                message_given = false;

Insertion in crawl-ref/source/mon-util.cc at line 3338 [4.1699344]
[13.6903]
[15.4310]