fiddlerwoaroof/crawl - Change I46SXTM3KJ53E34L35Q6XPBCTA3DH7FWIOUREY4FZDAGZYBLTZYAC

Fix [1831343]. Merfolk fighters were wielding stacks of spears because

they were being given in give_weapon(), as opposed to give_ammo(), where they should have been. One side effect of fixing this is that it is now possible for merfolk fighters to get both a trident and spears/javelins/throwing nets, or neither. Since getting neither is possible for orcs (i.e. orc fighters), and merfolk have the same aptitude for unarmed combat as orcs; and since gnolls can get both polearms (although not tridents) and throwing nets, I think both possibilities are okay for now.

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

Created by dolorous on December 17, 2007

I46SXTM3KJ53E34L35Q6XPBCTA3DH7FWIOUREY4FZDAGZYBLTZYAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/makeitem.cc at line 3355 [3.927]

B:BD[2.9152] → [2.9152:9282]

        item_race = MAKE_ITEM_NO_RACE;
        item.base_type = OBJ_WEAPONS;
        // 1/3 each for trident, spears and javelins

Deletion in crawl-ref/source/makeitem.cc at line 3356 [3.927]

B:BD[2.9312] → [2.9312:9490]

            item.sub_type = WPN_TRIDENT;
        else if (coinflip())
        {
            item.sub_type = WPN_SPEAR;
            iquan = 1 + random2(3);
        }
        else

Replacement in crawl-ref/source/makeitem.cc at line 3357 [3.927]

B:BD[2.9500] → [2.9500:9619]

            item.base_type = OBJ_MISSILES;
            item.sub_type = MI_JAVELIN;
            iquan = 3 + random2(6);

[2.9500]

[3.116131]

            item_race = MAKE_ITEM_NO_RACE;
            item.base_type = OBJ_WEAPONS;
            item.sub_type = WPN_TRIDENT;

Insertion in crawl-ref/source/makeitem.cc at line 3696 [3.927]

[4.2968]


        case MONS_MERFOLK:
            if (!one_chance_in(3))
            {
                item_race = MAKE_ITEM_NO_RACE;
                if (coinflip())
                {
                    weap_type = WPN_SPEAR;
                    qty = 1 + random2(3);
                }
                else
                {
                    weap_class = OBJ_MISSILES;
                    weap_type = MI_JAVELIN;
                    qty = 3 + random2(6);
                }
            }
            // fall through

Deletion in crawl-ref/source/makeitem.cc at line 3718 [3.927]
B:BD[4.3060] → [2.9710:9737]
```
        case MONS_MERFOLK:
```
Deletion in crawl-ref/source/makeitem.cc at line 3727 [3.927]
B:BD[5.19657] → [4.3237:3238]