fiddlerwoaroof/crawl - Change LJIBB37BTM2CJSZXTM2J7JGIMR6US7ST56UYAVNKPM44EOIXLFBQC

Various cleanups:

Move the blessed eudemon blade down in the weapon_type enum so that it's with the other blessed weapons, add a WPN_MAX_NONBLESSED parameter to indicate where the non-blessed weapons end, and make weapon mimics use it. Mimics can now no longer imitate blessed weapons, which makes them less of a giveaway, since only the blessed eudemon blade shows up normally, and it's normally colored yellow, neither of which are true for mimic versions.
Since all non-racial armors are in one contiguous block at the end of the armour_type enum, and since very little code depends on the armors' being in a particular order, add an ARM_MAX_RACIAL parameter to indicate where the potentially racial weapons end, and make set_equip_race() use it. Also, rearrange the armors a bit in the enum.
Since no code depends on the missiles' being in a particular order, move the non-racial missiles down to the end of the missile_type enum, add a MI_MAX_RACIAL parameter to indicate where the potentially racial missiles end, and make set_equip_race() use it.

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

Created by dolorous on January 22, 2009

LJIBB37BTM2CJSZXTM2J7JGIMR6US7ST56UYAVNKPM44EOIXLFBQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 122 [4.1396662]

B:BD[4.1399355] → [2.42796:42875]

        item.sub_type = (59*mimic->pos().x + 79*mimic->pos().y) % NUM_WEAPONS;

[4.1399355]

[4.1399426]

        item.sub_type = (59 * mimic->pos().x + 79 * mimic->pos().y)
                            % (WPN_MAX_NONBLESSED + 1);

Replacement in crawl-ref/source/monstuff.cc at line 143 [4.1396662]

B:BD[4.1400087] → [2.42876:42955]

        item.sub_type = (59*mimic->pos().x + 79*mimic->pos().y) % NUM_ARMOURS;

[4.1400087]

[4.1400158]

        item.sub_type = (59 * mimic->pos().x + 79 * mimic->pos().y)
                            % NUM_ARMOURS;

Deletion in crawl-ref/source/itemprop.h at line 27 [6.641567]
B:BD[5.74464] → [5.74464:74480]
```
    ARM_SHIELD,
```
Deletion in crawl-ref/source/itemprop.h at line 28 [6.641567]
B:BD[5.74495] → [7.8849:8890]
```
    ARM_HELMET,                  //   10
```
Replacement in crawl-ref/source/itemprop.h at line 29 [6.641567]
B:BD[8.2348] → [8.2348:2368]
```
    ARM_WIZARD_HAT,
```
[8.2348]
[5.74542]
```
    ARM_WIZARD_HAT,              //   10
    ARM_HELMET,
```
Replacement in crawl-ref/source/itemprop.h at line 33 [6.641567]
B:BD[5.74573] → [7.8891:8932]
```
    ARM_BUCKLER,                 //   15
```
[5.74573]
[5.74590]
```
    ARM_BUCKLER,
    ARM_SHIELD,                  //   15
```

Insertion in crawl-ref/source/itemprop.h at line 36 [6.641567]

[5.74612]

[8.2369]

    ARM_MAX_RACIAL = ARM_LARGE_SHIELD,
    ARM_CRYSTAL_PLATE_MAIL,
    ARM_ANIMAL_SKIN,
    ARM_TROLL_HIDE,
    ARM_TROLL_LEATHER_ARMOUR,    //   20

Replacement in crawl-ref/source/itemprop.h at line 42 [6.641567]
∅:D[8.2390] → [5.74659:74707]
B:BD[5.74659] → [5.74659:74707]
B:BD[5.74707] → [7.8933:8974]
∅:D[7.8974] → [5.74730:74760]
B:BD[5.74730] → [5.74730:74760]
```
    ARM_TROLL_HIDE,
    ARM_CRYSTAL_PLATE_MAIL,
    ARM_DRAGON_ARMOUR,           //   20
    ARM_TROLL_LEATHER_ARMOUR,
```
[8.2390]
[8.2391]
```
    ARM_DRAGON_ARMOUR,
```

Replacement in crawl-ref/source/itemprop.h at line 45 [6.641567]

B:BD[5.74834] → [5.74834:74861]

B:BD[5.74861] → [7.8975:9016]

    ARM_STEAM_DRAGON_HIDE,
    ARM_STEAM_DRAGON_ARMOUR,     //   25

[5.74834]

[5.74890]

    ARM_STEAM_DRAGON_HIDE,       //   25
    ARM_STEAM_DRAGON_ARMOUR,

Replacement in crawl-ref/source/itemprop.h at line 50 [6.641567]

B:BD[5.74993] → [5.74993:75022]

B:BD[5.75022] → [7.9017:9058]

    ARM_STORM_DRAGON_ARMOUR,
    ARM_GOLD_DRAGON_HIDE,        //   30

[5.74993]

[5.75048]

    ARM_STORM_DRAGON_ARMOUR,     //   30
    ARM_GOLD_DRAGON_HIDE,

Deletion in crawl-ref/source/itemprop.h at line 53 [6.641567]
B:BD[5.75076] → [8.2449:2470]
```
    ARM_ANIMAL_SKIN,
```

Replacement in crawl-ref/source/itemprop.h at line 258 [6.641567]

B:BD[5.79982] → [5.79982:80029]

    MI_STONE,                          //    0

[5.79982]

[5.80029]

    MI_DART,                           //    0
    MI_NEEDLE,

Deletion in crawl-ref/source/itemprop.h at line 262 [6.641567]
B:BD[5.80056] → [5.80056:80084]
B:BD[5.80084] → [7.9143:9190]
∅:D[7.9190] → [5.80103:80124]
B:BD[5.80103] → [5.80103:80124]
```
    MI_DART,
    MI_NEEDLE,
    MI_LARGE_ROCK,                     //    5
    MI_SLING_BULLET,
```

Insertion in crawl-ref/source/itemprop.h at line 263 [6.641567]

[5.80140]

    MI_MAX_RACIAL = MI_JAVELIN,
    MI_STONE,                          //    5
    MI_LARGE_ROCK,
    MI_SLING_BULLET,

Replacement in crawl-ref/source/itemprop.h at line 479 [6.641567]
B:BD[5.85698] → [9.3318:3349]
∅:D[9.3349] → [7.9262:9309]
B:BD[7.9262] → [7.9262:9309]
∅:D[7.9309] → [5.85762:85780]
B:BD[5.85762] → [5.85762:85780]
```
    WPN_BLESSED_EUDEMON_BLADE,
    WPN_LONGBOW,                       //   45
    WPN_LAJATANG,
```
[5.85698]
[10.429]
```
    WPN_LONGBOW,
    WPN_LAJATANG,                      //   45
```
Insertion in crawl-ref/source/itemprop.h at line 482 [6.641567]
[10.447]
[11.3024]
```
    WPN_MAX_NONBLESSED = WPN_BARDICHE,
```

Replacement in crawl-ref/source/itemprop.h at line 485 [6.641567]

B:BD[11.3078] → [11.3078:3149]

    WPN_BLESSED_SCIMITAR,              //   50
    WPN_BLESSED_KATANA,

[11.3078]

[11.3149]

    WPN_BLESSED_SCIMITAR,
    WPN_BLESSED_KATANA,                //   50
    WPN_BLESSED_EUDEMON_BLADE,

Replacement in crawl-ref/source/itemprop.cc at line 700 [6.646661]

B:BD[6.667846] → [6.667846:667909]

B:BD[6.667909] → [3.2702:2911]

∅:D[3.2911] → [6.668113:668123]

B:BD[6.668113] → [6.668113:668123]

        // not hides, dragon armour, crystal plate, or barding
        if ((item.sub_type >= ARM_DRAGON_HIDE
                && item.sub_type <= ARM_SWAMP_DRAGON_ARMOUR)
            || item.sub_type == ARM_CENTAUR_BARDING
            || item.sub_type == ARM_NAGA_BARDING)
        {

[6.667846]

[6.668123]

        if (item.sub_type > ARM_MAX_RACIAL)

Deletion in crawl-ref/source/itemprop.cc at line 702 [6.646661]
B:BD[6.668143] → [6.668143:668153]
```
        }
```

Replacement in crawl-ref/source/itemprop.cc at line 705 [6.646661]

B:BD[6.668192] → [12.468:600]

∅:D[12.600] → [13.3068:3127]

B:BD[13.3068] → [13.3068:3127]

        if (item.sub_type == MI_STONE
            || item.sub_type == MI_LARGE_ROCK
            || item.sub_type == MI_SLING_BULLET
            || item.sub_type == MI_THROWING_NET)
        {

[6.668192]

[6.668265]

        if (item.sub_type > MI_MAX_RACIAL)

Deletion in crawl-ref/source/itemprop.cc at line 707 [6.646661]
B:BD[6.668285] → [13.3128:3138]
```
        }
```

Various cleanups:

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 122 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 143 [4.1396662]

Deletion in crawl-ref/source/itemprop.h at line 27 [6.641567]

Deletion in crawl-ref/source/itemprop.h at line 28 [6.641567]

Replacement in crawl-ref/source/itemprop.h at line 29 [6.641567]

Replacement in crawl-ref/source/itemprop.h at line 33 [6.641567]

Insertion in crawl-ref/source/itemprop.h at line 36 [6.641567]

Replacement in crawl-ref/source/itemprop.h at line 42 [6.641567]

Replacement in crawl-ref/source/itemprop.h at line 45 [6.641567]

Replacement in crawl-ref/source/itemprop.h at line 50 [6.641567]

Deletion in crawl-ref/source/itemprop.h at line 53 [6.641567]

Replacement in crawl-ref/source/itemprop.h at line 258 [6.641567]

Deletion in crawl-ref/source/itemprop.h at line 262 [6.641567]

Insertion in crawl-ref/source/itemprop.h at line 263 [6.641567]

Replacement in crawl-ref/source/itemprop.h at line 479 [6.641567]

Insertion in crawl-ref/source/itemprop.h at line 482 [6.641567]

Replacement in crawl-ref/source/itemprop.h at line 485 [6.641567]

Replacement in crawl-ref/source/itemprop.cc at line 700 [6.646661]

Deletion in crawl-ref/source/itemprop.cc at line 702 [6.646661]

Replacement in crawl-ref/source/itemprop.cc at line 705 [6.646661]

Deletion in crawl-ref/source/itemprop.cc at line 707 [6.646661]