summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-wpnench.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2011-05-31 15:22:49 +0200
committerAdam Borowski <kilobyte@angband.pl>2011-05-31 15:27:46 +0200
commit581c504a60e998025b044167446a7e8292a877cd (patch)
tree12dcf8a5f5539736b11f223ca016b2b5b72ecfb5 /crawl-ref/source/spl-wpnench.cc
parent8aa418be83f6f85025375ed3fcd1e536a2121986 (diff)
downloadcrawl-ref-581c504a60e998025b044167446a7e8292a877cd.tar.gz
crawl-ref-581c504a60e998025b044167446a7e8292a877cd.zip
Make the Blade card less likely to do nothing.
It rolled either "vorpal for slicing/stabbing" or "vorpal for crushing", doing nothing if the weapon was of the opposite type. And never working for chopping, piercing ones and launchers. Now it will do nothing only for crushing weapons of venom, and for launchers of draining, distortion and pain.
Diffstat (limited to 'crawl-ref/source/spl-wpnench.cc')
-rw-r--r--crawl-ref/source/spl-wpnench.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/spl-wpnench.cc b/crawl-ref/source/spl-wpnench.cc
index 12106616af..7c6c4a23e4 100644
--- a/crawl-ref/source/spl-wpnench.cc
+++ b/crawl-ref/source/spl-wpnench.cc
@@ -41,7 +41,8 @@ static brand_type _convert_to_launcher(brand_type which_brand)
{
switch (which_brand)
{
- case SPWPN_FREEZING: return SPWPN_FROST; case SPWPN_FLAMING: return SPWPN_FLAME;
+ case SPWPN_FREEZING: return SPWPN_FROST;
+ case SPWPN_FLAMING: return SPWPN_FLAME;
default: return (which_brand);
}
}
@@ -59,6 +60,7 @@ static bool _ok_for_launchers(brand_type which_brand)
//case SPWPN_PAIN: -- no pain missile type yet
case SPWPN_RETURNING:
case SPWPN_CHAOS:
+ case SPWPN_VORPAL:
return (true);
default:
return (false);
@@ -92,8 +94,6 @@ bool brand_weapon(brand_type which_brand, int power)
// Some brandings are restricted to certain damage types.
const int wpn_type = get_vorpal_type(weapon);
if (which_brand == SPWPN_VENOM && wpn_type == DVORP_CRUSHING
- || which_brand == SPWPN_VORPAL && wpn_type != DVORP_SLICING
- && wpn_type != DVORP_STABBING
|| which_brand == SPWPN_DUMMY_CRUSHING && wpn_type != DVORP_CRUSHING)
{
return (false);