diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-07 19:24:34 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-07 19:24:34 +0000 |
| commit | 7351857a9a93080e85cc0fc6a87a5571cb1dadcc (patch) | |
| tree | 8a07ebcbbccd8b726492c258e6df6d8721311368 /crawl-ref/source/randart.cc | |
| parent | a670276b9dd4d243f68ad28cacf71f979ae5984c (diff) | |
| download | crawl-ref-7351857a9a93080e85cc0fc6a87a5571cb1dadcc.tar.gz crawl-ref-7351857a9a93080e85cc0fc6a87a5571cb1dadcc.zip | |
Removed DISRUPTION brand and added DRAGON_SLAYING.
The old disruption code should probably be moved over to holy wrath
but I'm unsure whether I should replace the current one. I'm talking
about the "You are blasted by holy energy!" bit in the commit below.
For now, I've simply removed it.
All dragon slaying currently does is what orc slaying does, only
against dragons. So no additional effects, resistances or otherwise.
Both slaying brands are still randomly created (though dragon only
for polearms), I haven't changed anything about that.
Also removed DISTORTION effect upon wielding such a weapon. Xom is
still pleased about seeing you in this conundrum, but not as much as
when you were blasted right away. Changed distortion description to
explicitly mentioning its effects.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3219 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/randart.cc')
| -rw-r--r-- | crawl-ref/source/randart.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc index c01c0a6a9c..947dc074e5 100644 --- a/crawl-ref/source/randart.cc +++ b/crawl-ref/source/randart.cc @@ -1168,7 +1168,13 @@ void randart_wpn_properties( const item_def &item, proprt[RAP_BRAND] = SPWPN_FLAMING + random2(2); if (one_chance_in(6)) - proprt[RAP_BRAND] = SPWPN_ORC_SLAYING + random2(4); + proprt[RAP_BRAND] = SPWPN_ORC_SLAYING + random2(5); + + if (proprt[RAP_BRAND] == SPWPN_DRAGON_SLAYING + && weapon_skill(item) != SK_POLEARMS) + { + proprt[RAP_BRAND] = 0; /* missile wpns */ + } if (one_chance_in(6)) proprt[RAP_BRAND] = SPWPN_VORPAL; @@ -1182,13 +1188,6 @@ void randart_wpn_properties( const item_def &item, if (proprt[RAP_BRAND] == SPWPN_PROTECTION) proprt[RAP_BRAND] = 0; /* no protection */ - if (proprt[RAP_BRAND] == SPWPN_DISRUPTION - && !(atype == WPN_MACE || atype == WPN_GREAT_MACE - || atype == WPN_HAMMER)) - { - proprt[RAP_BRAND] = SPWPN_NORMAL; - } - // if this happens, things might get broken -- bwr if (proprt[RAP_BRAND] == SPWPN_SPEED && atype == WPN_QUICK_BLADE) proprt[RAP_BRAND] = SPWPN_NORMAL; |