fiddlerwoaroof/crawl - Change GDRQMRZTPLRZYBEIJ5AXH3NVKKOQEB5HNG6VFBVZF6JWO7XCOBKQC

Allow racial javelins. Javelins can now be elven and orcish, since

dwarves don't make polearms, and are made so 25% of the time, the same as for spears. Since they have no associated launcher, the usual bonuses for throwing racial gear apply to them, in spite of their being missiles thrown by hand. Also, disable branded javelins for now, as branding for thrown missiles in general isn't implemented.

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

Created by dolorous on December 4, 2007

GDRQMRZTPLRZYBEIJ5AXH3NVKKOQEB5HNG6VFBVZF6JWO7XCOBKQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/makeitem.cc at line 1628 [7.927]

B:BD[6.466] → [6.466:508]

             || item.sub_type == MI_DART)

[6.466]

[8.21897]

             || item.sub_type == MI_DART
             || item.sub_type == MI_JAVELIN)

Replacement in crawl-ref/source/makeitem.cc at line 1638 [7.927]

B:BD[8.22075] → [8.22075:22117]

             || item.sub_type == MI_DART)

[8.22075]

[8.22117]

             || item.sub_type == MI_DART
             || item.sub_type == MI_JAVELIN)

Replacement in crawl-ref/source/makeitem.cc at line 1645 [7.927]

B:BD[6.510] → [4.362:432]

        // Dwarves don't make arrows, sling bullets, or throwing nets

[6.510]

[6.547]

        // Dwarves don't make arrows, sling bullets, javelins, or
        // throwing nets

Replacement in crawl-ref/source/makeitem.cc at line 1702 [7.927]

B:BD[7.61914] → [8.23830:23876]

    // Un-poison sling bullets, unbrand nets.

[7.61914]

[8.23876]

    // Un-poison sling bullets; unbrand javelins and throwing nets.

Replacement in crawl-ref/source/makeitem.cc at line 1704 [7.927]

B:BD[8.23943] → [8.23943:23988]

        || item.sub_type == MI_THROWING_NET)

[8.23943]

[8.23988]

        || item.sub_type == MI_JAVELIN || item.sub_type == MI_THROWING_NET)

Insertion in crawl-ref/source/itemprop.h at line 675 [10.641567]
[9.8633]
[9.8633]
```
bool          has_launcher( const item_def &wpn );
```

Replacement in crawl-ref/source/itemprop.h at line 677 [10.641567]

B:BD[9.8682] → [9.8682:8747]

                            size_type bodysize = SIZE_MEDIUM );

[9.8682]

[9.8747]

                            size_type bodysize = SIZE_MEDIUM );

Replacement in crawl-ref/source/itemprop.cc at line 712 [10.646661]

B:BD[5.1262] → [5.1262:1305]

            if (item.sub_type == MI_ARROW)

[5.1262]

[5.1305]

            if (item.sub_type == MI_ARROW
                || item.sub_type == MI_JAVELIN)
            {

Insertion in crawl-ref/source/itemprop.cc at line 716 [10.646661]
[5.1329]
[5.1329]
```
            }
```

Replacement in crawl-ref/source/itemprop.cc at line 1861 [10.646661]

∅:D[9.9957] → [10.698178:698181]

B:BD[10.698178] → [10.698178:698181]

[9.9957]

[10.698181]

}
// returns true if item has an associated launcher
bool has_launcher( const item_def &wpn )
{
    return (wpn.sub_type != MI_LARGE_ROCK &&
            wpn.sub_type != MI_JAVELIN &&
            wpn.sub_type != MI_THROWING_NET);
}

Replacement in crawl-ref/source/item_use.cc at line 2082 [12.2781507]

B:BD[9.12443] → [11.982:1053]

                && (wepType == MI_STONE || wepType == MI_LARGE_ROCK)))

[9.12443]

[12.2825720]

                && (wepType == MI_STONE || wepType == MI_LARGE_ROCK
                    || wepType == MI_JAVELIN)))

Insertion in crawl-ref/source/item_use.cc at line 2107 [12.2781507]

[12.2826439]

                        break;
                }
            }
            else if (wepClass == OBJ_MISSILES)
            {
                switch (wepType)
                {
                    case MI_JAVELIN:
                        baseHit += 1;
                        break;
                    default:

Deletion in crawl-ref/source/item_use.cc at line 2167 [12.2781507]
B:BD[13.599] → [3.334:363]
∅:D[3.363] → [9.13249:13306]
B:BD[9.13249] → [9.13249:13306]
```
                baseHit = 1;
                baseDam = property( item, PWPN_DAMAGE );
```
Replacement in crawl-ref/source/describe.cc at line 1445 [12.3736416]
B:BD[12.3777193] → [2.1250:1286]
```
    switch ( get_equip_race(item) )
```
[12.3777193]
[2.1286]
```
    if ( has_launcher(item) )
```
Insertion in crawl-ref/source/describe.cc at line 1447 [12.3736416]
[2.1292]
[2.1292]
```
        switch ( get_equip_race(item) )
        {
```
Insertion in crawl-ref/source/describe.cc at line 1461 [12.3736416]
[2.1751]
[2.1751]
```
        }
```

Insertion in crawl-ref/source/describe.cc at line 1463 [12.3736416]

[2.1757]

    else
    {
        switch ( get_equip_race(item) )
        {
        case ISFLAG_DWARVEN:
            description +=
                "$It is most deadly when thrown by dwarves.";
            break;
        case ISFLAG_ELVEN:
            description +=
                "$It is most deadly when thrown by elves.";
            break;
        case ISFLAG_ORCISH:
            description +=
                "$It is most deadly when thrown by orcs.";
            break;
        }
    }