diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-16 13:33:32 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-16 13:33:32 +0000 |
| commit | 1a6c94ae92a619e3612a0359d97d4498f2adeba8 (patch) | |
| tree | 00bba720527cf6966d0d6a1cd0a4e96bb7e8cd29 /crawl-ref/source/mon-data.h | |
| parent | 3c8efd591ced0fbdad0da577af07011700df7562 (diff) | |
| download | crawl-ref-1a6c94ae92a619e3612a0359d97d4498f2adeba8.tar.gz crawl-ref-1a6c94ae92a619e3612a0359d97d4498f2adeba8.zip | |
Fix 1943303: Prevention of barding generation in monsters equipment.
And while I was at it... improved monster pickup handling.
* Ranged spellcasters won't pick up missiles anymore (except throwing nets).
* Allow monsters with behaviour != BEH_WANDER to pick up items again.
(Restricted to scrolls, potions, wands and weapons, since these could be
useful in a fight.)
* Restrict monster pickup to items they may actually use (3 types of
scrolls, six types of potions), though they may still pick up all types
of wands, if only to annoy the player.
As before, pickup only takes place if a monster happens to be on a square
with items and only the top items of stashes are checked - monsters won't
make a beeline for items or search stashes for goodies.
Also, neutrals and friendlies still won't pick up anything at all; this might
have to be changed.
Unrelated: fixed an ASSERT for divine retribution during penance.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4255 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-data.h')
| -rw-r--r-- | crawl-ref/source/mon-data.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index a4d9b9183e..1693e06566 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -58,7 +58,7 @@ exp_mod: see give_adjusted_experience() in monstuff.cc - the experience given for killing this monster is calculated something like this: - experience = hp_max * HD * HD * exp_mod / 10 + experience = hp_max * HD * HD * exp_mod / 10 I think. Actually it is @@ -119,6 +119,12 @@ MONUSE_WEAPONS_ARMOUR, MONUSE_MAGIC_ITEMS + From MONUSE_STARTING_EQUIPMENT on, monsters are capable of handling items. + Contrary to what one might expect MONUSE_WEAPONS_ARMOUR also means a + monster is capable of using wands and will also pick them up, something + that those with MONUSE_STARTING_EQUIPMENT won't do. + MONUSE_MAGIC_ITEMS is currently never used anywhere. + size: SIZE_TINY, // rat/bat SIZE_LITTLE, // spriggan @@ -168,7 +174,7 @@ 700, 10, MONS_GIANT_ANT, MONS_GIANT_ANT, MH_NATURAL, -3, { {AT_BITE, AF_POISON, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 3, 3, 5, 0 }, - 4, 10, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, + 4, 10, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, HT_LAND, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE, }, @@ -191,7 +197,7 @@ 150, 4, MONS_GIANT_BAT, MONS_GIANT_BAT, MH_NATURAL, -1, { {AT_HIT, AF_PLAIN, 1}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 1, 2, 3, 0 }, - 1, 14, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL, + 1, 14, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL, HT_LAND, 30, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY }, @@ -214,7 +220,7 @@ 1500, 10, MONS_CENTAUR, MONS_CENTAUR, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 4, 3, 5, 0 }, - 3, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_NORMAL, + 3, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_NORMAL, HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG }, |