fiddlerwoaroof/crawl - Change HFG46645HMBDGXIL5QPC4QKNRZ5ASGKUVHO3EYFOSE6HZMQL7GCQC

Cleanup, again:

Add a WPN_MAX_RACIAL parameter to the weapons enum, and make set_equip_race() use it. Also, reorganize the weapons list a bit.

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

Created by dolorous on January 22, 2009

HFG46645HMBDGXIL5QPC4QKNRZ5ASGKUVHO3EYFOSE6HZMQL7GCQC

Dependencies

In channels

main

Change contents

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

B:BD[9.84489] → [9.84489:84552]

// Base weapons
    WPN_CLUB,                          //    0

[9.84489]

[9.84552]

    WPN_WHIP,                          //    0
    WPN_CLUB,
    WPN_HAMMER,

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

B:BD[9.84581] → [9.84581:84706]

    WPN_DAGGER,
    WPN_MORNINGSTAR,
    WPN_SHORT_SWORD,                   //    5
    WPN_LONG_SWORD,
    WPN_GREAT_SWORD,

[9.84581]

[9.84706]

    WPN_MORNINGSTAR,                   //    5
    WPN_SPIKED_FLAIL,
    WPN_EVENINGSTAR,
    WPN_DIRE_FLAIL,
    WPN_GREAT_MACE,
    WPN_DAGGER,                        //   10
    WPN_QUICK_BLADE,
    WPN_SHORT_SWORD,
    WPN_SABRE,
    WPN_FALCHION,
    WPN_LONG_SWORD,                    //   15

Insertion in crawl-ref/source/itemprop.h at line 462 [10.641567]
[9.84724]
[9.84724]
```
    WPN_GREAT_SWORD,
```

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

B:BD[9.84742] → [9.84742:84789]

    WPN_BATTLEAXE,                     //   10

[9.84742]

[9.84789]

    WPN_WAR_AXE,
    WPN_BROAD_AXE,                     //   20
    WPN_BATTLEAXE,
    WPN_EXECUTIONERS_AXE,

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

B:BD[9.84804] → [9.84804:84896]

    WPN_HALBERD,
    WPN_SLING,
    WPN_BOW,
    WPN_CROSSBOW,                      //   15

[9.84804]

[9.84896]

    WPN_TRIDENT,
    WPN_HALBERD,                       //   25
    WPN_GLAIVE,
    WPN_BARDICHE,
    WPN_BLOWGUN,

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

B:BD[9.84919] → [9.84919:85058]

    WPN_GLAIVE,
    WPN_QUARTERSTAFF,
// these three not created ordinarily
    WPN_SCYTHE,
    WPN_GIANT_CLUB,                    //   20

[9.84919]

[9.85058]

    WPN_CROSSBOW,                      //   30
    WPN_BOW,
    WPN_LONGBOW,
    WPN_MAX_RACIAL = WPN_LONGBOW,
    WPN_ANKUS,
    WPN_DEMON_WHIP,
    WPN_GIANT_CLUB,                    //   35

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

B:BD[9.85085] → [9.85085:85188]

// "rare" weapons - some have special cases and are uncommon
    WPN_EVENINGSTAR,
    WPN_QUICK_BLADE,

[9.85085]

[9.85188]


    WPN_KNIFE,

Deletion in crawl-ref/source/itemprop.h at line 491 [10.641567]

B:BD[9.85204] → [9.85204:85311]

B:BD[9.85311] → [11.3176:3191]

∅:D[11.3191] → [9.85326:85388]

B:BD[9.85326] → [9.85326:85388]

    WPN_EXECUTIONERS_AXE,              //   25
    WPN_DOUBLE_SWORD,
    WPN_TRIPLE_SWORD,
    WPN_HAMMER,
    WPN_ANKUS,
    WPN_WHIP,                          //   30
    WPN_SABRE,

Replacement in crawl-ref/source/itemprop.h at line 492 [10.641567]
B:BD[9.85409] → [9.85409:85429]
```
    WPN_DEMON_WHIP,
```
[9.85409]
[9.85429]
```
    WPN_DOUBLE_SWORD,                  //   40
    WPN_TRIPLE_SWORD,
```

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

B:BD[9.85452] → [9.85452:85698]

B:BD[9.85698] → [8.3552:3569]

    WPN_BROAD_AXE,                     //   35
// base items (continued)
    WPN_WAR_AXE,
    WPN_TRIDENT,
    WPN_SPIKED_FLAIL,
    WPN_GREAT_MACE,
    WPN_DIRE_FLAIL,                    //   40
    WPN_KNIFE,
    WPN_BLOWGUN,
    WPN_FALCHION,
    WPN_LONGBOW,

[9.85452]

[8.3569]

    WPN_SCYTHE,
    WPN_QUARTERSTAFF,

Replacement in crawl-ref/source/itemprop.h at line 500 [10.641567]
∅:D[8.3616] → [12.429:447]
B:BD[9.85780] → [12.429:447]
B:BD[12.447] → [8.3617:3656]
```
    WPN_BARDICHE,
    WPN_MAX_NONBLESSED = WPN_BARDICHE,
```
[8.3616]
[13.3024]
```
    WPN_SLING,
    WPN_MAX_NONBLESSED = WPN_SLING,
```

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

B:BD[8.3683] → [8.3683:3730]

    WPN_BLESSED_KATANA,                //   50

[8.3683]

[8.3730]

    WPN_BLESSED_GREAT_SWORD,           //   50
    WPN_BLESSED_KATANA,

Deletion in crawl-ref/source/itemprop.h at line 513 [10.641567]
B:BD[13.3179] → [13.3179:3208]
```
    WPN_BLESSED_GREAT_SWORD,
```

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

B:BD[10.667304] → [10.667304:667402]

B:BD[10.667402] → [5.2633:2675]

∅:D[14.312] → [10.667402:667574]

∅:D[3.388] → [10.667402:667574]

∅:D[5.2675] → [10.667402:667574]

B:BD[10.667402] → [10.667402:667574]

∅:D[15.384] → [10.667574:667623]

B:BD[10.667574] → [10.667574:667623]

B:BD[10.667623] → [16.270:313]

B:BD[16.313] → [6.3107:3139]

∅:D[6.3139] → [17.2771:2810]

B:BD[18.320] → [17.2771:2810]

∅:D[18.371] → [10.667769:667779]

∅:D[19.2667] → [10.667769:667779]

∅:D[17.2810] → [10.667769:667779]

B:BD[10.667769] → [10.667769:667779]

        if (item.sub_type == WPN_GIANT_CLUB
            || item.sub_type == WPN_GIANT_SPIKED_CLUB
            || item.sub_type == WPN_ANKUS
            || item.sub_type == WPN_KATANA
            || item.sub_type == WPN_LAJATANG
            || item.sub_type == WPN_SLING
            || item.sub_type == WPN_KNIFE
            || item.sub_type == WPN_QUARTERSTAFF
            || item.sub_type == WPN_SCYTHE
            || is_demonic(item)
            || is_blessed_blade(item))
        {

[10.667304]

[10.667779]

        if (item.sub_type > WPN_MAX_RACIAL)

Deletion in crawl-ref/source/itemprop.cc at line 686 [10.646661]
B:BD[10.667799] → [10.667799:667809]
```
        }
```

Insertion in crawl-ref/source/itemprop.cc at line 711 [10.646661]

[2.375]

[20.395]

                || (weapon_skill(item) == SK_LONG_BLADES
                    && item.sub_type != WPN_FALCHION
                    && item.sub_type != WPN_LONG_SWORD
                    && item.sub_type != WPN_SCIMITAR)

Deletion in crawl-ref/source/itemprop.cc at line 719 [10.646661]

B:BD[15.542] → [21.5629:5686]

∅:D[21.5686] → [15.599:761]

B:BD[15.599] → [15.599:761]

                || (weapon_skill(item) == SK_LONG_BLADES
                    && item.sub_type != WPN_FALCHION
                    && item.sub_type != WPN_LONG_SWORD
                    && item.sub_type != WPN_SCIMITAR)

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

B:BD[22.452] → [23.270:359]

            if (is_hard_helmet(item)
                || item.sub_type == ARM_SPLINT_MAIL

[22.452]

[22.501]

            if (item.sub_type == ARM_SPLINT_MAIL

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

B:BD[22.553] → [22.553:605]

                || item.sub_type == ARM_PLATE_MAIL)

[22.553]

[22.605]

                || item.sub_type == ARM_PLATE_MAIL
                || is_hard_helmet(item))

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

B:BD[22.884] → [24.504:554]

            if (weapon_skill(item) == SK_POLEARMS

[22.884]

[21.5687]

            if (item.sub_type == WPN_WHIP
                || item.sub_type == WPN_CLUB
                || item.sub_type == WPN_QUICK_BLADE

Replacement in crawl-ref/source/itemprop.cc at line 752 [10.646661]
∅:D[7.2874] → [15.873:925]
B:BD[15.873] → [15.873:925]
B:BD[15.925] → [25.385:430]
∅:D[25.476] → [26.270:315]
∅:D[11.3312] → [26.270:315]
B:BD[15.925] → [26.270:315]
```
                || item.sub_type == WPN_QUICK_BLADE
                || item.sub_type == WPN_CLUB
                || item.sub_type == WPN_WHIP
```
[7.2874]
[20.495]
```
                || weapon_skill(item) == SK_POLEARMS
```
Insertion in crawl-ref/source/itemprop.cc at line 754 [10.646661]
[20.543]
[20.543]
```
                || item.sub_type == WPN_HAND_CROSSBOW
```

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

B:BD[20.587] → [15.926:974]

∅:D[15.974] → [20.587:642]

B:BD[20.587] → [20.587:642]

                || item.sub_type == WPN_LONGBOW
                || item.sub_type == WPN_HAND_CROSSBOW)

[20.587]

[24.603]

                || item.sub_type == WPN_LONGBOW)

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

B:BD[22.1003] → [27.25753:25829]

∅:D[28.329] → [23.398:443]

∅:D[29.534] → [23.398:443]

∅:D[27.25829] → [23.398:443]

B:BD[23.398] → [23.398:443]

B:BD[23.443] → [4.270:326]

            if (get_armour_slot(item) == EQ_HELMET && !is_hard_helmet(item)
                || item.sub_type == ARM_ROBE
                || item.sub_type == ARM_LEATHER_ARMOUR)

[22.1003]

[22.1164]

            if (item.sub_type == ARM_ROBE
                || item.sub_type == ARM_LEATHER_ARMOUR
                || get_armour_slot(item) == EQ_HELMET && !is_hard_helmet(item))

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

B:BD[20.669] → [30.2639:2905]

∅:D[30.2905] → [15.1247:1402]

B:BD[15.1247] → [15.1247:1402]

            if (weapon_skill(item) == SK_LONG_BLADES
                   && item.sub_type != WPN_FALCHION
                   && item.sub_type != WPN_LONG_SWORD
                   && item.sub_type != WPN_SCIMITAR
                   && item.sub_type != WPN_GREAT_SWORD
                || item.sub_type == WPN_QUICK_BLADE
                || item.sub_type == WPN_LONGBOW
                || item.sub_type == WPN_HAND_CROSSBOW)

[20.669]

[20.721]

            if (item.sub_type == WPN_QUICK_BLADE
                || item.sub_type == WPN_HAND_CROSSBOW
                || item.sub_type == WPN_LONGBOW)