diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-19 14:30:16 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-19 14:30:16 -0600 |
| commit | 319f9da34bb761ab98bf158483b60539ff9c8a05 (patch) | |
| tree | 02bc1d31f67cfbe254ec1a1fa190d9af868f59a3 /crawl-ref/source/makeitem.cc | |
| parent | fb463b88c07b86b44dbb460b06f068e9bf866351 (diff) | |
| download | crawl-ref-319f9da34bb761ab98bf158483b60539ff9c8a05.tar.gz crawl-ref-319f9da34bb761ab98bf158483b60539ff9c8a05.zip | |
Allow the venom brand on staves; e.g. the Staff of Olgreb is precedent.
Diffstat (limited to 'crawl-ref/source/makeitem.cc')
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 3a36c4a79a..f28db5377c 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -1439,8 +1439,8 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level) break; } - // Quarterstaff - not powerful, as this would make - // the 'staves' skill just too good. + // Quarterstaff - not powerful, as this would make the 'staves' + // skill just too good. case WPN_QUARTERSTAFF: if (one_chance_in(30)) rc = SPWPN_PAIN; @@ -1535,10 +1535,13 @@ bool is_weapon_brand_ok(int type, int brand) if (brand <= SPWPN_NORMAL) return (true); + if (type == WPN_QUICK_BLADE && brand == SPWPN_SPEED) return (false); - if (vorp == DVORP_CRUSHING && brand == SPWPN_VENOM) + + if (vorp == DVORP_CRUSHING && skill != SK_STAVES && brand == SPWPN_VENOM) return (false); + if (skill != SK_POLEARMS && brand == SPWPN_DRAGON_SLAYING) return (false); |