fiddlerwoaroof/crawl - Change OM34VHDXECRX5GEFXHNDGXVVSUPIAUSRQVWCSPF3RXQ5DYQLMJ5QC

Fix [2813620]: The sizes of player nagas and centaurs don't match the

sizes of their monster equivalents. The latter are SIZE_BIG, while the former are, at most, SIZE_LARGE; and SIZE_BIG, in addition to being one value higher than SIZE_LARGE, allows use of two-handed weapons as though they're one-and-a-half-handed weapons under the current logic in hands_reqd(). For now, fix this by making monster nagas and centaurs (and all other monsters capable of using weapons and armour) no bigger than SIZE_LARGE.

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

Created by dolorous on June 30, 2009

OM34VHDXECRX5GEFXHNDGXVVSUPIAUSRQVWCSPF3RXQ5DYQLMJ5QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-data.h at line 136 [6.1826214]

B:BD[4.2841] → [4.2841:2950]

     SIZE_LARGE,             // trolls/ogres
     SIZE_BIG,               // large quadrupeds/centaurs/nagas

[4.2841]

[4.2950]

     SIZE_LARGE,             // trolls/ogres/centaurs/nagas
     SIZE_BIG,               // large quadrupeds

Replacement in crawl-ref/source/mon-data.h at line 258 [6.1826214]
∅:D[7.7547] → [8.3751:3816]
B:BD[9.10950] → [8.3751:3816]
```
    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
```
[7.7547]
[8.3816]
```
    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
```
Replacement in crawl-ref/source/mon-data.h at line 269 [6.1826214]
∅:D[10.2655] → [11.1239:1304]
∅:D[8.4129] → [11.1239:1304]
B:BD[9.10950] → [11.1239:1304]
```
    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
```
[10.2655]
[8.4130]
```
    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
```

Replacement in crawl-ref/source/mon-data.h at line 280 [6.1826214]

B:BD[8.4414] → [8.4414:4479]

    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG

[8.4414]

[8.4479]

    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE

Replacement in crawl-ref/source/mon-data.h at line 291 [6.1826214]
∅:D[10.2720] → [8.4795:4863]
B:BD[8.4795] → [8.4795:4863]
```
    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
```
[10.2720]
[8.4863]
```
    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
```
Replacement in crawl-ref/source/mon-data.h at line 2373 [6.1826214]
∅:D[12.2854] → [8.70960:71024]
B:BD[8.70960] → [8.70960:71024]
```
    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
```
[12.2854]
[9.22816]
```
    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
```
Replacement in crawl-ref/source/mon-data.h at line 2407 [6.1826214]
∅:D[5.2708] → [13.2628:2694]
B:BD[8.72121] → [13.2628:2694]
```
    HT_LAND, 8, ACTION_ENERGY(8), MONUSE_WEAPONS_ARMOUR, SIZE_BIG
```
[5.2708]
[9.23446]
```
    HT_LAND, 8, ACTION_ENERGY(8), MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
```
Replacement in crawl-ref/source/mon-data.h at line 2418 [6.1826214]
∅:D[5.2782] → [8.72549:72610]
B:BD[8.72549] → [8.72549:72610]
```
    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
```
[5.2782]
[9.23840]
```
    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
```

Replacement in crawl-ref/source/mon-data.h at line 2429 [6.1826214]

B:BD[10.5170] → [13.2695:2761]

    HT_LAND, 8, ACTION_ENERGY(8), MONUSE_WEAPONS_ARMOUR, SIZE_BIG

[10.5170]

[9.23973]

    HT_LAND, 8, ACTION_ENERGY(8), MONUSE_WEAPONS_ARMOUR, SIZE_LARGE

Replacement in crawl-ref/source/mon-data.h at line 2440 [6.1826214]

B:BD[10.5237] → [13.2762:2828]

    HT_LAND, 8, ACTION_ENERGY(8), MONUSE_WEAPONS_ARMOUR, SIZE_BIG

[10.5237]

[9.24109]

    HT_LAND, 8, ACTION_ENERGY(8), MONUSE_WEAPONS_ARMOUR, SIZE_LARGE

Replacement in crawl-ref/source/mon-data.h at line 2452 [6.1826214]

B:BD[10.5307] → [13.2829:2895]

    HT_LAND, 8, ACTION_ENERGY(8), MONUSE_WEAPONS_ARMOUR, SIZE_BIG

[10.5307]

[9.24248]

    HT_LAND, 8, ACTION_ENERGY(8), MONUSE_WEAPONS_ARMOUR, SIZE_LARGE

Replacement in crawl-ref/source/mon-data.h at line 2675 [6.1826214]

B:BD[8.80425] → [8.80425:80486]

    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG

[8.80425]

[9.27210]

    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE

Replacement in crawl-ref/source/mon-data.h at line 3641 [6.1826214]
∅:D[14.3992] → [11.13083:13148]
∅:D[8.110125] → [11.13083:13148]
B:BD[9.34888] → [11.13083:13148]
```
    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
```
[14.3992]
[9.34944]
```
    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
```
Replacement in crawl-ref/source/mon-data.h at line 3892 [6.1826214]
∅:D[15.2710] → [16.4952:5017]
∅:D[2.2850] → [16.4952:5017]
∅:D[17.3039] → [16.4952:5017]
B:BD[16.4952] → [16.4952:5017]
```
    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
```
[2.2850]
[9.39126]
```
    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
```

Replacement in crawl-ref/source/enum.h at line 2516 [6.3287960]

B:BD[3.2919] → [3.2919:3026]

    SIZE_LARGE,             // trolls/ogres
    SIZE_BIG,               // large quadrupeds/centaurs/nagas

[3.2919]

[3.3026]

    SIZE_LARGE,             // trolls/ogres/centaurs/nagas
    SIZE_BIG,               // large quadrupeds

Fix [2813620]: The sizes of player nagas and centaurs don't match the

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mon-data.h at line 136 [6.1826214]

Replacement in crawl-ref/source/mon-data.h at line 258 [6.1826214]

Replacement in crawl-ref/source/mon-data.h at line 269 [6.1826214]

Replacement in crawl-ref/source/mon-data.h at line 280 [6.1826214]

Replacement in crawl-ref/source/mon-data.h at line 291 [6.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2373 [6.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2407 [6.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2418 [6.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2429 [6.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2440 [6.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2452 [6.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2675 [6.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3641 [6.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3892 [6.1826214]

Replacement in crawl-ref/source/enum.h at line 2516 [6.3287960]